Version bump, remove old ebuilds

(Portage version: 2.0.53_rc7)

27 files changed, 36 insertions, 556 deletions

diff --git a/net-wireless/madwifi-driver/ChangeLog b/net-wireless/madwifi-driver/ChangeLog
index e34bffa79e83..61596dc6a123 100644
--- a/net-wireless/madwifi-driver/ChangeLog
+++ b/net-wireless/madwifi-driver/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for net-wireless/madwifi-driver
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-driver/ChangeLog,v 1.27 2005/11/12 23:23:59 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-driver/ChangeLog,v 1.28 2005/11/13 16:34:22 genstef Exp $
+
+*madwifi-driver-0.1_pre20051111 (13 Nov 2005)
+
+  13 Nov 2005; Stefan Schweizer <genstef@gentoo.org>
+  -files/madwifi-driver-0.1-arp-packets-33958.patch,
+  -files/madwifi-driver-2.6.8-20040814-proc_dointvec.patch,
+  -files/madwifi-multi-ssid-support.patch,
+  -madwifi-driver-0.1_pre20050107.ebuild,
+  -madwifi-driver-0.1_pre20050224.ebuild,
+  -madwifi-driver-0.1_pre20050420.ebuild,
+  -madwifi-driver-0.1_pre20050809.ebuild,
+  -madwifi-driver-0.1_pre20050809-r1.ebuild,
+  -madwifi-driver-0.1_pre20051031.ebuild,
+  +madwifi-driver-0.1_pre20051111.ebuild:
+  Version bump, remove old ebuilds
 
   12 Nov 2005; Stefan Schweizer <genstef@gentoo.org>
   madwifi-driver-0.1_pre20051031.ebuild:
diff --git a/net-wireless/madwifi-driver/Manifest b/net-wireless/madwifi-driver/Manifest
index cdb4184616e6..27c2e0de2298 100644
--- a/net-wireless/madwifi-driver/Manifest
+++ b/net-wireless/madwifi-driver/Manifest
@@ -1,19 +1,6 @@
 MD5 ac7d1bcfeed513a4370d5698745ee6bd ChangeLog 5908
-MD5 283e94543234c3f396d65824fbcccb32 files/digest-madwifi-driver-0.1_pre20050107 85
-MD5 9ce1d64dc0d6c9a682a5d287a85eaf51 files/digest-madwifi-driver-0.1_pre20050224 85
-MD5 d4937e6f87128084a32ef792ddbccc6e files/digest-madwifi-driver-0.1_pre20050420 85
 MD5 d4937e6f87128084a32ef792ddbccc6e files/digest-madwifi-driver-0.1_pre20050420-r1 85
-MD5 18e8dd64189fffac2fac9689668d4fcf files/digest-madwifi-driver-0.1_pre20050809 85
-MD5 18e8dd64189fffac2fac9689668d4fcf files/digest-madwifi-driver-0.1_pre20050809-r1 85
-MD5 f14c460ff95aa3e3ad0f065c5e5d8aa3 files/digest-madwifi-driver-0.1_pre20051031 81
-MD5 444756b2062924ee7e0e631e956d46e9 files/madwifi-driver-0.1-arp-packets-33958.patch 704
-MD5 d9ea69973349d71e055b16a64039f1b7 files/madwifi-driver-2.6.8-20040814-proc_dointvec.patch 1749
-MD5 807179e31533b4895664bff1421f4381 files/madwifi-multi-ssid-support.patch 3343
-MD5 d31e367abf6bad427bff92479be44a28 madwifi-driver-0.1_pre20050107.ebuild 1558
-MD5 e0020685c1a32f48dd2bc8f2871c944e madwifi-driver-0.1_pre20050224.ebuild 1600
+MD5 91250d7eaa44ba70b4d71107fc259f8b files/digest-madwifi-driver-0.1_pre20051111 81
 MD5 1b9a0408676d910cdc32a019e1861364 madwifi-driver-0.1_pre20050420-r1.ebuild 1966
-MD5 854bc4696b95b7971755073267c3fb46 madwifi-driver-0.1_pre20050420.ebuild 1641
-MD5 f0cb84db3b036aaf10676122893a4214 madwifi-driver-0.1_pre20050809-r1.ebuild 2026
-MD5 a5437df679fa2707e622cfcc87824d8e madwifi-driver-0.1_pre20050809.ebuild 1829
-MD5 ad3a2e7305ec52fb339431eee6b154cc madwifi-driver-0.1_pre20051031.ebuild 2512
+MD5 1e4f3cadd0dc6783b36e5eaf5dfbfcc2 madwifi-driver-0.1_pre20051111.ebuild 2512
 MD5 19fd766bac8e110b4620363a1ace26dd metadata.xml 159
