version bump, purge old

(Portage version: 2.1.2.7)

17 files changed, 20 insertions, 784 deletions

diff --git a/net-wireless/linux-wlan-ng-modules/ChangeLog b/net-wireless/linux-wlan-ng-modules/ChangeLog
index 292aa6c55766..d7b52c232de5 100644
--- a/net-wireless/linux-wlan-ng-modules/ChangeLog
+++ b/net-wireless/linux-wlan-ng-modules/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for net-wireless/linux-wlan-ng-modules
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng-modules/ChangeLog,v 1.13 2007/05/09 16:18:40 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng-modules/ChangeLog,v 1.14 2007/05/09 16:30:52 genstef Exp $
+
+*linux-wlan-ng-modules-0.2.8 (09 May 2007)
+
+  09 May 2007; Stefan Schweizer <genstef@gentoo.org>
+  -files/linux-wlan-ng-0.2.3-kernel-2.6.16.patch,
+  -files/linux-wlan-ng-0.2.3-kernel-2.6.17.patch,
+  -files/linux-wlan-ng-0.2.3-module_param.patch,
+  -files/linux-wlan-ng-0.2.5-kernel-2.6.19.patch,
+  -files/linux-wlan-ng-0.2.7-kernel-2.6.20.patch,
+  -linux-wlan-ng-modules-0.2.3.ebuild,
+  -linux-wlan-ng-modules-0.2.3-r1.ebuild,
+  -linux-wlan-ng-modules-0.2.5.ebuild,
+  -linux-wlan-ng-modules-0.2.5-r1.ebuild,
+  -linux-wlan-ng-modules-0.2.7.ebuild, +linux-wlan-ng-modules-0.2.8.ebuild:
+  version bump, purge old
 
 *linux-wlan-ng-modules-0.2.7 (09 May 2007)
 
diff --git a/net-wireless/linux-wlan-ng-modules/files/digest-linux-wlan-ng-modules-0.2.3 b/net-wireless/linux-wlan-ng-modules/files/digest-linux-wlan-ng-modules-0.2.3
deleted file mode 100644
index 0680fd82180a..000000000000
--- a/net-wireless/linux-wlan-ng-modules/files/digest-linux-wlan-ng-modules-0.2.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f26e41336a2838d69a366ab3a2d93ea0 linux-wlan-ng-0.2.3.tar.bz2 454053
-RMD160 a39a6f17dd8a745992a557605d3f5734d8b7de95 linux-wlan-ng-0.2.3.tar.bz2 454053
-SHA256 97004d6cefd1b5c5f37efc1603e4103f9a809d79f8cc0faf2397fa882cdd6ee6 linux-wlan-ng-0.2.3.tar.bz2 454053
diff --git a/net-wireless/linux-wlan-ng-modules/files/digest-linux-wlan-ng-modules-0.2.3-r1 b/net-wireless/linux-wlan-ng-modules/files/digest-linux-wlan-ng-modules-0.2.3-r1
deleted file mode 100644
index 0680fd82180a..000000000000
--- a/net-wireless/linux-wlan-ng-modules/files/digest-linux-wlan-ng-modules-0.2.3-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f26e41336a2838d69a366ab3a2d93ea0 linux-wlan-ng-0.2.3.tar.bz2 454053
-RMD160 a39a6f17dd8a745992a557605d3f5734d8b7de95 linux-wlan-ng-0.2.3.tar.bz2 454053
-SHA256 97004d6cefd1b5c5f37efc1603e4103f9a809d79f8cc0faf2397fa882cdd6ee6 linux-wlan-ng-0.2.3.tar.bz2 454053
diff --git a/net-wireless/linux-wlan-ng-modules/files/digest-linux-wlan-ng-modules-0.2.5 b/net-wireless/linux-wlan-ng-modules/files/digest-linux-wlan-ng-modules-0.2.5
deleted file mode 100644
index f91173cb625c..000000000000
--- a/net-wireless/linux-wlan-ng-modules/files/digest-linux-wlan-ng-modules-0.2.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b4f6eb438533f73cd456e5ee7a3f722a linux-wlan-ng-0.2.5.tar.bz2 457056
-RMD160 3bd08380d9bd131ad960a8b3c9dd87972254357a linux-wlan-ng-0.2.5.tar.bz2 457056
-SHA256 882f5fe8c3e3a2538f59e96d002866aea1ce3ad33396da0cea7721455f4a42be linux-wlan-ng-0.2.5.tar.bz2 457056
diff --git a/net-wireless/linux-wlan-ng-modules/files/digest-linux-wlan-ng-modules-0.2.5-r1 b/net-wireless/linux-wlan-ng-modules/files/digest-linux-wlan-ng-modules-0.2.5-r1
deleted file mode 100644
index f91173cb625c..000000000000
--- a/net-wireless/linux-wlan-ng-modules/files/digest-linux-wlan-ng-modules-0.2.5-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b4f6eb438533f73cd456e5ee7a3f722a linux-wlan-ng-0.2.5.tar.bz2 457056
-RMD160 3bd08380d9bd131ad960a8b3c9dd87972254357a linux-wlan-ng-0.2.5.tar.bz2 457056
-SHA256 882f5fe8c3e3a2538f59e96d002866aea1ce3ad33396da0cea7721455f4a42be linux-wlan-ng-0.2.5.tar.bz2 457056
diff --git a/net-wireless/linux-wlan-ng-modules/files/digest-linux-wlan-ng-modules-0.2.7 b/net-wireless/linux-wlan-ng-modules/files/digest-linux-wlan-ng-modules-0.2.7
deleted file mode 100644
index d68706d62fa9..000000000000
--- a/net-wireless/linux-wlan-ng-modules/files/digest-linux-wlan-ng-modules-0.2.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b2b0ffd11d27c72a9c01b8a9ef3832b7 linux-wlan-ng-0.2.7.tar.bz2 456941
-RMD160 8c9e065a5038aed3750d4b7e0085e461a5ec19b1 linux-wlan-ng-0.2.7.tar.bz2 456941
-SHA256 9dbd0f6c92b33ae8b96c5a045a341a00b2454492c2229839d056e4fd1488bca5 linux-wlan-ng-0.2.7.tar.bz2 456941
diff --git a/net-wireless/linux-wlan-ng-modules/files/digest-linux-wlan-ng-modules-0.2.8 b/net-wireless/linux-wlan-ng-modules/files/digest-linux-wlan-ng-modules-0.2.8
new file mode 100644
index 000000000000..99c1aa9bee3b
--- /dev/null
+++ b/net-wireless/linux-wlan-ng-modules/files/digest-linux-wlan-ng-modules-0.2.8
@@ -0,0 +1,3 @@
+MD5 5d86ca7bb4ed458743acd922ff09dae6 linux-wlan-ng-0.2.8.tar.bz2 462193
+RMD160 1b246f4603589641e4d637205cda39602f586cf2 linux-wlan-ng-0.2.8.tar.bz2 462193
+SHA256 e4b6ab08eaff2766c3bf85ea8d63ab31ae774266b8351772117fcc94d1318ade linux-wlan-ng-0.2.8.tar.bz2 462193
diff --git a/net-wireless/linux-wlan-ng-modules/files/linux-wlan-ng-0.2.3-kernel-2.6.16.patch b/net-wireless/linux-wlan-ng-modules/files/linux-wlan-ng-0.2.3-kernel-2.6.16.patch
deleted file mode 100644
index 5dca0a306ab2..000000000000
--- a/net-wireless/linux-wlan-ng-modules/files/linux-wlan-ng-0.2.3-kernel-2.6.16.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- o/src/prism2/driver/prism2_usb.c	2005-09-19 19:57:08.000000000 +0200 
-+++ p/src/prism2/driver/prism2_usb.c	2006-02-17 00:15:31.000000000 +0100
-@@ -313,7 +313,8 @@ 
-
- struct usb_driver prism2_usb_driver = {
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,19))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,19) && \
-+     LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16))
- 	.owner = THIS_MODULE,
- #endif
- 	.name = "prism2_usb",
\ No newline at end of file
diff --git a/net-wireless/linux-wlan-ng-modules/files/linux-wlan-ng-0.2.3-kernel-2.6.17.patch b/net-wireless/linux-wlan-ng-modules/files/linux-wlan-ng-0.2.3-kernel-2.6.17.patch
deleted file mode 100644
index 9035996e250f..000000000000
--- a/net-wireless/linux-wlan-ng-modules/files/linux-wlan-ng-0.2.3-kernel-2.6.17.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/p80211/Makefile	(revision 1772)
-+++ src/p80211/Makefile	(working copy)
-@@ -74,7 +74,9 @@
- default:
- 
- ifeq ($(KERN_25), y)
--	$(MAKE) -C $(LINUX_SRC) M='$(PWD)/.. $(PWD)' WLAN_SRC=$(WLAN_SRC) modules
-+#	$(MAKE) -C $(LINUX_SRC) M='$(PWD)/.. $(PWD)' WLAN_SRC=$(WLAN_SRC) modules
-+	$(MAKE) -C $(LINUX_SRC) M='$(PWD)' WLAN_SRC=$(WLAN_SRC)
-+	cp Modules.symvers ../prism2/driver
- else
- 	$(MAKE) -C $(LINUX_SRC) SUBDIRS=$(PWD) WLAN_SRC=$(WLAN_SRC) modules
- endif # KERN_25
---- src/prism2/driver/Makefile	(revision 1772)
-+++ src/prism2/driver/Makefile	(working copy)
-@@ -84,8 +84,11 @@
- 
- default:
- ifeq ($(KERN_25), y)
--	$(MAKE) -C $(LINUX_SRC) M='$(PWD)/../.. $(PWD)' WLAN_SRC=$(WLAN_SRC) \
--		modules
-+#	$(MAKE) -C $(LINUX_SRC) M='$(PWD)/../.. $(PWD)' WLAN_SRC=$(WLAN_SRC) \
-+#		modules
-+
-+	$(MAKE) -C $(LINUX_SRC) M='$(PWD)' WLAN_SRC=$(WLAN_SRC)
-+
- else # kbuild 2.4
- 	$(MAKE) -C $(LINUX_SRC) SUBDIRS=$(PWD) WLAN_SRC=$(WLAN_SRC) \
- 		modules
diff --git a/net-wireless/linux-wlan-ng-modules/files/linux-wlan-ng-0.2.3-module_param.patch b/net-wireless/linux-wlan-ng-modules/files/linux-wlan-ng-0.2.3-module_param.patch
deleted file mode 100644
index 78ba7f48582c..000000000000
--- a/net-wireless/linux-wlan-ng-modules/files/linux-wlan-ng-0.2.3-module_param.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur linux-wlan-ng-0.2.3.old/src/prism2/driver/prism2_cs.c linux-wlan-ng-0.2.3/src/prism2/driver/prism2_cs.c
---- linux-wlan-ng-0.2.3.old/src/prism2/driver/prism2_cs.c	2005-12-19 00:10:31.529760168 +0200
-+++ linux-wlan-ng-0.2.3/src/prism2/driver/prism2_cs.c	2005-12-19 00:12:59.458271616 +0200
-@@ -21,7 +21,7 @@
- 						 * is set to and what the CIS
- 						 * says.
- 						 */
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11) )
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11)) && (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
- #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,8))
- static int numlist = 4;
- module_param_array(irq_list, int, numlist, 0444);
diff --git a/net-wireless/linux-wlan-ng-modules/files/linux-wlan-ng-0.2.5-kernel-2.6.19.patch b/net-wireless/linux-wlan-ng-modules/files/linux-wlan-ng-0.2.5-kernel-2.6.19.patch
deleted file mode 100644
index d17e82f76e50..000000000000
--- a/net-wireless/linux-wlan-ng-modules/files/linux-wlan-ng-0.2.5-kernel-2.6.19.patch
+++ /dev/null
@@ -1,247 +0,0 @@
-Index: src/include/wlan/wlan_compat.h
-===================================================================
---- src/include/wlan/wlan_compat.h	(revision 1800)
-+++ src/include/wlan/wlan_compat.h	(working copy)
-@@ -89,6 +89,11 @@
- #endif
- 
- #if defined(__KERNEL__)
-+
-+#ifndef AUTOCONF_INCLUDED
-+#include <linux/config.h>
-+#endif
-+
- #if defined(__x86_64__)
- 	#define WLAN_CPU_FAMILY		WLAN_x86_64
- 	#define WLAN_SYSARCH		WLAN_PCAT
-@@ -276,6 +281,12 @@
- 
- #if defined(__KERNEL__)
- 
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
-+#define PT_REGS    , struct pt_regs *regs
-+#else
-+#define PT_REGS
-+#endif
-+
- #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,7))
- #  define del_singleshot_timer_sync(a)  del_timer_sync(a)
- #endif
-Index: src/p80211/p80211conv.c
-===================================================================
---- src/p80211/p80211conv.c	(revision 1800)
-+++ src/p80211/p80211conv.c	(working copy)
-@@ -54,7 +54,7 @@
- 
- #define __NO_VERSION__		/* prevent the static definition */
- 
--#include <linux/config.h>
-+
- #include <linux/version.h>
- 
- #include <linux/module.h>
-Index: src/p80211/p80211netdev.c
-===================================================================
---- src/p80211/p80211netdev.c	(revision 1800)
-+++ src/p80211/p80211netdev.c	(working copy)
-@@ -53,7 +53,7 @@
- /*================================================================*/
- /* System Includes */
- 
--#include <linux/config.h>
-+
- #include <linux/version.h>
- 
- #include <linux/module.h>
-Index: src/p80211/p80211req.c
-===================================================================
---- src/p80211/p80211req.c	(revision 1800)
-+++ src/p80211/p80211req.c	(working copy)
-@@ -53,7 +53,7 @@
- /*================================================================*/
- /* System Includes */
- 
--#include <linux/config.h>
-+
- #include <linux/version.h>
- 
- #include <linux/module.h>
-Index: src/p80211/p80211wext.c
-===================================================================
---- src/p80211/p80211wext.c	(revision 1800)
-+++ src/p80211/p80211wext.c	(working copy)
-@@ -37,7 +37,7 @@
- /*================================================================*/
- /* System Includes */
- 
--#include <linux/config.h>
-+
- #include <linux/version.h>
- 
- #include <linux/kernel.h>
-Index: src/p80211/p80211wep.c
-===================================================================
---- src/p80211/p80211wep.c	(revision 1800)
-+++ src/p80211/p80211wep.c	(working copy)
-@@ -48,7 +48,7 @@
- /*================================================================*/
- /* System Includes */
- 
--#include <linux/config.h>
-+
- #include <linux/version.h>
- 
- #include <linux/netdevice.h>
-Index: src/p80211/p80211mod.c
-===================================================================
---- src/p80211/p80211mod.c	(revision 1800)
-+++ src/p80211/p80211mod.c	(working copy)
-@@ -56,7 +56,7 @@
- /*================================================================*/
- /* System Includes */
- 
--#include <linux/config.h>
-+
- #include <linux/version.h>
- 
- #include <linux/module.h>
-Index: src/prism2/driver/hfa384x_usb.c
-===================================================================
---- src/prism2/driver/hfa384x_usb.c	(revision 1800)
-+++ src/prism2/driver/hfa384x_usb.c	(working copy)
-@@ -116,7 +116,7 @@
- 
- #include <wlan/version.h>
- 
--#include <linux/config.h>
-+
- #include <linux/version.h>
- 
- #include <linux/module.h>
-Index: src/prism2/driver/prism2_cs.c
-===================================================================
---- src/prism2/driver/prism2_cs.c	(revision 1800)
-+++ src/prism2/driver/prism2_cs.c	(working copy)
-@@ -41,7 +41,7 @@
- #else
- dev_link_t	*prism2sta_attach(void);
- static void	prism2sta_detach(dev_link_t *link);
--static int	prism2sta_config(dev_link_t *link);
-+static void	prism2sta_config(dev_link_t *link);
- static void	prism2sta_release(u_long arg);
- static int 	prism2sta_event (event_t event, int priority, event_callback_args_t *args);
- 
-@@ -243,14 +243,13 @@
- 	prism2sta_ifstate(wlandev, P80211ENUM_ifstate_disable);
- #else
- 	wlandev = link->priv;
--#endif
--	wlandev = link->priv;
- 
-         link->state |= DEV_SUSPEND;
-         if (link->state & DEV_CONFIG) {	
- 		prism2sta_ifstate(wlandev, P80211ENUM_ifstate_disable);
- 		pcmcia_release_configuration(link->handle);
- 	}
-+#endif
- 
- 	DBFEXIT;
- 
-Index: src/prism2/driver/prism2mgmt.c
-===================================================================
---- src/prism2/driver/prism2mgmt.c	(revision 1800)
-+++ src/prism2/driver/prism2mgmt.c	(working copy)
-@@ -63,7 +63,7 @@
- 
- #include <wlan/version.h>
- 
--#include <linux/config.h>
-+
- #include <linux/version.h>
- 
- #include <linux/if_arp.h>
-Index: src/prism2/driver/prism2mib.c
-===================================================================
---- src/prism2/driver/prism2mib.c	(revision 1800)
-+++ src/prism2/driver/prism2mib.c	(working copy)
-@@ -56,7 +56,7 @@
- 
- #include <wlan/version.h>
- 
--#include <linux/config.h>
-+
- #include <linux/version.h>
- 
- #include <linux/module.h>
-Index: src/prism2/driver/prism2sta.c
-===================================================================
---- src/prism2/driver/prism2sta.c	(revision 1800)
-+++ src/prism2/driver/prism2sta.c	(working copy)
-@@ -56,7 +56,7 @@
- 
- #include <wlan/version.h>
- 
--#include <linux/config.h>
-+
- #include <linux/version.h>
- 
- #include <linux/module.h>
-Index: src/prism2/driver/hfa384x.c
-===================================================================
---- src/prism2/driver/hfa384x.c	(revision 1800)
-+++ src/prism2/driver/hfa384x.c	(working copy)
-@@ -120,7 +120,7 @@
- #define WLAN_DBVAR	prism2_debug
- #include <wlan/version.h>
- 
--#include <linux/config.h>
-+
- #include <linux/version.h>
- 
- #include <linux/module.h>
-@@ -3210,7 +3210,7 @@
- * Call context:
- *	Ummm, could it be interrupt?
- ----------------------------------------------------------------*/
--irqreturn_t hfa384x_interrupt(int irq, void *dev_id, struct pt_regs *regs)
-+irqreturn_t hfa384x_interrupt(int irq, void *dev_id PT_REGS)
- {
- 	int			reg;
- 	wlandevice_t		*wlandev = (wlandevice_t*)dev_id;
-Index: src/README
-===================================================================
---- src/README	(revision 1800)
-+++ src/README	(working copy)
-@@ -53,4 +53,3 @@
- src/prism2	- source for the Intersil PRISM2 MAC specific driver
- src/shared	- source files (.c) that are shared among two or more components
- src/wlanctl	- source for the wlanctl user-mode utility
--src/wland	- source for the wland user-mode utility
-Index: CHANGES
-===================================================================
---- CHANGES	(revision 1800)
-+++ CHANGES	(working copy)
-@@ -41,6 +41,11 @@
- * Intersil Corporation as part of PRISM(R) chipset product development.
- *
- * --------------------------------------------------------------------
-+ - 2.6.19+ uses a different IRQ handler function prototype.
-+ - linux/config.h is no more on 2.6.19+ kernels.
-+0.2.6
-+ - Fix another error that affected <2.6.15 builds on some compilers
-+ - Fix a cut-n-paste error that broke 2.6.18 builds.
- 0.2.5
-  - 2.6.18-rc fixes.
-  - A few tweaks for Wireless-Extensions-21
-Index: config.in
-===================================================================
---- config.in	(revision 1800)
-+++ config.in	(working copy)
-@@ -1,6 +1,6 @@
- WLAN_VERSION=0
- WLAN_PATCHLEVEL=2
--WLAN_SUBLEVEL=5
-+WLAN_SUBLEVEL=6
- WLAN_EXTRAVERSION=
- #LINUX_SRC=/usr/src/linux
- PCMCIA_SRC=
diff --git a/net-wireless/linux-wlan-ng-modules/files/linux-wlan-ng-0.2.7-kernel-2.6.20.patch b/net-wireless/linux-wlan-ng-modules/files/linux-wlan-ng-0.2.7-kernel-2.6.20.patch
deleted file mode 100644
index 4c88ad1b2432..000000000000
--- a/net-wireless/linux-wlan-ng-modules/files/linux-wlan-ng-0.2.7-kernel-2.6.20.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -rU2 linux-wlan-ng-0.2.7/src/prism2/driver/hfa384x.c linux-wlan-ng-0.2.7.new/src/prism2/driver/hfa384x.c
---- linux-wlan-ng-0.2.7/src/prism2/driver/hfa384x.c	2006-11-10 15:28:33.000000000 +0100
-+++ linux-wlan-ng-0.2.7.new/src/prism2/driver/hfa384x.c	2007-04-30 12:47:05.000000000 +0200
-@@ -353,7 +353,7 @@
- 	skb_queue_head_init(&hw->authq);
- 
--	INIT_WORK(&hw->link_bh, prism2sta_processing_defer, hw);
-+	INIT_WORK2(&hw->link_bh, prism2sta_processing_defer);
- 
--        INIT_WORK(&hw->commsqual_bh, prism2sta_commsqual_defer, hw);
-+        INIT_WORK2(&hw->commsqual_bh, prism2sta_commsqual_defer);
- 
- 	init_timer(&hw->commsqual_timer);
-diff -rU2 linux-wlan-ng-0.2.7/src/prism2/driver/hfa384x_usb.c linux-wlan-ng-0.2.7.new/src/prism2/driver/hfa384x_usb.c
---- linux-wlan-ng-0.2.7/src/prism2/driver/hfa384x_usb.c	2006-11-02 16:56:40.000000000 +0100
-+++ linux-wlan-ng-0.2.7.new/src/prism2/driver/hfa384x_usb.c	2007-04-30 12:11:57.000000000 +0200
-@@ -712,6 +712,6 @@
- 	             hfa384x_usbctlx_completion_task,
- 	             (unsigned long)hw);
--	INIT_WORK(&hw->link_bh, prism2sta_processing_defer, hw);
--	INIT_WORK(&hw->usb_work, hfa384x_usb_defer, hw);
-+	INIT_WORK2(&hw->link_bh, prism2sta_processing_defer);
-+	INIT_WORK2(&hw->usb_work, hfa384x_usb_defer);
- 
- 	init_timer(&hw->throttle);
-@@ -734,5 +734,5 @@
- 	hw->state = HFA384x_STATE_INIT;
- 
--        INIT_WORK(&hw->commsqual_bh, prism2sta_commsqual_defer, hw);
-+        INIT_WORK2(&hw->commsqual_bh, prism2sta_commsqual_defer);
- 	init_timer(&hw->commsqual_timer);
- 	hw->commsqual_timer.data = (unsigned long) hw;
-diff -rU2 linux-wlan-ng-0.2.7/src/prism2/driver/prism2sta.c linux-wlan-ng-0.2.7.new/src/prism2/driver/prism2sta.c
---- linux-wlan-ng-0.2.7/src/prism2/driver/prism2sta.c	2006-11-02 16:56:40.000000000 +0100
-+++ linux-wlan-ng-0.2.7.new/src/prism2/driver/prism2sta.c	2007-04-30 12:44:37.000000000 +0200
-@@ -1439,7 +1439,7 @@
- }
- 
--void prism2sta_processing_defer(void *data)
-+void prism2sta_processing_defer(struct work_struct *data)
- {
--	hfa384x_t		*hw = (hfa384x_t *) data;
-+	hfa384x_t               *hw = container_of(data, struct hfa384x, link_bh);
- 	wlandevice_t            *wlandev = hw->wlandev;
- 	hfa384x_bytestr32_t ssid;
-@@ -1541,5 +1541,5 @@
- 
- 			/* Get the ball rolling on the comms quality stuff */
--			prism2sta_commsqual_defer(hw);
-+			prism2sta_commsqual_defer(&hw->commsqual_bh);
- 		}
- 		break;
-@@ -2414,5 +2414,5 @@
- #endif
- 
--void prism2sta_commsqual_defer(void *data)
-+void prism2sta_commsqual_defer(struct work_struct *data)
- {
-         hfa384x_t               *hw = (hfa384x_t *) data;
-diff -rU2 linux-wlan-ng-0.2.7/src/prism2/include/prism2/prism2mgmt.h linux-wlan-ng-0.2.7.new/src/prism2/include/prism2/prism2mgmt.h
---- linux-wlan-ng-0.2.7/src/prism2/include/prism2/prism2mgmt.h	2005-04-26 17:43:07.000000000 +0200
-+++ linux-wlan-ng-0.2.7.new/src/prism2/include/prism2/prism2mgmt.h	2007-04-30 12:08:14.000000000 +0200
-@@ -169,7 +169,7 @@
- int prism2mgmt_get_grpaddr_index( UINT32 did );
- 
--void prism2sta_processing_defer(void *data);
-+void prism2sta_processing_defer(struct work_struct *data);
- 
--void prism2sta_commsqual_defer(void *data);
-+void prism2sta_commsqual_defer(struct work_struct *data);
- void prism2sta_commsqual_timer(unsigned long data);
- 
diff --git a/net-wireless/linux-wlan-ng-modules/linux-wlan-ng-modules-0.2.3-r1.ebuild b/net-wireless/linux-wlan-ng-modules/linux-wlan-ng-modules-0.2.3-r1.ebuild
deleted file mode 100644
index 3528b1cc2738..000000000000
--- a/net-wireless/linux-wlan-ng-modules/linux-wlan-ng-modules-0.2.3-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng-modules/linux-wlan-ng-modules-0.2.3-r1.ebuild,v 1.3 2006/08/26 07:51:28 betelgeuse Exp $
-
-inherit eutils linux-mod
-
-MY_PN=${PN/-modules/}
-MY_P=${MY_PN}-${PV}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Kernel modules for Prism2/2.5/3 based 802.11b USB wireless LAN products"
-HOMEPAGE="http://linux-wlan.org"
-SRC_URI="ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/${MY_P}.tar.bz2"
-
-LICENSE="|| ( GPL-2 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE="debug"
-
-BUILD_TARGETS="default"
-BUILD_PARAMS="WLAN_SRC=${S}/src"
-
-DEPEND="!<net-wireless/linux-wlan-ng-0.2.2"
-
-pkg_setup() {
-	# We have to put this to the global scope inside the function or it will be
-	# reset between functions because the ebuild is sourced many times.
-
-	MODULE_NAMES="p80211(net/wireless:${S}/src/p80211)"
-	MODULE_NAMES="${MODULE_NAMES} prism2_usb(net/wireless:${S}/src/prism2/driver)"
-
-	linux-mod_pkg_setup
-}
-
-config_by_usevar() {
-	local config=${3}
-	[[ -z ${config} ]] && config=${S}/default.config
-
-	if use ${2}; then
-		echo "${1}=y" >> ${config}
-	else
-		echo "${1}=n" >> ${config}
-	fi
-}
-
-src_unpack() {
-	local config=${S}/default.config
-
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${MY_P}-module_param.patch
-	epatch ${FILESDIR}/${MY_P}-kernel-2.6.16.patch
-	kernel_is gt 2 6 16 && 	epatch ${FILESDIR}/${MY_P}-kernel-2.6.17.patch
-
-	cp ${S}/config.in ${config}
-
-	echo "TARGET_ROOT_ON_HOST=${D}" >> ${config}
-	echo "LINUX_SRC=${KERNEL_DIR}"  >> ${config}
-	echo "FIRMWARE_DIR=/lib/firmware/" >> ${config}
-	echo "PRISM2_PCI=n" >> ${config}
-	echo "PRISM2_PLX=n" >> ${config}
-	echo "PRISM2_PCMCIA=n" >> ${config}
-	echo "PRISM2_USB=y" >> ${config}
-
-	config_by_usevar WLAN_DEBUG debug
-
-	if kernel_is gt 2 4; then
-		echo "KERN_25=y" >> ${config}
-	fi
-
-	sed -i -e "s:dep modules:modules:" ${S}/src/p80211/Makefile
-}
-
-src_compile() {
-	set_arch_to_kernel
-	emake default_config || die "emake default_config failed"
-	set_arch_to_portage
-
-	cd ${S}/src/mkmeta
-	emake || die "emake mkmeta failed"
-
-	linux-mod_src_compile
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	einfo "Support for pci, plx and pcmcia drivers has been removed in"
-	einfo "revision. For pci, plx and pcmcia drivers try for example"
-	einfo "the hostap-driver or orinoco drivers. They both work with the"
-	einfo "standard wireless tools."
-	einfo ""
-	einfo "If they do not work, please report this to betelgeuse@gentoo.org."
-}
diff --git a/net-wireless/linux-wlan-ng-modules/linux-wlan-ng-modules-0.2.3.ebuild b/net-wireless/linux-wlan-ng-modules/linux-wlan-ng-modules-0.2.3.ebuild
deleted file mode 100644
index 4735046516cd..000000000000
--- a/net-wireless/linux-wlan-ng-modules/linux-wlan-ng-modules-0.2.3.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng-modules/linux-wlan-ng-modules-0.2.3.ebuild,v 1.3 2006/03/25 08:16:05 betelgeuse Exp $
-
-inherit eutils linux-mod
-
-MY_PN=${PN/-modules/}
-MY_P=${MY_PN}-${PV}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Kernel modules for Prism2/2.5/3 based 802.11b wireless LAN products"
-HOMEPAGE="http://linux-wlan.org"
-SRC_URI="ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/${MY_P}.tar.bz2"
-
-LICENSE="|| ( GPL-2 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE="debug pci pcmcia plx usb"
-
-BUILD_TARGETS="default"
-BUILD_PARAMS="WLAN_SRC=${S}/src"
-
-show_deprecated_message() {
-	if use pci || use plx || use pcmcia; then
-		einfo ""
-		einfo "You really should try other alternatives for prism support."
-		einfo "For example the hostap-driver or orinoco drivers should work"
-		einfo "with your wireless card. Support for pci, plx and pcmcia drivers"
-		einfo "will most likely be removed in the near future. If the alternatives"
-		einfo "don't work for you, please report this to betelgeuse@gentoo.org."
-		einfo ""
-	fi
-}
-
-pkg_setup() {
-	# We have to put this to the global scope inside the function or it will be
-	# reset between functions because the ebuild is sourced many times.
-
-	MODULE_NAMES="p80211(net/wireless:${S}/src/p80211)"
-
-	if use pci; then
-		MODULE_NAMES="${MODULE_NAMES} prism2_pci(net/wireless:${S}/src/prism2/driver)"
-	fi
-
-	if use plx; then
-		MODULE_NAMES="${MODULE_NAMES} prism2_plx(net/wireless:${S}/src/prism2/driver)"
-	fi
-
-	if use pcmcia; then
-		MODULE_NAMES="${MODULE_NAMES} prism2_cs(net/wireless:${S}/src/prism2/driver)"
-	fi
-
-	if use usb; then
-		MODULE_NAMES="${MODULE_NAMES} prism2_usb(net/wireless:${S}/src/prism2/driver)"
-	fi
-
-	show_deprecated_message
-	linux-mod_pkg_setup
-}
-
-config_by_usevar() {
-	local config=${3}
-	[[ -z ${config} ]] && config=${S}/default.config
-
-	if use ${2}; then
-		echo "${1}=y" >> ${config}
-	else
-		echo "${1}=n" >> ${config}
-	fi
-}
-
-src_unpack() {
-	local config=${S}/default.config
-
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${MY_P}-module_param.patch
-	epatch ${FILESDIR}/${MY_P}-kernel-2.6.16.patch
-
-	cp ${S}/config.in ${config}
-
-	echo "TARGET_ROOT_ON_HOST=${D}" >> ${config}
-	echo "LINUX_SRC=${KERNEL_DIR}"  >> ${config}
-	echo "FIRMWARE_DIR=/lib/firmware/" >> ${config}
-
-	if use pcmcia && [[ -n "${PCMCIA_VERSION}" ]]; then
-		echo "PCMCIA_SRC=${PCMCIA_SOURCE_DIR}" >> ${config}
-	fi
-
-	config_by_usevar PRISM2_USB usb
-	config_by_usevar PRISM2_PCI pci
-	config_by_usevar PRISM2_PLX plx
-	config_by_usevar PRISM2_PCMCIA pcmcia
-	config_by_usevar WLAN_DEBUG debug
-
-	if kernel_is gt 2 4; then
-		echo "KERN_25=y" >> ${config}
-	fi
-
-	sed -i -e "s:dep modules:modules:" ${S}/src/p80211/Makefile
-}
-
-src_compile() {
-	set_arch_to_kernel
-	emake default_config || die "emake default_config failed"
-	set_arch_to_portage
-
-	cd ${S}/src/mkmeta
-	emake || die "emake mkmeta failed"
-
-	linux-mod_src_compile
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	show_deprecated_message
-}
diff --git a/net-wireless/linux-wlan-ng-modules/linux-wlan-ng-modules-0.2.5-r1.ebuild b/net-wireless/linux-wlan-ng-modules/linux-wlan-ng-modules-0.2.5-r1.ebuild
deleted file mode 100644
index 492027c2f4a8..000000000000
--- a/net-wireless/linux-wlan-ng-modules/linux-wlan-ng-modules-0.2.5-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng-modules/linux-wlan-ng-modules-0.2.5-r1.ebuild,v 1.1 2006/12/03 09:39:11 betelgeuse Exp $
-
-inherit eutils linux-mod
-
-MY_PN=${PN/-modules/}
-MY_P=${MY_PN}-${PV}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Kernel modules for Prism2/2.5/3 based 802.11b USB wireless LAN products"
-HOMEPAGE="http://linux-wlan.org"
-SRC_URI="ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/${MY_P}.tar.bz2"
-
-LICENSE="|| ( GPL-2 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE="debug"
-
-BUILD_TARGETS="default"
-BUILD_PARAMS="WLAN_SRC=${S}/src"
-
-DEPEND="!<net-wireless/linux-wlan-ng-0.2.2"
-
-pkg_setup() {
-	# We have to put this to the global scope inside the function or it will be
-	# reset between functions because the ebuild is sourced many times.
-
-	MODULE_NAMES="p80211(net/wireless:${S}/src/p80211)"
-	MODULE_NAMES="${MODULE_NAMES} prism2_usb(net/wireless:${S}/src/prism2/driver)"
-
-	linux-mod_pkg_setup
-}
-
-config_by_usevar() {
-	local config=${3}
-	[[ -z ${config} ]] && config=${S}/default.config
-
-	if use ${2}; then
-		echo "${1}=y" >> ${config}
-	else
-		echo "${1}=n" >> ${config}
-	fi
-}
-
-src_unpack() {
-	local config=${S}/default.config
-
-	unpack ${A}
-
-	cd ${S}
-	epatch "${FILESDIR}/${MY_PN}-0.2.5-kernel-2.6.19.patch"
-	epatch "${FILESDIR}/${MY_PN}-0.2.5-sandbox.patch"
-
-	cp ${S}/config.in ${config}
-
-	echo "TARGET_ROOT_ON_HOST=${D}" >> ${config}
-	echo "LINUX_SRC=${KERNEL_DIR}"  >> ${config}
-	echo "FIRMWARE_DIR=/lib/firmware/" >> ${config}
-	echo "PRISM2_PCI=n" >> ${config}
-	echo "PRISM2_PLX=n" >> ${config}
-	echo "PRISM2_PCMCIA=n" >> ${config}
-	echo "PRISM2_USB=y" >> ${config}
-
-	config_by_usevar WLAN_DEBUG debug
-
-	sed -i -e "s:dep modules:modules:" ${S}/src/p80211/Makefile
-}
-
-src_compile() {
-	set_arch_to_kernel
-	emake default_config || die "emake default_config failed"
-	set_arch_to_portage
-
-	cd ${S}/src/mkmeta
-	emake || die "emake mkmeta failed"
-
-	linux-mod_src_compile
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	einfo "Support for pci, plx and pcmcia drivers has been removed in"
-	einfo "revision. For pci, plx and pcmcia drivers try for example"
-	einfo "the hostap-driver or orinoco drivers. They both work with the"
-	einfo "standard wireless tools."
-	einfo ""
-	einfo "If they do not work, please report this to betelgeuse@gentoo.org."
-}
diff --git a/net-wireless/linux-wlan-ng-modules/linux-wlan-ng-modules-0.2.5.ebuild b/net-wireless/linux-wlan-ng-modules/linux-wlan-ng-modules-0.2.5.ebuild
deleted file mode 100644
index 6bc4da4c7650..000000000000
--- a/net-wireless/linux-wlan-ng-modules/linux-wlan-ng-modules-0.2.5.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng-modules/linux-wlan-ng-modules-0.2.5.ebuild,v 1.1 2006/10/08 19:09:23 betelgeuse Exp $
-
-inherit eutils linux-mod
-
-MY_PN=${PN/-modules/}
-MY_P=${MY_PN}-${PV}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Kernel modules for Prism2/2.5/3 based 802.11b USB wireless LAN products"
-HOMEPAGE="http://linux-wlan.org"
-SRC_URI="ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/${MY_P}.tar.bz2"
-
-LICENSE="|| ( GPL-2 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE="debug"
-
-BUILD_TARGETS="default"
-BUILD_PARAMS="WLAN_SRC=${S}/src"
-
-DEPEND="!<net-wireless/linux-wlan-ng-0.2.2"
-
-pkg_setup() {
-	# We have to put this to the global scope inside the function or it will be
-	# reset between functions because the ebuild is sourced many times.
-
-	MODULE_NAMES="p80211(net/wireless:${S}/src/p80211)"
-	MODULE_NAMES="${MODULE_NAMES} prism2_usb(net/wireless:${S}/src/prism2/driver)"
-
-	linux-mod_pkg_setup
-}
-
-config_by_usevar() {
-	local config=${3}
-	[[ -z ${config} ]] && config=${S}/default.config
-
-	if use ${2}; then
-		echo "${1}=y" >> ${config}
-	else
-		echo "${1}=n" >> ${config}
-	fi
-}
-
-src_unpack() {
-	local config=${S}/default.config
-
-	unpack ${A}
-
-	cd ${S}
-
-	cp ${S}/config.in ${config}
-
-	echo "TARGET_ROOT_ON_HOST=${D}" >> ${config}
-	echo "LINUX_SRC=${KERNEL_DIR}"  >> ${config}
-	echo "FIRMWARE_DIR=/lib/firmware/" >> ${config}
-	echo "PRISM2_PCI=n" >> ${config}
-	echo "PRISM2_PLX=n" >> ${config}
-	echo "PRISM2_PCMCIA=n" >> ${config}
-	echo "PRISM2_USB=y" >> ${config}
-
-	config_by_usevar WLAN_DEBUG debug
-
-	sed -i -e "s:dep modules:modules:" ${S}/src/p80211/Makefile
-}
-
-src_compile() {
-	set_arch_to_kernel
-	emake default_config || die "emake default_config failed"
-	set_arch_to_portage
-
-	cd ${S}/src/mkmeta
-	emake || die "emake mkmeta failed"
-
-	linux-mod_src_compile
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	einfo "Support for pci, plx and pcmcia drivers has been removed in"
-	einfo "revision. For pci, plx and pcmcia drivers try for example"
-	einfo "the hostap-driver or orinoco drivers. They both work with the"
-	einfo "standard wireless tools."
-	einfo ""
-	einfo "If they do not work, please report this to betelgeuse@gentoo.org."
-}
diff --git a/net-wireless/linux-wlan-ng-modules/linux-wlan-ng-modules-0.2.7.ebuild b/net-wireless/linux-wlan-ng-modules/linux-wlan-ng-modules-0.2.8.ebuild
index 82292b5551aa..6c52f299cd0d 100644
--- a/net-wireless/linux-wlan-ng-modules/linux-wlan-ng-modules-0.2.7.ebuild
+++ b/net-wireless/linux-wlan-ng-modules/linux-wlan-ng-modules-0.2.8.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/net-wireless/linux-wlan-ng-modules/linux-wlan-ng-modules-0.2.7.ebuild,v 1.1 2007/05/09 16:18:40 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng-modules/linux-wlan-ng-modules-0.2.8.ebuild,v 1.1 2007/05/09 16:30:52 genstef Exp $
 
 inherit eutils linux-mod
 
@@ -50,7 +50,6 @@ src_unpack() {
 	unpack ${A}
 
 	cd ${S}
-	epatch "${FILESDIR}/${MY_PN}-0.2.7-kernel-2.6.20.patch"
 	epatch "${FILESDIR}/${MY_PN}-0.2.5-sandbox.patch"
 
 	cp ${S}/config.in ${config}