diff --git a/net-wireless/madwifi-driver/files/digest-madwifi-driver-0.1_pre20050107 b/net-wireless/madwifi-driver/files/digest-madwifi-driver-0.1_pre20050107
deleted file mode 100644
index 4a29fe3c0ed6..000000000000
--- a/net-wireless/madwifi-driver/files/digest-madwifi-driver-0.1_pre20050107
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8237d57be31464ddd7a710704e6755f0 madwifi-cvs-snapshot-2005-01-07.tar.bz2 1586914
diff --git a/net-wireless/madwifi-driver/files/digest-madwifi-driver-0.1_pre20050224 b/net-wireless/madwifi-driver/files/digest-madwifi-driver-0.1_pre20050224
deleted file mode 100644
index bbe0894c80b7..000000000000
--- a/net-wireless/madwifi-driver/files/digest-madwifi-driver-0.1_pre20050224
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9b758dc6c4480f06b13a159fe045675d madwifi-cvs-snapshot-2005-02-24.tar.bz2 1963511
diff --git a/net-wireless/madwifi-driver/files/digest-madwifi-driver-0.1_pre20050420 b/net-wireless/madwifi-driver/files/digest-madwifi-driver-0.1_pre20050420
deleted file mode 100644
index 3c4e3bf63ca5..000000000000
--- a/net-wireless/madwifi-driver/files/digest-madwifi-driver-0.1_pre20050420
+++ /dev/null
@@ -1 +0,0 @@
-MD5 efb9130cf1dcb829caa43af4e0bee2fb madwifi-cvs-snapshot-2005-04-20.tar.bz2 1968548
diff --git a/net-wireless/madwifi-driver/files/digest-madwifi-driver-0.1_pre20050809 b/net-wireless/madwifi-driver/files/digest-madwifi-driver-0.1_pre20050809
deleted file mode 100644
index e2e2260a20c0..000000000000
--- a/net-wireless/madwifi-driver/files/digest-madwifi-driver-0.1_pre20050809
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8c37acffb2f1164350092aec295321d2 madwifi-cvs-snapshot-2005-08-09.tar.bz2 2000214
diff --git a/net-wireless/madwifi-driver/files/digest-madwifi-driver-0.1_pre20050809-r1 b/net-wireless/madwifi-driver/files/digest-madwifi-driver-0.1_pre20050809-r1
deleted file mode 100644
index e2e2260a20c0..000000000000
--- a/net-wireless/madwifi-driver/files/digest-madwifi-driver-0.1_pre20050809-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8c37acffb2f1164350092aec295321d2 madwifi-cvs-snapshot-2005-08-09.tar.bz2 2000214
diff --git a/net-wireless/madwifi-driver/files/digest-madwifi-driver-0.1_pre20051031 b/net-wireless/madwifi-driver/files/digest-madwifi-driver-0.1_pre20051031
deleted file mode 100644
index c3840edd1e97..000000000000
--- a/net-wireless/madwifi-driver/files/digest-madwifi-driver-0.1_pre20051031
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c9ce40865dd34bc59529c5579e5263d1 madwifi-trunk-r1227-20051031.tar.gz 2826143
diff --git a/net-wireless/madwifi-driver/files/digest-madwifi-driver-0.1_pre20051111 b/net-wireless/madwifi-driver/files/digest-madwifi-driver-0.1_pre20051111
new file mode 100644
index 000000000000..f19f8125fed5
--- /dev/null
+++ b/net-wireless/madwifi-driver/files/digest-madwifi-driver-0.1_pre20051111
@@ -0,0 +1 @@
+MD5 25b7d7d7860eb04525f3992a1fe16b50 madwifi-trunk-r1325-20051111.tar.gz 3143677
diff --git a/net-wireless/madwifi-driver/files/madwifi-driver-0.1-arp-packets-33958.patch b/net-wireless/madwifi-driver/files/madwifi-driver-0.1-arp-packets-33958.patch
deleted file mode 100644
index 0e86d25919ac..000000000000
--- a/net-wireless/madwifi-driver/files/madwifi-driver-0.1-arp-packets-33958.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nrup madwifi-driver-0.1_pre20040514.orig/driver/if_ath.c madwifi-driver-0.1_pre20040514/driver/if_ath.c
---- madwifi-driver-0.1_pre20040514.orig/driver/if_ath.c	2004-05-14 19:31:03.000000000 -0400
-+++ madwifi-driver-0.1_pre20040514/driver/if_ath.c	2004-07-26 11:44:11.000000000 -0400
-@@ -759,7 +759,8 @@ ath_skbhdr_adjust(struct sk_buff *skb, s
- 
- 	if (ic->ic_flags & IEEE80211_F_WEPON)
- 		len += IEEE80211_WEP_IVLEN + IEEE80211_WEP_KIDLEN;
--	if ((skb_headroom(skb) < len) &&
-+	if (len < skb_headroom(skb)) len=skb_headroom(skb);
-+	if ((skb_cloned(skb) || (skb_headroom(skb) < len)) &&
- 	    pskb_expand_head(skb, len - skb_headroom(skb), 0, GFP_ATOMIC)) {
- 		dev_kfree_skb(skb);
- 		return -ENOMEM;
diff --git a/net-wireless/madwifi-driver/files/madwifi-driver-2.6.8-20040814-proc_dointvec.patch b/net-wireless/madwifi-driver/files/madwifi-driver-2.6.8-20040814-proc_dointvec.patch
deleted file mode 100644
index 0f28f5819dbf..000000000000
--- a/net-wireless/madwifi-driver/files/madwifi-driver-2.6.8-20040814-proc_dointvec.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -Naur old/ath/if_ath.c new/ath/if_ath.c
---- old/ath/if_ath.c	2004-08-05 19:17:21.000000000 -0400
-+++ new/ath/if_ath.c	2004-08-14 19:50:39.000000000 -0400
-@@ -4626,7 +4626,7 @@
- 
- static int
- ath_sysctl_halparam(ctl_table *ctl, int write, struct file *filp,
--	void *buffer, size_t *lenp)
-+	void __user *buffer, size_t *lenp, loff_t *ppos)
- {
- 	struct ath_softc *sc = ctl->extra1;
- 	u_int val;
-@@ -4635,7 +4635,7 @@
- 	ctl->data = &val;
- 	ctl->maxlen = sizeof(val);
- 	if (write) {
--		ret = proc_dointvec(ctl, write, filp, buffer, lenp);
-+		ret = proc_dointvec(ctl, write, filp, buffer, lenp, ppos);
- 		if (ret == 0) {
- 			switch (ctl->ctl_name) {
- 			case ATH_SLOTTIME:
-@@ -4687,7 +4687,7 @@
- 		default:
- 			return -EINVAL;
- 		}
--		ret = proc_dointvec(ctl, write, filp, buffer, lenp);
-+		ret = proc_dointvec(ctl, write, filp, buffer, lenp, ppos);
- 	}
- 	return ret;
- }
-diff -Naur old/net80211/ieee80211_linux.c new/net80211/ieee80211_linux.c
---- old/net80211/ieee80211_linux.c	2004-08-05 13:34:54.000000000 -0400
-+++ new/net80211/ieee80211_linux.c	2004-08-14 19:49:24.000000000 -0400
-@@ -357,7 +357,7 @@
- 
- static int
- ieee80211_sysctl_debug(ctl_table *ctl, int write, struct file *filp,
--	void *buffer, size_t *lenp)
-+	void __user *buffer, size_t *lenp, loff_t *ppos)
- {
- 	struct ieee80211com *ic = ctl->extra1;
- 	u_int val;
-@@ -366,12 +366,12 @@
- 	ctl->data = &val;
- 	ctl->maxlen = sizeof(val);
- 	if (write) {
--		ret = proc_dointvec(ctl, write, filp, buffer, lenp);
-+		ret = proc_dointvec(ctl, write, filp, buffer, lenp, ppos);
- 		if (ret == 0)
- 			ic->msg_enable = val;
- 	} else {
- 		val = ic->msg_enable;
--		ret = proc_dointvec(ctl, write, filp, buffer, lenp);
-+		ret = proc_dointvec(ctl, write, filp, buffer, lenp, ppos);
- 	}
- 	return ret;
- }
diff --git a/net-wireless/madwifi-driver/files/madwifi-multi-ssid-support.patch b/net-wireless/madwifi-driver/files/madwifi-multi-ssid-support.patch
deleted file mode 100644
index b62a5e60204d..000000000000
--- a/net-wireless/madwifi-driver/files/madwifi-multi-ssid-support.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-Index: net80211/ieee80211_input.c
-===================================================================
-RCS file: /cvsroot/madwifi/madwifi/net80211/ieee80211_input.c,v
-retrieving revision 1.12
-diff -u -r1.12 ieee80211_input.c
---- madwifi/net80211/ieee80211_input.c	19 Aug 2004 02:15:44 -0000	1.12
-+++ madwifi/net80211/ieee80211_input.c	25 Aug 2004 17:14:08 -0000
-@@ -1684,17 +1684,20 @@
- 		}
- 
- 		/*
--		 * Use mac and channel for lookup so we collect all
--		 * potential AP's when scanning.  Otherwise we may
-+		 * Use mac, channel and SSID for lookup so we collect all
-+		 * potential AP's with all SSIDs when scanning.  Otherwise we may
- 		 * see the same AP on multiple channels and will only
--		 * record the last one.  We could filter APs here based
-+		 * record the last one, or omit the second response from an
-+		 * AP supporting several SSIDs.  We could filter APs here based
- 		 * on rssi, etc. but leave that to the end of the scan
- 		 * so we can keep the selection criteria in one spot.
- 		 * This may result in a bloat of the scanned AP list but
- 		 * it shouldn't be too much.
- 		 */
--		ni = ieee80211_find_node_with_channel(ic, wh->i_addr2,
--				&ic->ic_channels[chan]);
-+		ni = ieee80211_find_node_with_channel_and_ssid(ic, wh->i_addr2,
-+				&ic->ic_channels[chan], ssid);
-+
-+
- 		if (ni == NULL) {
- #ifdef IEEE80211_DEBUG
- 			if (ieee80211_msg_scan(ic))
-Index: net80211/ieee80211_node.c
-===================================================================
-RCS file: /cvsroot/madwifi/madwifi/net80211/ieee80211_node.c,v
-retrieving revision 1.7
-diff -u -r1.7 ieee80211_node.c
---- madwifi/net80211/ieee80211_node.c	19 Aug 2004 02:09:13 -0000	1.7
-+++ madwifi/net80211/ieee80211_node.c	25 Aug 2004 17:14:08 -0000
-@@ -817,6 +817,31 @@
- }
- 
- /*
-+ * Like find but search based on the channel too.
-+ */
-+struct ieee80211_node *
-+ieee80211_find_node_with_channel_and_ssid(struct ieee80211com *ic, u_int8_t *macaddr,
-+	struct ieee80211_channel *chan, char *ssid)
-+{
-+	struct ieee80211_node *ni;
-+	int hash;
-+
-+	hash = IEEE80211_NODE_HASH(macaddr);
-+	IEEE80211_NODE_LOCK(ic);
-+	LIST_FOREACH(ni, &ic->ic_hash[hash], ni_hash) {
-+		if (IEEE80211_ADDR_EQ(ni->ni_macaddr, macaddr) &&
-+		    ni->ni_chan == chan && 
-+		    (ssid[1] == 0 || (ssid[1] == ni->ni_esslen &&
-+		      !memcmp(ssid + 2, ni->ni_essid, ssid[1])))){
-+			ieee80211_node_incref(ni);/* mark referenced */
-+			break;
-+		}
-+	}
-+	IEEE80211_NODE_UNLOCK(ic);
-+	return ni;
-+}
-+
-+/*
-  * Like find but search based on the ssid too.
-  */
- struct ieee80211_node *
-Index: net80211/ieee80211_node.h
-===================================================================
-RCS file: /cvsroot/madwifi/madwifi/net80211/ieee80211_node.h,v
-retrieving revision 1.4
-diff -u -r1.4 ieee80211_node.h
---- madwifi/net80211/ieee80211_node.h	19 Aug 2004 01:06:58 -0000	1.4
-+++ madwifi/net80211/ieee80211_node.h	25 Aug 2004 17:14:08 -0000
-@@ -193,6 +193,9 @@
- extern	struct ieee80211_node *ieee80211_find_node_with_channel(
- 		struct ieee80211com *, u_int8_t *macaddr,
- 		struct ieee80211_channel *);
-+extern  struct ieee80211_node *ieee80211_find_node_with_channel_and_ssid(
-+		struct ieee80211com *, u_int8_t *macaddr,
-+		struct ieee80211_channel *, char *);
- extern	struct ieee80211_node *ieee80211_find_node_with_ssid(
- 		struct ieee80211com *, u_int8_t *macaddr, u_int ssidlen,
- 		const u_int8_t *ssid);
diff --git a/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20050107.ebuild b/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20050107.ebuild
deleted file mode 100644
index 7797d47987ef..000000000000
--- a/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20050107.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20050107.ebuild,v 1.3 2005/01/10 04:12:17 solar Exp $
-
-inherit linux-mod
-
-DESCRIPTION="Wireless driver for Atheros chipset a/b/g cards"
-HOMEPAGE="http://madwifi.sourceforge.net/"
-SRC_URI="http://madwifi.otaku42.de/${PV:7:4}/${PV:11:2}/madwifi-cvs-snapshot-${PV:7:4}-${PV:11:2}-${PV:13:2}.tar.bz2"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-DEPEND="app-arch/sharutils"
-RDEPEND=""
-S=${WORKDIR}/madwifi
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	use x86 && TARGET=i386-elf
-	use amd64 && TARGET=x86_64-elf
-	MODULE_NAMES="ath_hal(net:${S}/ath_hal) ath_rate_onoe(net:${S}/ath_rate/onoe)
-		wlan(net:${S}/net80211) wlan_acl(net:${S}/net80211) wlan_ccmp(net:${S}/net80211)
-		wlan_tkip(net:${S}/net80211) wlan_wep(net:${S}/net80211)
-		wlan_xauth(net:${S}/net80211) ath_pci(net:${S}/ath)"
-	BUILD_PARAMS="KERNELPATH=${ROOT}${KV_DIR} KERNELRELEASE=${KV_FULL}
-		TARGET=${TARGET} TOOLPREFIX=/usr/bin/"
-	BUILD_TARGETS="all"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	for dir in ath ath_hal ath_rate/amrr ath_rate/onoe net80211; do
-		convert_to_m ${S}/${dir}/Makefile
-	done
-}
-
-src_install() {
-	dodoc README COPYRIGHT
-
-	linux-mod_src_install
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	einfo ""
-	einfo "The madwifi drivers create an interface named 'athX'"
-	einfo "Create /etc/init.d/net.ath0 and add a line for athX"
-	einfo "in /etc/conf.d/net like 'iface_ath0=\"dhcp\"'"
-	einfo ""
-}
diff --git a/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20050224.ebuild b/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20050224.ebuild
deleted file mode 100644
index 780f4d90fd77..000000000000
--- a/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20050224.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20050224.ebuild,v 1.2 2005/04/14 10:50:09 johnm Exp $
-
-inherit linux-mod
-
-DESCRIPTION="Wireless driver for Atheros chipset a/b/g cards"
-HOMEPAGE="http://madwifi.sourceforge.net/"
-SRC_URI="http://madwifi.otaku42.de/${PV:7:4}/${PV:11:2}/madwifi-cvs-snapshot-${PV:7:4}-${PV:11:2}-${PV:13:2}.tar.bz2"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-DEPEND="app-arch/sharutils"
-RDEPEND=""
-S=${WORKDIR}/madwifi
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	use x86 && TARGET=i386-elf
-	use amd64 && TARGET=x86_64-elf
-	MODULE_NAMES="ath_hal(net:${S}/ath_hal)	wlan(net:${S}/net80211) wlan_acl(net:${S}/net80211)
-		wlan_ccmp(net:${S}/net80211) wlan_tkip(net:${S}/net80211) wlan_wep(net:${S}/net80211)
-		wlan_xauth(net:${S}/net80211) ath_rate_amrr(net:${S}/ath_rate/amrr)
-		ath_rate_onoe(net:${S}/ath_rate/onoe) ath_pci(net:${S}/ath)"
-	BUILD_PARAMS="KERNELPATH=${ROOT}${KV_OUT_DIR} KERNELRELEASE=${KV_FULL}
-		TARGET=${TARGET} TOOLPREFIX=/usr/bin/"
-	BUILD_TARGETS="all"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	for dir in ath ath_hal net80211 ath_rate/amrr ath_rate/onoe; do
-		convert_to_m ${S}/${dir}/Makefile
-	done
-}
-
-src_install() {
-	dodoc README COPYRIGHT
-
-	linux-mod_src_install
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	einfo ""
-	einfo "The madwifi drivers create an interface named 'athX'"
-	einfo "Create /etc/init.d/net.ath0 and add a line for athX"
-	einfo "in /etc/conf.d/net like 'iface_ath0=\"dhcp\"'"
-	einfo ""
-}
diff --git a/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20050420.ebuild b/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20050420.ebuild
deleted file mode 100644
index e3ee86ba2c52..000000000000
--- a/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20050420.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20050420.ebuild,v 1.2 2005/06/30 17:31:18 josejx Exp $
-
-inherit linux-mod
-
-DESCRIPTION="Wireless driver for Atheros chipset a/b/g cards"
-HOMEPAGE="http://madwifi.sourceforge.net/"
-SRC_URI="http://madwifi.otaku42.de/${PV:7:4}/${PV:11:2}/madwifi-cvs-snapshot-${PV:7:4}-${PV:11:2}-${PV:13:2}.tar.bz2"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE=""
-DEPEND="app-arch/sharutils"
-RDEPEND=""
-S=${WORKDIR}/madwifi
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	use x86 && TARGET=i386-elf
-	use amd64 && TARGET=x86_64-elf
-	use ppc && TARGET=powerpc-be-eabi
-	MODULE_NAMES="ath_hal(net:${S}/ath_hal)	wlan(net:${S}/net80211) wlan_acl(net:${S}/net80211)
-		wlan_ccmp(net:${S}/net80211) wlan_tkip(net:${S}/net80211) wlan_wep(net:${S}/net80211)
-		wlan_xauth(net:${S}/net80211) ath_rate_amrr(net:${S}/ath_rate/amrr)
-		ath_rate_onoe(net:${S}/ath_rate/onoe) ath_pci(net:${S}/ath)"
-	BUILD_PARAMS="KERNELPATH=${ROOT}${KV_OUT_DIR} KERNELRELEASE=${KV_FULL}
-		TARGET=${TARGET} TOOLPREFIX=/usr/bin/"
-	BUILD_TARGETS="all"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	for dir in ath ath_hal net80211 ath_rate/amrr ath_rate/onoe; do
-		convert_to_m ${S}/${dir}/Makefile
-	done
-}
-
-src_install() {
-	dodoc README COPYRIGHT
-
-	linux-mod_src_install
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	einfo ""
-	einfo "The madwifi drivers create an interface named 'athX'"
-	einfo "Create /etc/init.d/net.ath0 and add a line for athX"
-	einfo "in /etc/conf.d/net like 'iface_ath0=\"dhcp\"'"
-	einfo ""
-}
diff --git a/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20050809-r1.ebuild b/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20050809-r1.ebuild
deleted file mode 100644
index 7cff60ae010d..000000000000
--- a/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20050809-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20050809-r1.ebuild,v 1.1 2005/08/22 12:16:42 brix Exp $
-
-inherit linux-mod
-
-DESCRIPTION="Wireless driver for Atheros chipset a/b/g cards"
-HOMEPAGE="http://madwifi.sourceforge.net/"
-SRC_URI="http://madwifi.otaku42.de/${PV:7:4}/${PV:11:2}/madwifi-cvs-snapshot-${PV:7:4}-${PV:11:2}-${PV:13:2}.tar.bz2"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE=""
-DEPEND="app-arch/sharutils"
-RDEPEND=""
-S=${WORKDIR}/madwifi
-CONFIG_CHECK="NET_RADIO"
-ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	use x86 && TARGET=i386-elf
-	use amd64 && TARGET=x86_64-elf
-	use ppc && TARGET=powerpc-be-eabi
-	MODULE_NAMES="ath_hal(net:${S}/ath_hal)	wlan(net:${S}/net80211) wlan_acl(net:${S}/net80211)
-		wlan_ccmp(net:${S}/net80211) wlan_tkip(net:${S}/net80211) wlan_wep(net:${S}/net80211)
-		wlan_xauth(net:${S}/net80211) ath_rate_amrr(net:${S}/ath_rate/amrr)
-		ath_rate_onoe(net:${S}/ath_rate/onoe)
-		ath_rate_sample(net:${S}/ath_rate/sample) ath_pci(net:${S}/ath)"
-	BUILD_PARAMS="KERNELPATH=${ROOT}${KV_OUT_DIR} KERNELRELEASE=${KV_FULL}
-		TARGET=${TARGET} TOOLPREFIX=/usr/bin/"
-	BUILD_TARGETS="all"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	for dir in ath ath_hal net80211 ath_rate/amrr ath_rate/onoe ath_rate/sample; do
-		convert_to_m ${S}/${dir}/Makefile
-	done
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodoc README COPYRIGHT
-
-	# install headers for use by
-	# net-wireless/wpa_supplicant and net-wireless/hostapd
-	insinto /usr/include/madwifi/include/
-	doins include/*.h
-	insinto /usr/include/madwifi/net80211
-	doins net80211/*.h
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	einfo ""
-	einfo "The madwifi drivers create an interface named 'athX'"
-	einfo "Create /etc/init.d/net.ath0 and add a line for athX"
-	einfo "in /etc/conf.d/net"
-	einfo ""
-}
diff --git a/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20050809.ebuild b/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20050809.ebuild
deleted file mode 100644
index 68159462fd48..000000000000
--- a/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20050809.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20050809.ebuild,v 1.1 2005/08/10 12:44:19 genstef Exp $
-
-inherit linux-mod
-
-DESCRIPTION="Wireless driver for Atheros chipset a/b/g cards"
-HOMEPAGE="http://madwifi.sourceforge.net/"
-SRC_URI="http://madwifi.otaku42.de/${PV:7:4}/${PV:11:2}/madwifi-cvs-snapshot-${PV:7:4}-${PV:11:2}-${PV:13:2}.tar.bz2"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE=""
-DEPEND="app-arch/sharutils"
-RDEPEND=""
-S=${WORKDIR}/madwifi
-CONFIG_CHECK="NET_RADIO"
-ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	use x86 && TARGET=i386-elf
-	use amd64 && TARGET=x86_64-elf
-	use ppc && TARGET=powerpc-be-eabi
-	MODULE_NAMES="ath_hal(net:${S}/ath_hal)	wlan(net:${S}/net80211) wlan_acl(net:${S}/net80211)
-		wlan_ccmp(net:${S}/net80211) wlan_tkip(net:${S}/net80211) wlan_wep(net:${S}/net80211)
-		wlan_xauth(net:${S}/net80211) ath_rate_amrr(net:${S}/ath_rate/amrr)
-		ath_rate_onoe(net:${S}/ath_rate/onoe)
-		ath_rate_sample(net:${S}/ath_rate/sample) ath_pci(net:${S}/ath)"
-	BUILD_PARAMS="KERNELPATH=${ROOT}${KV_OUT_DIR} KERNELRELEASE=${KV_FULL}
-		TARGET=${TARGET} TOOLPREFIX=/usr/bin/"
-	BUILD_TARGETS="all"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	for dir in ath ath_hal net80211 ath_rate/amrr ath_rate/onoe ath_rate/sample; do
-		convert_to_m ${S}/${dir}/Makefile
-	done
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodoc README COPYRIGHT
-}
-
-pkg_postinst() {
-	update_depmod
-	update_modules
-
-	einfo ""
-	einfo "The madwifi drivers create an interface named 'athX'"
-	einfo "Create /etc/init.d/net.ath0 and add a line for athX"
-	einfo "in /etc/conf.d/net"
-	einfo ""
-}
diff --git a/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20051031.ebuild b/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20051111.ebuild
index e8c7d90251e1..ff8e9f5d7fa1 100644
--- a/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20051031.ebuild
+++ b/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20051111.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20051031.ebuild,v 1.2 2005/11/12 23:23:59 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20051111.ebuild,v 1.1 2005/11/13 16:34:22 genstef Exp $
 
 inherit linux-mod
 
-MADWIFI_SVN_REV="1227"
+MADWIFI_SVN_REV="1325"
 DESCRIPTION="Wireless driver for Atheros chipset a/b/g cards"
 HOMEPAGE="http://www.madwifi.org"
 SRC_URI="http://snapshots.madwifi.org/madwifi-trunk-r${MADWIFI_SVN_REV}-${PV:7:8}.tar.gz"
diff --git a/net-wireless/madwifi-tools/ChangeLog b/net-wireless/madwifi-tools/ChangeLog
index 3840a5317a86..58afb2a13041 100644
--- a/net-wireless/madwifi-tools/ChangeLog
+++ b/net-wireless/madwifi-tools/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-wireless/madwifi-tools
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-tools/ChangeLog,v 1.10 2005/11/12 22:51:57 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-tools/ChangeLog,v 1.11 2005/11/13 16:33:23 genstef Exp $
+
+*madwifi-tools-0.1_pre20051111 (13 Nov 2005)
+
+  13 Nov 2005; Stefan Schweizer <genstef@gentoo.org>
+  -madwifi-tools-0.1_pre20050106.ebuild,
+  -madwifi-tools-0.1_pre20050107.ebuild,
+  -madwifi-tools-0.1_pre20051031.ebuild,
+  +madwifi-tools-0.1_pre20051111.ebuild:
+  Version bump, remove old ebuilds
 
   12 Nov 2005; Stefan Schweizer <genstef@gentoo.org>
   madwifi-tools-0.1_pre20051031.ebuild:
diff --git a/net-wireless/madwifi-tools/Manifest b/net-wireless/madwifi-tools/Manifest
index 9408ad4e7ea9..fd87125e63f1 100644
--- a/net-wireless/madwifi-tools/Manifest
+++ b/net-wireless/madwifi-tools/Manifest
@@ -1,10 +1,6 @@
 MD5 0593a7cea8bdbf5a167bcfc7f9b2596f ChangeLog 1960
-MD5 07d3f62f481b9725f606d77cd023edd5 files/digest-madwifi-tools-0.1_pre20050106 84
-MD5 283e94543234c3f396d65824fbcccb32 files/digest-madwifi-tools-0.1_pre20050107 85
 MD5 d4937e6f87128084a32ef792ddbccc6e files/digest-madwifi-tools-0.1_pre20050420 85
-MD5 f14c460ff95aa3e3ad0f065c5e5d8aa3 files/digest-madwifi-tools-0.1_pre20051031 81
-MD5 9d629aa5f12d0a1227a153c1ff980de8 madwifi-tools-0.1_pre20050106.ebuild 1194
-MD5 4cf0f5b3be0b9c55e7fc6851a0443973 madwifi-tools-0.1_pre20050107.ebuild 894
+MD5 91250d7eaa44ba70b4d71107fc259f8b files/digest-madwifi-tools-0.1_pre20051111 81
 MD5 b51ffccefc25227db9e0af7033042b3d madwifi-tools-0.1_pre20050420.ebuild 883
-MD5 f8bc703e4a88124535664894ae6ef2c9 madwifi-tools-0.1_pre20051031.ebuild 961
+MD5 09d443e64da5aa4710d9cb29ef91a2e7 madwifi-tools-0.1_pre20051111.ebuild 961
 MD5 19fd766bac8e110b4620363a1ace26dd metadata.xml 159
diff --git a/net-wireless/madwifi-tools/files/digest-madwifi-tools-0.1_pre20050106 b/net-wireless/madwifi-tools/files/digest-madwifi-tools-0.1_pre20050106
deleted file mode 100644
index 0dff41f1aae5..000000000000
--- a/net-wireless/madwifi-tools/files/digest-madwifi-tools-0.1_pre20050106
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ecefaf41bbe0c4045c15e9e63a9ce3cf madwifi-driver-0.1_pre20050106.tar.bz2 1639445
diff --git a/net-wireless/madwifi-tools/files/digest-madwifi-tools-0.1_pre20050107 b/net-wireless/madwifi-tools/files/digest-madwifi-tools-0.1_pre20050107
deleted file mode 100644
index 4a29fe3c0ed6..000000000000
--- a/net-wireless/madwifi-tools/files/digest-madwifi-tools-0.1_pre20050107
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8237d57be31464ddd7a710704e6755f0 madwifi-cvs-snapshot-2005-01-07.tar.bz2 1586914
diff --git a/net-wireless/madwifi-tools/files/digest-madwifi-tools-0.1_pre20051031 b/net-wireless/madwifi-tools/files/digest-madwifi-tools-0.1_pre20051031
deleted file mode 100644
index c3840edd1e97..000000000000
--- a/net-wireless/madwifi-tools/files/digest-madwifi-tools-0.1_pre20051031
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c9ce40865dd34bc59529c5579e5263d1 madwifi-trunk-r1227-20051031.tar.gz 2826143
diff --git a/net-wireless/madwifi-tools/files/digest-madwifi-tools-0.1_pre20051111 b/net-wireless/madwifi-tools/files/digest-madwifi-tools-0.1_pre20051111
new file mode 100644
index 000000000000..f19f8125fed5
--- /dev/null
+++ b/net-wireless/madwifi-tools/files/digest-madwifi-tools-0.1_pre20051111
@@ -0,0 +1 @@
+MD5 25b7d7d7860eb04525f3992a1fe16b50 madwifi-trunk-r1325-20051111.tar.gz 3143677
diff --git a/net-wireless/madwifi-tools/madwifi-tools-0.1_pre20050106.ebuild b/net-wireless/madwifi-tools/madwifi-tools-0.1_pre20050106.ebuild
deleted file mode 100644
index 48d7f32be7a5..000000000000
--- a/net-wireless/madwifi-tools/madwifi-tools-0.1_pre20050106.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-tools/madwifi-tools-0.1_pre20050106.ebuild,v 1.2 2005/01/19 13:24:09 solar Exp $
-
-# cvs -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/madwifi co madwifi
-
-DESCRIPTION="Wireless tools for Atheros chipset a/b/g cards"
-HOMEPAGE="http://madwifi.sourceforge.net/"
-
-SRC_URI="mirror://gentoo/${P/tools/driver}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-DEPEND="virtual/libc sys-apps/sed"
-RDEPEND=""
-S=${WORKDIR}
-
-pkg_setup() {
-	use x86 && TARGET=i386-elf
-	use amd64 && TARGET=x86_64-elf
-	export TARGET
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i -e 's/err(1, ifr.ifr_name);/err(1, "%s", ifr.ifr_name);'/g tools/athstats.c
-}
-
-src_compile() {
-	einfo "building tools..."
-	cd ${S}/tools || die "failed to chdir to ${S}/tools"
-	make clean || :
-	emake TARGET="${TARGET}" LDFLAGS="${CFLAGS} ${LDFLAGS}" \
-		|| die "failed to build the driver tools"
-}
-
-src_install() {
-	dodoc README COPYRIGHT
-	cd ${S}/tools
-	insinto /usr
-	for bin in 80211stats ath{chans,ctrl,key,stats}; do
-		[ -e ${bin} ] && dobin ${bin}
-	done
-}
diff --git a/net-wireless/madwifi-tools/madwifi-tools-0.1_pre20050107.ebuild b/net-wireless/madwifi-tools/madwifi-tools-0.1_pre20050107.ebuild
deleted file mode 100644
index 4b2f6a2aae19..000000000000
--- a/net-wireless/madwifi-tools/madwifi-tools-0.1_pre20050107.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-tools/madwifi-tools-0.1_pre20050107.ebuild,v 1.2 2005/01/19 13:24:09 solar Exp $
-
-DESCRIPTION="Wireless tools for Atheros chipset a/b/g cards"
-HOMEPAGE="http://madwifi.sourceforge.net/"
-SRC_URI="http://madwifi.otaku42.de/${PV:7:4}/${PV:11:2}/madwifi-cvs-snapshot-${PV:7:4}-${PV:11:2}-${PV:13:2}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-#KEYWORDS="~x86 ~amd64"
-KEYWORDS="-*"
-IUSE=""
-DEPEND="virtual/libc"
-
-S=${WORKDIR}/madwifi/tools
-
-pkg_setup() {
-	use x86 && TARGET=i386-elf
-	use amd64 && TARGET=x86_64-elf
-	export TARGET
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i -e 's/err(1, ifr.ifr_name);/err(1, "%s", ifr.ifr_name);'/g tools/athstats.c
-}
-
-src_install() {
-	dobin 80211debug 80211stats athchans athctrl athdebug athkey athstats
-}
diff --git a/net-wireless/madwifi-tools/madwifi-tools-0.1_pre20051031.ebuild b/net-wireless/madwifi-tools/madwifi-tools-0.1_pre20051111.ebuild
index 15cf82564558..70cd922e2186 100644
--- a/net-wireless/madwifi-tools/madwifi-tools-0.1_pre20051031.ebuild
+++ b/net-wireless/madwifi-tools/madwifi-tools-0.1_pre20051111.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/madwifi-tools/madwifi-tools-0.1_pre20051031.ebuild,v 1.4 2005/11/12 22:58:09 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-tools/madwifi-tools-0.1_pre20051111.ebuild,v 1.1 2005/11/13 16:33:23 genstef Exp $
 
-MADWIFI_SVN_REV="1227"
+MADWIFI_SVN_REV="1325"
 DESCRIPTION="Wireless tools for Atheros chipset a/b/g cards"
 HOMEPAGE="http://www.madwifi.org"
 SRC_URI="http://snapshots.madwifi.org/madwifi-trunk-r${MADWIFI_SVN_REV}-${PV:7:8}.tar.gz"