Small bump for module-init-tools and major clean up of old ebuilds

23 files changed, 263 insertions, 1657 deletions

diff --git a/net-wireless/linux-wlan-ng/Manifest b/net-wireless/linux-wlan-ng/Manifest
index 253642085cf8..e8e27d1d18d5 100644
--- a/net-wireless/linux-wlan-ng/Manifest
+++ b/net-wireless/linux-wlan-ng/Manifest
@@ -1,28 +1,12 @@
-MD5 890076d3b6d1a4e639ce31b96c844bb7 linux-wlan-ng-0.2.0-r2.ebuild 6385
-MD5 236f57ceb31dbfa3eced144087164315 linux-wlan-ng-0.1.16_pre9.ebuild 5720
-MD5 e12100bb6b7564c5b4ba7e3a1f91f5e5 linux-wlan-ng-0.1.16_pre4.ebuild 4704
+MD5 6e9afe051c9cab1a7af88bc328adbc1f linux-wlan-ng-0.2.0-r2.ebuild 6384
 MD5 ab5ee2a8be5f3ca74da56ba5b72c58f2 linux-wlan-ng-0.2.1_pre16.ebuild 6878
-MD5 dcbfab6369724ed52752cfe804d12137 linux-wlan-ng-0.2.1_pre11.ebuild 6520
-MD5 e6934c6aa99a3c73c2c15a462ff72d66 linux-wlan-ng-0.1.16_pre6.ebuild 4901
-MD5 8b6ecd6ec147b5829edb7ec22780ea0b linux-wlan-ng-0.2.1_pre1.ebuild 6530
-MD5 b9768a4668139bc91131ef95ed260ef0 linux-wlan-ng-0.2.0-r1.ebuild 6238
-MD5 6f9f41769e3daa6937a727962f3c1e21 linux-wlan-ng-0.1.16_pre8.ebuild 5610
-MD5 0f3bbf01e01b0ad8950115719898bb72 linux-wlan-ng-0.2.1_pre8.ebuild 6519
-MD5 46490ae4daf5cf0ac61148342711698f linux-wlan-ng-0.2.1_pre3.ebuild 6519
-MD5 7a5da840ee28e3259fd3908a62e70a4d linux-wlan-ng-0.2.0-r3.ebuild 6660
-MD5 d270ceec756203969758281ac8cc749e ChangeLog 5387
+MD5 1b50a6c92eefec354e814d0c0b930dd8 linux-wlan-ng-0.2.1_pre11.ebuild 6519
+MD5 3f657575611c9d4cf56f33f46be4a2b6 linux-wlan-ng-0.2.0-r1.ebuild 6237
+MD5 e7e41202c86b856c3791606b0cd09cee linux-wlan-ng-0.2.1_pre8.ebuild 6518
+MD5 d98e7ecdefa98cf58bd3a62484969c20 linux-wlan-ng-0.2.0-r3.ebuild 6655
+MD5 93fa2fab1ec2861fa6f642697d57f2af ChangeLog 6104
 MD5 32831d719499c83f7942f6432ef58278 metadata.xml 252
-MD5 6a29d04d5f54af20e1ab14ae8ebf09d0 linux-wlan-ng-0.1.16_pre7.ebuild 4902
-MD5 1bccf6dbfc6a7ebfd0a9d21397da1c8e linux-wlan-ng-0.2.1_pre2.ebuild 6519
-MD5 edb5e3c1a938de2a776e554bba4676b6 files/digest-linux-wlan-ng-0.2.1_pre1 511
-MD5 92b02f16198ff0908cb37efe06f1e055 files/digest-linux-wlan-ng-0.2.1_pre2 436
-MD5 a12d959fbef4790b4f768aac09ec04ab files/digest-linux-wlan-ng-0.2.1_pre3 436
 MD5 4ba4f50725309cebf376a17edd220b89 files/digest-linux-wlan-ng-0.2.1_pre8 436
-MD5 c10d43bfb357d5c75d5fb21c56ee0d4d files/digest-linux-wlan-ng-0.1.16_pre4 221
-MD5 7c13fff9828e7491a397b11164b288eb files/digest-linux-wlan-ng-0.1.16_pre6 221
-MD5 eaf97b29f3669aa218397fa8e55e6ea2 files/digest-linux-wlan-ng-0.1.16_pre7 221
-MD5 bec0a714992c53f2b9a3404e9bae59f6 files/digest-linux-wlan-ng-0.1.16_pre8 221
-MD5 7edd1446ae6fb9ba5544a2ccbc298673 files/digest-linux-wlan-ng-0.1.16_pre9 221
 MD5 8dab46b657f6e8498e9cb48cfa346b5c files/digest-linux-wlan-ng-0.2.1_pre11 437
 MD5 bca89201c544fb1c9e32d08dcc635584 files/digest-linux-wlan-ng-0.2.1_pre16 437
 MD5 f57572b64b73079ae2e9bab008d602bc files/digest-linux-wlan-ng-0.2.0-r1 434
diff --git a/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.1.16_pre4 b/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.1.16_pre4
deleted file mode 100644
index bd76ec7ae85e..000000000000
--- a/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.1.16_pre4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0c58d67ed0555b00ca4880a76fb23ba3 /linux-wlan-ng-0.1.16_pre4.ebuild 4713
-MD5 1f2de1f7e7e6edc137c9eb066e3ae60f linux-wlan-ng-0.1.16-pre4.tar.gz 319589
-MD5 7e9f01a697d2e3e5164340d79474ea30 pcmcia-cs-3.2.1.tar.gz 1250413
diff --git a/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.1.16_pre6 b/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.1.16_pre6
deleted file mode 100644
index b89886f51b03..000000000000
--- a/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.1.16_pre6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 168b11a00bfb143b4c22aae3be81b514 /linux-wlan-ng-0.1.16_pre6.ebuild 4912
-MD5 eba944e1f48cd7b8034683a4cf77186b linux-wlan-ng-0.1.16-pre6.tar.gz 326710
-MD5 7e9f01a697d2e3e5164340d79474ea30 pcmcia-cs-3.2.1.tar.gz 1250413
diff --git a/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.1.16_pre7 b/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.1.16_pre7
deleted file mode 100644
index 91b04c5add57..000000000000
--- a/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.1.16_pre7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b257519dec67e9582dffb3b1c9b5d60b /linux-wlan-ng-0.1.16_pre7.ebuild 4913
-MD5 b33e5e017e0b2b4a23fef1066cd916c5 linux-wlan-ng-0.1.16-pre7.tar.gz 326818
-MD5 7e9f01a697d2e3e5164340d79474ea30 pcmcia-cs-3.2.1.tar.gz 1250413
diff --git a/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.1.16_pre8 b/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.1.16_pre8
deleted file mode 100644
index 3525875b2e9d..000000000000
--- a/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.1.16_pre8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 90ded861202aa59ce7d99a6669cb73c1 /linux-wlan-ng-0.1.16_pre8.ebuild 5623
-MD5 82c61d671179e814295478674e6963cf linux-wlan-ng-0.1.16-pre8.tar.gz 328929
-MD5 7e9f01a697d2e3e5164340d79474ea30 pcmcia-cs-3.2.1.tar.gz 1250413
diff --git a/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.1.16_pre9 b/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.1.16_pre9
deleted file mode 100644
index ef8f847f1c72..000000000000
--- a/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.1.16_pre9
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6ea002d425acaac59bdd550b3fefcf43 /linux-wlan-ng-0.1.16_pre9.ebuild 5733
-MD5 97ecf1ad11908f8bcd489a523f375a27 linux-wlan-ng-0.1.16-pre9.tar.gz 329262
-MD5 126e2d87e7a8a12e283db37ae82e9e4c pcmcia-cs-3.2.4.tar.gz 1262994
diff --git a/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.2.0-r3 b/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.2.0-r3
new file mode 100644
index 000000000000..b3551928b644
--- /dev/null
+++ b/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.2.0-r3
@@ -0,0 +1,6 @@
+MD5 42b6d21a29cb5f75f8b1e8a3ad69b19a linux-wlan-ng-0.2.0.tar.gz 329432
+MD5 686631f6942aa47fc0503203c26bfe16 linux-wlan-ng-gentoo-init.gz 859
+MD5 44dbc0a8978fe618eee242b0bd25392c pcmcia-cs-3.2.5.tar.gz 1266494
+MD5 33325ed642b5277a9695d10bd19b3d7a pcmcia-cs-3.2.5-module-init-tools.diff.gz 460
+MD5 2b2cba3fdd498b001ea3c27d8b2da31b pcmcia-cs-3.2.5-3.2.6.diff.gz 23034
+MD5 f2feda5eb46c1a2b99ae9db274879afc pcmcia-cs-3.2.5-3.2.7.diff.gz 28244
diff --git a/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.2.1_pre1 b/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.2.1_pre1
deleted file mode 100644
index 368cd498f64d..000000000000
--- a/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.2.1_pre1
+++ /dev/null
@@ -1,7 +0,0 @@
-MD5 a9c08922e7cc99830c4cfd65c98f11fa /linux-wlan-ng-0.2.1_pre1.ebuild 6543
-MD5 e4d3e35fbf644e46d552f77b746aaaa5 linux-wlan-ng-0.2.1-pre1.tar.gz 331739
-MD5 686631f6942aa47fc0503203c26bfe16 linux-wlan-ng-gentoo-init.gz 859
-MD5 7e9f01a697d2e3e5164340d79474ea30 pcmcia-cs-3.2.1.tar.gz 1250413
-MD5 24e8c68d0eac2a9b3446acdd259c22a0 pcmcia-cs-3.2.1-3.2.2.diff.gz 246919
-MD5 9ed9491a743b7400b382b199377c7279 pcmcia-cs-3.2.1-3.2.3.diff.gz 247541
-MD5 c94ce648d1e420be0cf02246236dc387 pcmcia-cs-3.2.1-3.2.4.diff.gz 305171
diff --git a/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.2.1_pre2 b/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.2.1_pre2
deleted file mode 100644
index 973e6b9ad96d..000000000000
--- a/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.2.1_pre2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 31c9510ffadb08a4e5c1e0f247db6dbc linux-wlan-ng-0.2.1-pre2.tar.gz 329332
-MD5 686631f6942aa47fc0503203c26bfe16 linux-wlan-ng-gentoo-init.gz 859
-MD5 7e9f01a697d2e3e5164340d79474ea30 pcmcia-cs-3.2.1.tar.gz 1250413
-MD5 24e8c68d0eac2a9b3446acdd259c22a0 pcmcia-cs-3.2.1-3.2.2.diff.gz 246919
-MD5 9ed9491a743b7400b382b199377c7279 pcmcia-cs-3.2.1-3.2.3.diff.gz 247541
-MD5 c94ce648d1e420be0cf02246236dc387 pcmcia-cs-3.2.1-3.2.4.diff.gz 305171
diff --git a/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.2.1_pre3 b/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.2.1_pre3
deleted file mode 100644
index b8e4b6b66c05..000000000000
--- a/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.2.1_pre3
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 384f46b2aaba9f106909e1efeddf247d linux-wlan-ng-0.2.1-pre3.tar.gz 323207
-MD5 686631f6942aa47fc0503203c26bfe16 linux-wlan-ng-gentoo-init.gz 859
-MD5 7e9f01a697d2e3e5164340d79474ea30 pcmcia-cs-3.2.1.tar.gz 1250413
-MD5 24e8c68d0eac2a9b3446acdd259c22a0 pcmcia-cs-3.2.1-3.2.2.diff.gz 246919
-MD5 9ed9491a743b7400b382b199377c7279 pcmcia-cs-3.2.1-3.2.3.diff.gz 247541
-MD5 c94ce648d1e420be0cf02246236dc387 pcmcia-cs-3.2.1-3.2.4.diff.gz 305171
diff --git a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.1.16_pre4.ebuild b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.1.16_pre4.ebuild
deleted file mode 100644
index a87db1803fa6..000000000000
--- a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.1.16_pre4.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/linux-wlan-ng-0.1.16_pre4.ebuild,v 1.7 2003/09/10 04:47:55 msterret Exp $
-
-# linux-wlan-ng requires a configured pcmcia-cs source tree.
-# unpack/configure it in WORKDIR.  No need to compile it though.
-
-IUSE="trusted apm pnp nocardbus build"
-
-PCMCIA_CS="pcmcia-cs-3.2.1"
-PCMCIA_DIR="${WORKDIR}/${PCMCIA_CS}"
-
-MY_P=${P/_/-}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="The linux-wlan Project"
-SRC_URI="ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/${MY_P}.tar.gz
-			mirror://sourceforge/pcmcia-cs/${PCMCIA_CS}.tar.gz"
-
-HOMEPAGE="http://linux-wlan.org"
-DEPEND="sys-kernel/linux-headers
-		sys-apps/pcmcia-cs
-		dev-libs/openssl
-		sys-apps/baselayout"
-RDEPEND=""
-SLOT="0"
-LICENSE="MPL-1.1"
-KEYWORDS="~x86"
-
-# check arch for configure
-if [ ${ARCH} = "x86" ] ; then
-	MY_ARCH="i386"
-else
-	MY_ARCH="ppc"
-fi
-
-# Note: To use this ebuild, you should have the usr/src/linux symlink to
-# the kernel directory that linux-wlan-ng should use for configuration.
-
-src_unpack() {
-	if [ -n "`use pcmcia`" ]; then
-		check_KV
-	fi
-	unpack ${A}
-}
-
-src_compile() {
-
-#configure pcmcia-cs - we need this for wlan to compile
-#use same USE flags that the pcmcia-cs ebuild does.
-#no need to actually compile pcmcia-cs...
-
-	cd ${WORKDIR}/${PCMCIA_CS}
-	local myconf
-	if [ -n "`use trusted`" ] ; then
-		myconf="--trust"
-	else
-		myconf="--notrust"
-	fi
-
-	if [ -n "`use apm`" ] ; then
-		myconf="$myconf --apm"
-	else
-		myconf="$myconf --noapm"
-	fi
-
-	if [ -n "`use pnp`" ] ; then
-		myconf="$myconf --pnp"
-	else
-		myconf="$myconf --nopnp"
-	fi
-
-	if [ -n "`use nocardbus`" ] ; then
-		myconf="$myconf --nocardbus"
-	else
-		myconf="$myconf --cardbus"
-	fi
-
-	#use $CFLAGS for user tools, but standard kernel optimizations for the kernel modules (for compatibility)
-	./Configure -n \
-		--target=${D} \
-		--srctree \
-		--kernel=/usr/src/linux \
-		--arch="${MY_ARCH}" \
-		--uflags="$CFLAGS" \
-		--kflags="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer" \
-		$myconf || die "failed configuring pcmcia-cs"
-
-	# now lets build wlan-ng
-	cd ${S}
-	export PCMCIA_CS=${PCMCIA_CS}; sed -e 's:PCMCIA_SRC=:PCMCIA_SRC=${WORKDIR}/${PCMCIA_CS}:' config.in > default.config1
-	sed -e 's:TARGET_ROOT_ON_HOST=:TARGET_ROOT_ON_HOST=${D}:' default.config1 > default.config2
-	sed -e 's:PRISM2_USB=n:PRISM2_USB=y:' default.config2 > default.config3
-	sed -e 's:PRISM2_PCI=n:PRISM2_PCI=y:' default.config3 > default.config4
-	sed -e 's:PRISM2_PLX=n:PRISM2_PLX=y:' default.config4 > default.config
-	rm -f default.config1 default.config2 default.config3 default.config4
-	emake default_config || die "failed configuring WLAN"
-	emake all || die "failed compiling"
-
-	#compile add-on keygen program.  It seems to actually provide usable keys.
-	cd ${S}/add-ons/keygen
-
-	emake || die  "Failed to compile add-on keygen program"
-}
-
-src_install () {
-einfo PREFIX=${D}
-	make install || die "failed installing"
-	cd ${D}
-
-	#move the conf file to conf.d
-	insinto /etc/conf.d
-	sed -e 's:/sbin/nwepgen:/sbin/keygen:' etc/wlan.conf >etc/conf.d/wlan.conf
-	rm -f etc/wlan.conf
-
-	mv etc/pcmcia/wlan-ng.opts wlan-ng.opts.orig
-	sed -e 's:/sbin/nwepgen:/sbin/keygen:' wlan-ng.opts.orig >etc/pcmcia/wlan-ng.opts
-
-	mv etc/init.d/wlan wlan.orig
-	sed -e 's:/etc/wlan.conf:/etc/conf.d/wlan.conf:g' wlan.orig >etc/init.d/wlan
-	rm -f wlan.orig wlan-ng.opts.orig
-	chmod 755 etc/init.d/wlan
-	chmod 640 etc/conf.d/wlan.conf etc/pcmcia/wlan-ng.opts
-
-	# use net.eth0 style rc.init script for wlan too.
-	cp /etc/init.d/net.eth0 etc/init.d/net.wlan0
-
-	if [ -z "`use build`" ]
-	then
-		cd ${S}
-		# install docs
-		dodoc BUGS CHANGES COPYING LICENSE FAQ MAINTAINERS README \
-			THANKS TODO doc/*
-	fi
-	exeinto /sbin
-	doexe add-ons/keygen/keygen
-
-}
-
-pkg_postinst() {
-	depmod -a
-
-	einfo "Modify /etc/conf.d/wlan if you choose to use /etc/init.d/wlan to"
-	einfo "start up your card.  This won't offer dhcp options, however."
-	einfo ""
-	einfo "Modify /etc/pcmcia/wlan-ng.opts to use the pcmcia card services"
-	einfo "to autoload the prism2 drivers when a pccard is inserted."
-	einfo "Two keygen programs are include: nwepgen and keygen.  keygen seems"
-	einfo "provide more usable keys at the moment."
-	einfo ""
-	einfo "You will need to add iface_wlan0 parameters to /etc/conf.d/net to use the"
-	einfo "pcmcia card services to load the wlan device and attach it to the network."
-	einfo ""
-	ewarn "Wireless cards which you want to use drivers other than wlan-ng for"
-	ewarn "need to have the appropriate line removed from /etc/pcmcia/wlan-ng.conf"
-	ewarn "Do 'cardctl info' to see the manufacturer ID and remove the corresponding"
-	ewarn "line from that file."
-}
-
diff --git a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.1.16_pre6.ebuild b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.1.16_pre6.ebuild
deleted file mode 100644
index d73d1d2e75bb..000000000000
--- a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.1.16_pre6.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/linux-wlan-ng-0.1.16_pre6.ebuild,v 1.7 2003/09/10 04:47:55 msterret Exp $
-
-# linux-wlan-ng requires a configured pcmcia-cs source tree.
-# unpack/configure it in WORKDIR.  No need to compile it though.
-
-IUSE="trusted apm pnp nocardbus pcmcia build"
-PCMCIA_CS="pcmcia-cs-3.2.1"
-PCMCIA_DIR="${WORKDIR}/${PCMCIA_CS}"
-
-MY_P=${P/_/-}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="The linux-wlan Project"
-SRC_URI="ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/${MY_P}.tar.gz
-		pcmcia?	( mirror://sourceforge/pcmcia-cs/${PCMCIA_CS}.tar.gz )"
-
-HOMEPAGE="http://linux-wlan.org"
-DEPEND="sys-kernel/linux-headers
-		dev-libs/openssl
-		sys-apps/baselayout
-		pcmcia?	( sys-apps/pcmcia-cs )"
-RDEPEND=""
-SLOT="0"
-LICENSE="MPL-1.1"
-KEYWORDS="x86"
-
-# check arch for configure
-if [ ${ARCH} = "x86" ] ; then
-	MY_ARCH="i386"
-else
-	MY_ARCH="ppc"
-fi
-
-# Note: To use this ebuild, you should have the usr/src/linux symlink to
-# the kernel directory that linux-wlan-ng should use for configuration.
-
-src_unpack() {
-	if [ -n "`use pcmcia`" ]; then
-		check_KV
-	fi
-	unpack ${A}
-}
-
-src_compile() {
-
-#configure pcmcia-cs - we need this for wlan to compile
-#use same USE flags that the pcmcia-cs ebuild does.
-#no need to actually compile pcmcia-cs...
-#* This is actually only used if pcmcia_cs is NOT compiled into the kernel tree.
-	if [ -n "`use pcmcia`" ]; then
-		cd ${WORKDIR}/${PCMCIA_CS}
-		local myconf
-		if [ -n "`use trusted`" ] ; then
-			myconf="--trust"
-		else
-			myconf="--notrust"
-		fi
-
-		if [ -n "`use apm`" ] ; then
-			myconf="$myconf --apm"
-		else
-			myconf="$myconf --noapm"
-		fi
-
-		if [ -n "`use pnp`" ] ; then
-			myconf="$myconf --pnp"
-		else
-			myconf="$myconf --nopnp"
-		fi
-
-		if [ -n "`use nocardbus`" ] ; then
-			myconf="$myconf --nocardbus"
-		else
-			myconf="$myconf --cardbus"
-		fi
-
-		#use $CFLAGS for user tools, but standard kernel optimizations for the kernel modules (for compatibility)
-		./Configure -n \
-			--target=${D} \
-			--srctree \
-			--kernel=/usr/src/linux \
-			--arch="${MY_ARCH}" \
-			--uflags="$CFLAGS" \
-			--kflags="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer" \
-			$myconf || die "failed configuring pcmcia-cs"
-	fi
-	# now lets build wlan-ng
-	cd ${S}
-	if [ -n "`use pcmcia`" ]; then
-		export PCMCIA_CS=${PCMCIA_CS}; sed -e 's:PCMCIA_SRC=:PCMCIA_SRC=${WORKDIR}/${PCMCIA_CS}:' \
-			-e 's:PRISM2_PLX=n:PRISM2_PLX=y:' \
-			config.in > default.config
-	else
-		sed -e 's:PRISM2_PCMCIA=y:PRISM2_PCMCIA=n:' \
-		config.in > default.config
-	fi
-	mv default.config config.in
-
-	sed -e 's:TARGET_ROOT_ON_HOST=:TARGET_ROOT_ON_HOST=${D}:' \
-		-e 's:PRISM2_USB=n:PRISM2_USB=y:' \
-		-e 's:PRISM2_PCI=n:PRISM2_PCI=y:' \
-		config.in > default.config
-
-	emake default_config || die "failed configuring WLAN"
-	emake all || die "failed compiling"
-
-	#compile add-on keygen program.  It seems to actually provide usable keys.
-	cd ${S}/add-ons/keygen
-
-	emake || die "Failed to compile add-on keygen program"
-}
-
-src_install () {
-	# einfo PREFIX=${D}
-	make install || die "failed installing"
-	cd ${D}
-
-	mkdir etc/conf.d
-	mv etc/wlan/wlan.conf etc/conf.d
-
-	mv etc/wlan/wlancfg-DEFAULT wlancfg-DEFAULT.orig
-	sed -e 's:/sbin/nwepgen:/sbin/keygen:' wlancfg-DEFAULT.orig >etc/conf.d/wlancfg-DEFAULT
-	rm -f wlancfg-DEFAULT.orig
-
-	mv etc/wlan/shared shared.orig
-	sed -e 's:/etc/wlan/wlan.conf:/etc/conf.d/wlan.conf:g' \
-	    -e 's:/etc/wlan/wlancfg:/etc/conf.d/wlancfg:g' shared.orig >etc/wlan/shared
-	rm -f shared.orig
-
-	if [ -z "`use build`" ]
-	then
-		cd ${S}
-		dodoc CHANGES COPYING LICENSE FAQ README THANKS TODO \
-		      doc/config* doc/capturefrm.txt doc/wireless-extensions/README.wireless-extensions
-	fi
-	exeinto /sbin
-	doexe add-ons/keygen/keygen
-
-}
-
-pkg_postinst() {
-	depmod -a
-
-	einfo "Configuration of the WLAN package has changed since 0.1.16-pre4."
-	einfo ""
-	einfo "/etc/init.d/wlan is used to control startup and shutdown of non-PCMCIA devices."
-	einfo "/etc/init.d/pcmcia from pcmcia-cs is used to control startup and shutdown of"
-	einfo "PCMCIA devices."
-	einfo ""
-	einfo "The wlan-ng.opts file in /etc/pcmcia/ is now depricated."
-	einfo ""
-	einfo "Modify /etc/conf.d/wlan.conf to set global parameters."
-	einfo "Modify /etc/conf.d/wlancfg-* to set individual card parameters."
-	einfo "There are detailed instructions in these config files."
-	einfo ""
-	einfo "Two keygen programs are included: nwepgen and keygen.  keygen seems"
-	einfo "provide more usable keys at the moment."
-	einfo ""
-	einfo "Be sure to add iface_wlan0 parameters to /etc/conf.d/net."
-	einfo ""
-	ewarn "Wireless cards which you want to use drivers other than wlan-ng for"
-	ewarn "need to have the appropriate line removed from /etc/pcmcia/wlan-ng.conf"
-	ewarn "Do 'cardctl info' to see the manufacturer ID and remove the corresponding"
-	ewarn "line from that file."
-}
-
-
diff --git a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.1.16_pre7.ebuild b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.1.16_pre7.ebuild
deleted file mode 100644
index c06a0dd24108..000000000000
--- a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.1.16_pre7.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/linux-wlan-ng-0.1.16_pre7.ebuild,v 1.7 2003/09/10 04:47:55 msterret Exp $
-
-# linux-wlan-ng requires a configured pcmcia-cs source tree.
-# unpack/configure it in WORKDIR.  No need to compile it though.
-
-IUSE="trusted apm pnp nocardbus pcmcia build"
-PCMCIA_CS="pcmcia-cs-3.2.1"
-PCMCIA_DIR="${WORKDIR}/${PCMCIA_CS}"
-
-MY_P=${P/_/-}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="The linux-wlan Project"
-SRC_URI="ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/${MY_P}.tar.gz
-		pcmcia?	( mirror://sourceforge/pcmcia-cs/${PCMCIA_CS}.tar.gz )"
-
-HOMEPAGE="http://linux-wlan.org"
-DEPEND="sys-kernel/linux-headers
-		dev-libs/openssl
-		sys-apps/baselayout
-		pcmcia?	( sys-apps/pcmcia-cs )"
-RDEPEND=""
-SLOT="0"
-LICENSE="MPL-1.1"
-KEYWORDS="~x86"
-
-# check arch for configure
-if [ ${ARCH} = "x86" ] ; then
-	MY_ARCH="i386"
-else
-	MY_ARCH="ppc"
-fi
-
-# Note: To use this ebuild, you should have the usr/src/linux symlink to
-# the kernel directory that linux-wlan-ng should use for configuration.
-
-src_unpack() {
-	if [ -n "`use pcmcia`" ]; then
-		check_KV
-	fi
-	unpack ${A}
-}
-
-src_compile() {
-
-#configure pcmcia-cs - we need this for wlan to compile
-#use same USE flags that the pcmcia-cs ebuild does.
-#no need to actually compile pcmcia-cs...
-#* This is actually only used if pcmcia_cs is NOT compiled into the kernel tree.
-	if [ -n "`use pcmcia`" ]; then
-		cd ${WORKDIR}/${PCMCIA_CS}
-		local myconf
-		if [ -n "`use trusted`" ] ; then
-			myconf="--trust"
-		else
-			myconf="--notrust"
-		fi
-
-		if [ -n "`use apm`" ] ; then
-			myconf="$myconf --apm"
-		else
-			myconf="$myconf --noapm"
-		fi
-
-		if [ -n "`use pnp`" ] ; then
-			myconf="$myconf --pnp"
-		else
-			myconf="$myconf --nopnp"
-		fi
-
-		if [ -n "`use nocardbus`" ] ; then
-			myconf="$myconf --nocardbus"
-		else
-			myconf="$myconf --cardbus"
-		fi
-
-		#use $CFLAGS for user tools, but standard kernel optimizations for the kernel modules (for compatibility)
-		./Configure -n \
-			--target=${D} \
-			--srctree \
-			--kernel=/usr/src/linux \
-			--arch="${MY_ARCH}" \
-			--uflags="$CFLAGS" \
-			--kflags="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer" \
-			$myconf || die "failed configuring pcmcia-cs"
-	fi
-	# now lets build wlan-ng
-	cd ${S}
-	if [ -n "`use pcmcia`" ]; then
-		export PCMCIA_CS=${PCMCIA_CS}; sed -e 's:PCMCIA_SRC=:PCMCIA_SRC=${WORKDIR}/${PCMCIA_CS}:' \
-			-e 's:PRISM2_PLX=n:PRISM2_PLX=y:' \
-			config.in > default.config
-	else
-		sed -e 's:PRISM2_PCMCIA=y:PRISM2_PCMCIA=n:' \
-		config.in > default.config
-	fi
-	mv default.config config.in
-
-	sed -e 's:TARGET_ROOT_ON_HOST=:TARGET_ROOT_ON_HOST=${D}:' \
-		-e 's:PRISM2_USB=n:PRISM2_USB=y:' \
-		-e 's:PRISM2_PCI=n:PRISM2_PCI=y:' \
-		config.in > default.config
-
-	emake default_config || die "failed configuring WLAN"
-	emake all || die "failed compiling"
-
-	#compile add-on keygen program.  It seems to actually provide usable keys.
-	cd ${S}/add-ons/keygen
-
-	emake || die "Failed to compile add-on keygen program"
-}
-
-src_install () {
-	# einfo PREFIX=${D}
-	make install || die "failed installing"
-	cd ${D}
-
-	mkdir etc/conf.d
-	mv etc/wlan/wlan.conf etc/conf.d
-
-	mv etc/wlan/wlancfg-DEFAULT wlancfg-DEFAULT.orig
-	sed -e 's:/sbin/nwepgen:/sbin/keygen:' wlancfg-DEFAULT.orig >etc/conf.d/wlancfg-DEFAULT
-	rm -f wlancfg-DEFAULT.orig
-
-	mv etc/wlan/shared shared.orig
-	sed -e 's:/etc/wlan/wlan.conf:/etc/conf.d/wlan.conf:g' \
-	    -e 's:/etc/wlan/wlancfg:/etc/conf.d/wlancfg:g' shared.orig >etc/wlan/shared
-	rm -f shared.orig
-
-	if [ -z "`use build`" ]
-	then
-		cd ${S}
-		dodoc CHANGES COPYING LICENSE FAQ README THANKS TODO \
-		      doc/config* doc/capturefrm.txt doc/wireless-extensions/README.wireless-extensions
-	fi
-	exeinto /sbin
-	doexe add-ons/keygen/keygen
-
-}
-
-pkg_postinst() {
-	depmod -a
-
-	einfo "Configuration of the WLAN package has changed since 0.1.16-pre4."
-	einfo ""
-	einfo "/etc/init.d/wlan is used to control startup and shutdown of non-PCMCIA devices."
-	einfo "/etc/init.d/pcmcia from pcmcia-cs is used to control startup and shutdown of"
-	einfo "PCMCIA devices."
-	einfo ""
-	einfo "The wlan-ng.opts file in /etc/pcmcia/ is now depricated."
-	einfo ""
-	einfo "Modify /etc/conf.d/wlan.conf to set global parameters."
-	einfo "Modify /etc/conf.d/wlancfg-* to set individual card parameters."
-	einfo "There are detailed instructions in these config files."
-	einfo ""
-	einfo "Two keygen programs are included: nwepgen and keygen.  keygen seems"
-	einfo "provide more usable keys at the moment."
-	einfo ""
-	einfo "Be sure to add iface_wlan0 parameters to /etc/conf.d/net."
-	einfo ""
-	ewarn "Wireless cards which you want to use drivers other than wlan-ng for"
-	ewarn "need to have the appropriate line removed from /etc/pcmcia/wlan-ng.conf"
-	ewarn "Do 'cardctl info' to see the manufacturer ID and remove the corresponding"
-	ewarn "line from that file."
-}
-
-
diff --git a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.1.16_pre8.ebuild b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.1.16_pre8.ebuild
deleted file mode 100644
index cd866fafc269..000000000000
--- a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.1.16_pre8.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/linux-wlan-ng-0.1.16_pre8.ebuild,v 1.6 2003/09/10 04:47:55 msterret Exp $
-
-IUSE="apm build nocardbus pcmcia pnp trusted usb"
-
-PCMCIA_CS="pcmcia-cs-3.2.1"
-PCMCIA_DIR="${WORKDIR}/${PCMCIA_CS}"
-
-MY_P=${P/_/-}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="The linux-wlan Project"
-SRC_URI="ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/${MY_P}.tar.gz
-		pcmcia?	( mirror://sourceforge/pcmcia-cs/${PCMCIA_CS}.tar.gz )"
-
-HOMEPAGE="http://linux-wlan.org"
-DEPEND="sys-kernel/linux-headers
-		dev-libs/openssl
-		sys-apps/baselayout
-		pcmcia?	( sys-apps/pcmcia-cs )"
-SLOT="0"
-LICENSE="MPL-1.1"
-KEYWORDS="~x86"
-
-# check arch for configure
-if [ ${ARCH} = "x86" ] ; then
-	MY_ARCH="i386"
-else
-	MY_ARCH="ppc"
-fi
-
-# Note: To use this ebuild, you should have the usr/src/linux symlink to
-# the kernel directory that linux-wlan-ng should use for configuration.
-#
-# linux-wlan-ng requires a configured pcmcia-cs source tree.
-# unpack/configure it in WORKDIR.  No need to compile it though.
-
-src_unpack() {
-	if [ -n "`use pcmcia`" ]; then
-		check_KV
-	fi
-
-	unpack ${A}
-	cd ${S}
-
-	# Lots of sedding to do to get the man pages and a few other
-	# things to end up in the right place.
-
-	mv man/Makefile man/Makefile.orig
-	sed -e "s:/usr/local:#/usr/local:" \
-		-e "s:cp nwepgen.man:#cp nwepgen.man:" \
-		man/Makefile.orig > man/Makefile
-
-	mv etc/wlan/Makefile etc/wlan/Makefile.orig
-	sed -e "s:/etc/wlan:/etc/conf.d:g" \
-		etc/wlan/Makefile.orig > etc/wlan/Makefile
-
-	mv etc/wlan/wlancfg-DEFAULT etc/wlan/wlancfg-DEFAULT.orig
-	sed -e "s:/sbin/nwepgen:/sbin/keygen:" \
-		etc/wlan/wlancfg-DEFAULT.orig > etc/wlan/wlancfg-DEFAULT
-
-	mv etc/wlan/shared etc/wlan/shared.orig
-	sed -e "s:/etc/wlan/wlan.conf:/etc/conf.d/wlan.conf:g" \
-	    -e "s:/etc/wlan/wlancfg:/etc/conf.d/wlancfg:g" \
-		etc/wlan/shared.orig > etc/wlan/shared
-
-}
-
-src_compile() {
-
-	#
-	# configure pcmcia-cs - we need this for wlan to compile
-	# use same USE flags that the pcmcia-cs ebuild does.
-	# no need to actually compile pcmcia-cs...
-	# * This is actually only used if pcmcia_cs is NOT compiled into
-	# the kernel tree.
-	#
-
-	if [ -n "`use pcmcia`" ]; then
-		cd ${WORKDIR}/${PCMCIA_CS}
-		local myconf
-		if [ -n "`use trusted`" ] ; then
-			myconf="--trust"
-		else
-			myconf="--notrust"
-		fi
-
-		if [ -n "`use apm`" ] ; then
-			myconf="$myconf --apm"
-		else
-			myconf="$myconf --noapm"
-		fi
-
-		if [ -n "`use pnp`" ] ; then
-			myconf="$myconf --pnp"
-		else
-			myconf="$myconf --nopnp"
-		fi
-
-		if [ -n "`use nocardbus`" ] ; then
-			myconf="$myconf --nocardbus"
-		else
-			myconf="$myconf --cardbus"
-		fi
-
-		#use $CFLAGS for user tools, but standard kernel optimizations for
-		#the kernel modules (for compatibility)
-		./Configure -n \
-			--target=${D} \
-			--srctree \
-			--kernel=/usr/src/linux \
-			--arch="${MY_ARCH}" \
-			--uflags="${CFLAGS}" \
-			--kflags="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer" \
-			$myconf || die "failed configuring pcmcia-cs"
-	fi
-	# now lets build wlan-ng
-	cd ${S}
-
-	sed -e 's:TARGET_ROOT_ON_HOST=:TARGET_ROOT_ON_HOST=${D}:' \
-		-e 's:PRISM2_PCI=n:PRISM2_PCI=y:' \
-		config.in > default.config
-	mv default.config config.in
-
-	if [ -n "`use pcmcia`" ]; then
-		export PCMCIA_CS=${PCMCIA_CS}
-		sed -e 's:PCMCIA_SRC=:PCMCIA_SRC=${WORKDIR}/${PCMCIA_CS}:' \
-			-e 's:PRISM2_PLX=n:PRISM2_PLX=y:' \
-			config.in > default.config
-	else
-		sed -e 's:PRISM2_PCMCIA=y:PRISM2_PCMCIA=n:' \
-		config.in > default.config
-	fi
-	mv default.config config.in
-
-	if [ -n "`use usb`" ]; then
-		sed -e 's:PRISM2_USB=n:PRISM2_USB=y:' \
-			config.in > default.config
-		mv default.config config.in
-	fi
-
-	mv default.config config.in
-	cp config.in default.config
-
-	emake default_config || die "failed configuring WLAN"
-	emake all || die "failed compiling"
-
-	# compile add-on keygen program.  It seems to actually provide usable keys.
-	cd ${S}/add-ons/keygen
-
-	emake || die "Failed to compile add-on keygen program"
-}
-
-src_install () {
-
-	make install || die "failed installing"
-
-	dodir etc/wlan
-	mv ${D}/etc/conf.d/shared ${D}/etc/wlan/
-
-	if [ -z "`use build`" ]; then
-
-		dodir /usr/share/man/man1
-		newman ${S}/man/nwepgen.man nwepgen.1
-		newman ${S}/man/wlancfg.man wlancfg.1
-		newman ${S}/man/wlanctl-ng.man wlanctl-ng.1
-		newman ${S}/man/wland.man wland.1
-
-		dodoc CHANGES COPYING LICENSE FAQ README THANKS TODO \
-		      doc/config* doc/capturefrm.txt
-	fi
-
-	exeinto /sbin
-	doexe add-ons/keygen/keygen
-
-}
-
-pkg_postinst() {
-	depmod -a
-
-	einfo "Configuration of the WLAN package has changed since 0.1.16-pre4."
-	einfo ""
-	einfo "/etc/init.d/wlan is used to control startup and shutdown of non-PCMCIA devices."
-	einfo "/etc/init.d/pcmcia from pcmcia-cs is used to control startup and shutdown of"
-	einfo "PCMCIA devices."
-	einfo ""
-	einfo "The wlan-ng.opts file in /etc/pcmcia/ is now depricated."
-	einfo ""
-	einfo "Modify /etc/conf.d/wlan.conf to set global parameters."
-	einfo "Modify /etc/conf.d/wlancfg-* to set individual card parameters."
-	einfo "There are detailed instructions in these config files."
-	einfo ""
-	einfo "Two keygen programs are included: nwepgen and keygen.  keygen seems"
-	einfo "provide more usable keys at the moment."
-	einfo ""
-	einfo "Be sure to add iface_wlan0 parameters to /etc/conf.d/net."
-	einfo ""
-	ewarn "Wireless cards which you want to use drivers other than wlan-ng for"
-	ewarn "need to have the appropriate line removed from /etc/pcmcia/wlan-ng.conf"
-	ewarn "Do 'cardctl info' to see the manufacturer ID and remove the corresponding"
-	ewarn "line from that file."
-}
-
-
diff --git a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.1.16_pre9.ebuild b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.1.16_pre9.ebuild
deleted file mode 100644
index 6a927a17d8e3..000000000000
--- a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.1.16_pre9.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/linux-wlan-ng-0.1.16_pre9.ebuild,v 1.11 2003/09/10 04:47:55 msterret Exp $
-
-IUSE="apm build nocardbus pcmcia pnp trusted usb"
-
-PCMCIA_VERSION="`$(which cardmgr) -V 2>&1 | $(which cut) -f3 -d' '`"
-PCMCIA_CS="pcmcia-cs-${PCMCIA_VERSION}"
-PCMCIA_DIR="${WORKDIR}/${PCMCIA_CS}"
-
-MY_P=${P/_/-}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="The linux-wlan Project"
-SRC_URI="ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/${MY_P}.tar.gz
-		pcmcia?	( mirror://sourceforge/pcmcia-cs/${PCMCIA_CS}.tar.gz )"
-
-HOMEPAGE="http://linux-wlan.org"
-DEPEND="sys-kernel/linux-headers
-		dev-libs/openssl
-		sys-apps/baselayout
-		pcmcia?	( sys-apps/pcmcia-cs )"
-SLOT="0"
-LICENSE="MPL-1.1"
-KEYWORDS="~x86"
-
-# check arch for configure
-if [ ${ARCH} = "x86" ] ; then
-	MY_ARCH="i386"
-else
-	MY_ARCH="ppc"
-fi
-
-# Note: To use this ebuild, you should have the usr/src/linux symlink to
-# the kernel directory that linux-wlan-ng should use for configuration.
-#
-# linux-wlan-ng requires a configured pcmcia-cs source tree.
-# unpack/configure it in WORKDIR.  No need to compile it though.
-
-src_unpack() {
-
-	if [ -n "`use pcmcia`" ]; then
-		check_KV
-	fi
-
-	unpack ${A}
-	cd ${S}
-
-	# Lots of sedding to do to get the man pages and a few other
-	# things to end up in the right place.
-
-	mv man/Makefile man/Makefile.orig
-	sed -e "s:mkdir:#mkdir:" \
-		-e "s:cp nwepgen.man:#cp nwepgen.man:" \
-		-e "s:\t\$(TARGET:\t#\$(TARGET:" \
-		man/Makefile.orig > man/Makefile
-
-	mv etc/wlan/Makefile etc/wlan/Makefile.orig
-	sed -e "s:/etc/wlan:/etc/conf.d:g" \
-		etc/wlan/Makefile.orig > etc/wlan/Makefile
-
-	mv etc/wlan/wlancfg-DEFAULT etc/wlan/wlancfg-DEFAULT.orig
-	sed -e "s:/sbin/nwepgen:/sbin/keygen:" \
-		etc/wlan/wlancfg-DEFAULT.orig > etc/wlan/wlancfg-DEFAULT
-
-	mv etc/wlan/shared etc/wlan/shared.orig
-	sed -e "s:/etc/wlan/wlan.conf:/etc/conf.d/wlan.conf:g" \
-	    -e "s:/etc/wlan/wlancfg:/etc/conf.d/wlancfg:g" \
-		etc/wlan/shared.orig > etc/wlan/shared
-
-}
-
-src_compile() {
-
-	#
-	# configure pcmcia-cs - we need this for wlan to compile
-	# use same USE flags that the pcmcia-cs ebuild does.
-	# no need to actually compile pcmcia-cs...
-	# * This is actually only used if pcmcia_cs is NOT compiled into
-	# the kernel tree.
-	#
-
-	if [ -n "`use pcmcia`" ]; then
-		cd ${WORKDIR}/${PCMCIA_CS}
-		local myconf
-		if [ -n "`use trusted`" ] ; then
-			myconf="--trust"
-		else
-			myconf="--notrust"
-		fi
-
-		if [ -n "`use apm`" ] ; then
-			myconf="$myconf --apm"
-		else
-			myconf="$myconf --noapm"
-		fi
-
-		if [ -n "`use pnp`" ] ; then
-			myconf="$myconf --pnp"
-		else
-			myconf="$myconf --nopnp"
-		fi
-
-		if [ -n "`use nocardbus`" ] ; then
-			myconf="$myconf --nocardbus"
-		else
-			myconf="$myconf --cardbus"
-		fi
-
-		#use $CFLAGS for user tools, but standard kernel optimizations for
-		#the kernel modules (for compatibility)
-		./Configure -n \
-			--target=${D} \
-			--srctree \
-			--kernel=/usr/src/linux \
-			--arch="${MY_ARCH}" \
-			--uflags="${CFLAGS}" \
-			--kflags="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer" \
-			$myconf || die "failed configuring pcmcia-cs"
-	fi
-	# now lets build wlan-ng
-	cd ${S}
-
-	sed -e 's:TARGET_ROOT_ON_HOST=:TARGET_ROOT_ON_HOST=${D}:' \
-		-e 's:PRISM2_PCI=n:PRISM2_PCI=y:' \
-		config.in > default.config
-	mv default.config config.in
-
-	if [ -n "`use pcmcia`" ]; then
-		export PCMCIA_CS=${PCMCIA_CS}
-		sed -e 's:PCMCIA_SRC=:PCMCIA_SRC=${WORKDIR}/${PCMCIA_CS}:' \
-			-e 's:PRISM2_PLX=n:PRISM2_PLX=y:' \
-			config.in > default.config
-	else
-		sed -e 's:PRISM2_PCMCIA=y:PRISM2_PCMCIA=n:' \
-		config.in > default.config
-	fi
-	mv default.config config.in
-
-	if [ -n "`use usb`" ]; then
-		sed -e 's:PRISM2_USB=n:PRISM2_USB=y:' \
-			config.in > default.config
-		mv default.config config.in
-	fi
-
-	mv default.config config.in
-	cp config.in default.config
-
-	emake default_config || die "failed configuring WLAN"
-	emake all || die "failed compiling"
-
-	# compile add-on keygen program.  It seems to actually provide usable keys.
-	cd ${S}/add-ons/keygen
-
-	emake || die "Failed to compile add-on keygen program"
-}
-
-src_install () {
-
-	make install || die "failed installing"
-
-	dodir etc/wlan
-	mv ${D}/etc/conf.d/shared ${D}/etc/wlan/
-
-	if [ -z "`use build`" ]; then
-
-		dodir /usr/share/man/man1
-		newman ${S}/man/nwepgen.man nwepgen.1
-		newman ${S}/man/wlancfg.man wlancfg.1
-		newman ${S}/man/wlanctl-ng.man wlanctl-ng.1
-		newman ${S}/man/wland.man wland.1
-
-		dodoc CHANGES COPYING LICENSE FAQ README THANKS TODO \
-		      doc/config* doc/capturefrm.txt
-	fi
-
-	exeinto /sbin
-	doexe add-ons/keygen/keygen
-
-}
-
-pkg_postinst() {
-	depmod -a
-
-	einfo "Configuration of the WLAN package has changed since 0.1.16-pre4."
-	einfo ""
-	einfo "/etc/init.d/wlan is used to control startup and shutdown of non-PCMCIA devices."
-	einfo "/etc/init.d/pcmcia from pcmcia-cs is used to control startup and shutdown of"
-	einfo "PCMCIA devices."
-	einfo ""
-	einfo "The wlan-ng.opts file in /etc/pcmcia/ is now depricated."
-	einfo ""
-	einfo "Modify /etc/conf.d/wlan.conf to set global parameters."
-	einfo "Modify /etc/conf.d/wlancfg-* to set individual card parameters."
-	einfo "There are detailed instructions in these config files."
-	einfo ""
-	einfo "Two keygen programs are included: nwepgen and keygen.  keygen seems"
-	einfo "provide more usable keys at the moment."
-	einfo ""
-	einfo "Be sure to add iface_wlan0 parameters to /etc/conf.d/net."
-	einfo ""
-	ewarn "Wireless cards which you want to use drivers other than wlan-ng for"
-	ewarn "need to have the appropriate line removed from /etc/pcmcia/wlan-ng.conf"
-	ewarn "Do 'cardctl info' to see the manufacturer ID and remove the corresponding"
-	ewarn "line from that file."
-}
-
-
diff --git a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.0-r1.ebuild b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.0-r1.ebuild
index efd09fd6dafa..a35a4109c96d 100644
--- a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.0-r1.ebuild
+++ b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.0-r1.ebuild,v 1.5 2003/09/10 04:47:55 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.0-r1.ebuild,v 1.6 2004/02/01 23:33:51 latexer Exp $
 
 
 inherit eutils
diff --git a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.0-r2.ebuild b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.0-r2.ebuild
index 253eed738428..30b3b795b2a0 100644
--- a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.0-r2.ebuild
+++ b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.0-r2.ebuild,v 1.4 2003/09/10 04:47:55 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.0-r2.ebuild,v 1.5 2004/02/01 23:33:51 latexer Exp $
 
 
 inherit eutils
diff --git a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.0-r3.ebuild b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.0-r3.ebuild
new file mode 100644
index 000000000000..746c047937de
--- /dev/null
+++ b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.0-r3.ebuild
@@ -0,0 +1,243 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.0-r3.ebuild,v 1.1 2004/02/01 23:33:51 latexer Exp $
+
+inherit eutils
+
+IUSE="apm build nocardbus pcmcia pnp trusted usb"
+
+PCMCIA_CS="pcmcia-cs-3.2.5"
+PATCH_3_2_6="pcmcia-cs-3.2.5-3.2.6.diff.gz"
+PATCH_3_2_7="pcmcia-cs-3.2.5-3.2.7.diff.gz"
+PCMCIA_DIR="${WORKDIR}/${PCMCIA_CS}"
+
+DESCRIPTION="The linux-wlan Project"
+SRC_URI="ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/${P}.tar.gz
+		mirror://gentoo/${PN}-gentoo-init.gz
+		pcmcia?	( mirror://sourceforge/pcmcia-cs/${PCMCIA_CS}.tar.gz \
+			http://dev.gentoo.org/~latexer/files/patches/${PCMCIA_CS}-module-init-tools.diff.gz \
+			http://dev.gentoo.org/~latexer/files/patches/${PATCH_3_2_6} \
+			http://dev.gentoo.org/~latexer/files/patches/${PATCH_3_2_7} )"
+
+HOMEPAGE="http://linux-wlan.org"
+DEPEND="sys-kernel/linux-headers
+		dev-libs/openssl
+		sys-apps/baselayout
+		>=sys-apps/sed-4.0*
+		pcmcia?	( >=sys-apps/pcmcia-cs-3.2.5 )"
+SLOT="0"
+LICENSE="MPL-1.1"
+KEYWORDS="~x86"
+
+# Note: To use this ebuild, you should have the usr/src/linux symlink to
+# the kernel directory that linux-wlan-ng should use for configuration.
+#
+# linux-wlan-ng requires a configured pcmcia-cs source tree.
+# unpack/configure it in WORKDIR.  No need to compile it though.
+
+src_unpack() {
+
+	unpack ${P}.tar.gz
+	unpack ${PN}-gentoo-init.gz
+
+	# install a gentoo style init script
+
+	cp ${PN}-gentoo-init ${S}/etc/rc.wlan
+
+	check_KV
+
+	if [ -n "`use pcmcia`" ]; then
+		if egrep '^CONFIG_PCMCIA=[ym]' /usr/src/linux/.config >&/dev/null; then
+			einfo "Kernel PCMCIA is enabled. Skipping external pcmcia-cs sources."
+		else
+			unpack ${PCMCIA_CS}.tar.gz
+			cd ${PCMCIA_DIR}
+			# Fix for module-init-tools only systems
+			epatch ${DISTDIR}/${PCMCIA_CS}-module-init-tools.diff.gz
+			if [ -z "`has_version >=sys-apps/pcmcia-cs-3.2.7`" ]; then
+				epatch ${DISTDIR}/${PATCH_3_2_7}
+			elif [ -z "`has_version >=sys-apps/pcmcia-cs-3.2.6`" ]; then
+				epatch ${DISTDIR}/${PATCH_3_2_6}
+			fi
+		fi
+	fi
+
+
+	# Lots of sedding to do to get the man pages and a few other
+	# things to end up in the right place.
+
+	cd ${S}
+	#mv man/Makefile man/Makefile.orig
+	sed -i -e "s:mkdir:#mkdir:" \
+		-e "s:cp nwepgen.man:#cp nwepgen.man:" \
+		-e "s:\t\$(TARGET_:\t#\$(TARGET_:" \
+			man/Makefile
+
+	#mv etc/wlan/Makefile etc/wlan/Makefile.orig
+	sed -i -e "s:/etc/wlan:/etc/conf.d:g" \
+		etc/wlan/Makefile
+
+	#mv etc/wlan/wlancfg-DEFAULT etc/wlan/wlancfg-DEFAULT.orig
+	sed -i -e "s:/sbin/nwepgen:/sbin/keygen:" \
+		etc/wlan/wlancfg-DEFAULT
+
+	#mv etc/wlan/shared etc/wlan/shared.orig
+	sed -i -e "s:/etc/wlan/wlan.conf:/etc/conf.d/wlan.conf:g" \
+	    -e "s:/etc/wlan/wlancfg:/etc/conf.d/wlancfg:g" \
+		etc/wlan/shared
+
+}
+
+src_compile() {
+
+	#
+	# configure pcmcia-cs - we need this for wlan to compile
+	# use same USE flags that the pcmcia-cs ebuild does.
+	# no need to actually compile pcmcia-cs...
+	# * This is actually only used if pcmcia_cs is NOT compiled into
+	# the kernel tree.
+	#
+
+	local myarch kernelpcmcia
+
+	if egrep '^CONFIG_PCMCIA=[ym]' /usr/src/linux/.config >&/dev/null; then
+		kernelpcmcia="yes"
+	else
+		kernelpcmcia="no"
+	fi
+
+	if [ -n "`use pcmcia`" ]; then
+		if [ "${kernelpcmcia}" = "no" ]; then
+			# Set myarch since pcmcia-cs expects i386, not x86
+			case "${ARCH}" in
+				x86) myarch="i386" ;;
+				*) myarch="${ARCH}" ;;
+			esac
+
+			cd ${PCMCIA_DIR}
+			local myconf
+			if [ -n "`use trusted`" ] ; then
+				myconf="--trust"
+			else
+				myconf="--notrust"
+			fi
+
+			if [ -n "`use apm`" ] ; then
+				myconf="$myconf --apm"
+			else
+				myconf="$myconf --noapm"
+			fi
+
+			if [ -n "`use pnp`" ] ; then
+				myconf="$myconf --pnp"
+			else
+				myconf="$myconf --nopnp"
+			fi
+
+			if [ -n "`use nocardbus`" ] ; then
+				myconf="$myconf --nocardbus"
+			else
+				myconf="$myconf --cardbus"
+			fi
+
+			#use $CFLAGS for user tools, but standard kernel optimizations for
+			#the kernel modules (for compatibility)
+			./Configure -n \
+				--target=${D} \
+				--srctree \
+				--kernel=/usr/src/linux \
+				--arch="${myarch}" \
+				--uflags="${CFLAGS}" \
+				--kflags="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer" \
+				$myconf || die "failed configuring pcmcia-cs"
+		fi
+	fi
+	# now lets build wlan-ng
+	cd ${S}
+
+	#cp config.in default.config
+
+	sed -i -e 's:TARGET_ROOT_ON_HOST=:TARGET_ROOT_ON_HOST=${D}:' \
+		-e 's:PRISM2_PCI=n:PRISM2_PCI=y:' \
+			config.in
+	#mv default.config config.in
+
+	if [ -n "`use pcmcia`" ]; then
+		if [ "${kernelpcmcia}" = "no" ]
+		then
+			export PCMCIA_CS=${PCMCIA_CS}
+			sed -i -e 's:PCMCIA_SRC=:PCMCIA_SRC=${WORKDIR}/${PCMCIA_CS}:' \
+				config.in
+		fi
+		sed -i -e 's:PRISM2_PLX=n:PRISM2_PLX=y:' \
+			config.in
+	else
+		sed -i -e 's:PRISM2_PCMCIA=y:PRISM2_PCMCIA=n:' \
+			config.in
+	fi
+	#mv default.config config.in
+
+	if [ -n "`use usb`" ]; then
+		sed -i -e 's:PRISM2_USB=n:PRISM2_USB=y:' \
+			config.in
+		#mv default.config config.in
+	fi
+
+	#mv default.config config.in
+	cp config.in default.config
+
+	emake default_config || die "failed configuring WLAN"
+	emake all || die "failed compiling"
+
+	# compile add-on keygen program.  It seems to actually provide usable keys.
+	cd ${S}/add-ons/keygen
+
+	emake || die "Failed to compile add-on keygen program"
+}
+
+src_install () {
+
+	make install || die "failed installing"
+
+	dodir etc/wlan
+	mv ${D}/etc/conf.d/shared ${D}/etc/wlan/
+
+	if [ -z "`use build`" ]; then
+
+		dodir /usr/share/man/man1
+		newman ${S}/man/nwepgen.man nwepgen.1
+		newman ${S}/man/wlancfg.man wlancfg.1
+		newman ${S}/man/wlanctl-ng.man wlanctl-ng.1
+		newman ${S}/man/wland.man wland.1
+
+		dodoc CHANGES COPYING LICENSE FAQ README THANKS TODO \
+		      doc/config* doc/capturefrm.txt
+	fi
+
+	exeinto /sbin
+	doexe add-ons/keygen/keygen
+
+}
+
+pkg_postinst() {
+	depmod -a
+
+	einfo "Setup:"
+	einfo ""
+	einfo "/etc/init.d/wlan is used to control startup and shutdown of non-PCMCIA devices."
+	einfo "/etc/init.d/pcmcia from pcmcia-cs is used to control startup and shutdown of"
+	einfo "PCMCIA devices."
+	einfo ""
+	einfo "The wlan-ng.opts file in /etc/pcmcia/ is now depricated."
+	einfo ""
+	einfo "Modify /etc/conf.d/wlan.conf to set global parameters."
+	einfo "Modify /etc/conf.d/wlancfg-* to set individual card parameters."
+	einfo "There are detailed instructions in these config files."
+	einfo ""
+	einfo "Be sure to add iface_wlan0 parameters to /etc/conf.d/net."
+	einfo ""
+	ewarn "Wireless cards which you want to use drivers other than wlan-ng for"
+	ewarn "need to have the appropriate line removed from /etc/pcmcia/wlan-ng.conf"
+	ewarn "Do 'cardctl info' to see the manufacturer ID and remove the corresponding"
+	ewarn "line from that file."
+}
diff --git a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre1.ebuild b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre1.ebuild
deleted file mode 100644
index 4605ef01493d..000000000000
--- a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre1.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre1.ebuild,v 1.3 2003/09/10 04:47:55 msterret Exp $
-
-
-inherit eutils
-
-IUSE="apm build nocardbus pcmcia pnp trusted usb"
-
-PCMCIA_CS="pcmcia-cs-3.2.1"
-PATCH_3_2_2="pcmcia-cs-3.2.1-3.2.2.diff.gz"
-PATCH_3_2_3="pcmcia-cs-3.2.1-3.2.3.diff.gz"
-PATCH_3_2_4="pcmcia-cs-3.2.1-3.2.4.diff.gz"
-PCMCIA_DIR="${WORKDIR}/${PCMCIA_CS}"
-MY_P=${PN}-${PV/_/-}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="The linux-wlan Project"
-SRC_URI="ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/${MY_P}.tar.gz
-		mirror://gentoo/${PN}-gentoo-init.gz
-		pcmcia?	( mirror://sourceforge/pcmcia-cs/${PCMCIA_CS}.tar.gz )
-		pcmcia? ( mirror://gentoo/${PATCH_3_2_2} )
-		pcmcia? ( mirror://gentoo/${PATCH_3_2_3} )
-		pcmcia? ( mirror://gentoo/${PATCH_3_2_4} )"
-
-HOMEPAGE="http://linux-wlan.org"
-DEPEND="sys-kernel/linux-headers
-		dev-libs/openssl
-		sys-apps/baselayout
-		pcmcia?	( sys-apps/pcmcia-cs )"
-SLOT="0"
-LICENSE="MPL-1.1"
-KEYWORDS="~x86"
-
-# check arch for configure
-if [ ${ARCH} = "x86" ] ; then
-	MY_ARCH="i386"
-else
-	MY_ARCH="ppc"
-fi
-
-# Note: To use this ebuild, you should have the usr/src/linux symlink to
-# the kernel directory that linux-wlan-ng should use for configuration.
-#
-# linux-wlan-ng requires a configured pcmcia-cs source tree.
-# unpack/configure it in WORKDIR.  No need to compile it though.
-
-src_unpack() {
-
-	unpack ${MY_P}.tar.gz
-	unpack ${PN}-gentoo-init.gz
-	cp ${WORKDIR}/${PN}-gentoo-init ${S}/etc/rc.wlan
-
-	if [ -n "`use pcmcia`" ]; then
-		check_KV
-		unpack ${PCMCIA_CS}.tar.gz
-		cd ${PCMCIA_DIR}
-		if [ -z "`has_version =sys-apps/pcmcia-cs-3.2.4*`" ]; then
-			epatch ${DISTDIR}/${PATCH_3_2_4}
-		elif [ -z "`has_version =sys-apps/pcmcia-cs-3.2.3*`" ]; then
-			epatch ${DISTDIR}/${PATCH_3_2_3}
-		elif [ -z "`has_version =sys-apps/pcmcia-cs-3.2.2*`" ]; then
-			epatch ${DISTDIR}/${PATCH_3_2_2}
-		fi
-	fi
-
-
-	# Lots of sedding to do to get the man pages and a few other
-	# things to end up in the right place.
-
-	cd ${S}
-	mv man/Makefile man/Makefile.orig
-	sed -e "s:mkdir:#mkdir:" \
-		-e "s:cp nwepgen.man:#cp nwepgen.man:" \
-		-e "s:\t\$(TARGET_:\t#\$(TARGET_:" \
-		man/Makefile.orig > man/Makefile
-
-	mv etc/wlan/Makefile etc/wlan/Makefile.orig
-	sed -e "s:/etc/wlan:/etc/conf.d:g" \
-		etc/wlan/Makefile.orig > etc/wlan/Makefile
-
-	mv etc/wlan/wlancfg-DEFAULT etc/wlan/wlancfg-DEFAULT.orig
-	sed -e "s:/sbin/nwepgen:/sbin/keygen:" \
-		etc/wlan/wlancfg-DEFAULT.orig > etc/wlan/wlancfg-DEFAULT
-
-	mv etc/wlan/shared etc/wlan/shared.orig
-	sed -e "s:/etc/wlan/wlan.conf:/etc/conf.d/wlan.conf:g" \
-	    -e "s:/etc/wlan/wlancfg:/etc/conf.d/wlancfg:g" \
-		etc/wlan/shared.orig > etc/wlan/shared
-
-}
-
-src_compile() {
-
-	#
-	# configure pcmcia-cs - we need this for wlan to compile
-	# use same USE flags that the pcmcia-cs ebuild does.
-	# no need to actually compile pcmcia-cs...
-	# * This is actually only used if pcmcia_cs is NOT compiled into
-	# the kernel tree.
-	#
-
-	if [ -n "`use pcmcia`" ]; then
-		cd ${WORKDIR}/${PCMCIA_CS}
-		local myconf
-		if [ -n "`use trusted`" ] ; then
-			myconf="--trust"
-		else
-			myconf="--notrust"
-		fi
-
-		if [ -n "`use apm`" ] ; then
-			myconf="$myconf --apm"
-		else
-			myconf="$myconf --noapm"
-		fi
-
-		if [ -n "`use pnp`" ] ; then
-			myconf="$myconf --pnp"
-		else
-			myconf="$myconf --nopnp"
-		fi
-
-		if [ -n "`use nocardbus`" ] ; then
-			myconf="$myconf --nocardbus"
-		else
-			myconf="$myconf --cardbus"
-		fi
-
-		#use $CFLAGS for user tools, but standard kernel optimizations for
-		#the kernel modules (for compatibility)
-		./Configure -n \
-			--target=${D} \
-			--srctree \
-			--kernel=/usr/src/linux \
-			--arch="${MY_ARCH}" \
-			--uflags="${CFLAGS}" \
-			--kflags="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer" \
-			$myconf || die "failed configuring pcmcia-cs"
-	fi
-	# now lets build wlan-ng
-	cd ${S}
-
-	sed -e 's:TARGET_ROOT_ON_HOST=:TARGET_ROOT_ON_HOST=${D}:' \
-		-e 's:PRISM2_PCI=n:PRISM2_PCI=y:' \
-		config.in > default.config
-	mv default.config config.in
-
-	if [ -n "`use pcmcia`" ]; then
-		export PCMCIA_CS=${PCMCIA_CS}
-		sed -e 's:PCMCIA_SRC=:PCMCIA_SRC=${WORKDIR}/${PCMCIA_CS}:' \
-			-e 's:PRISM2_PLX=n:PRISM2_PLX=y:' \
-			config.in > default.config
-	else
-		sed -e 's:PRISM2_PCMCIA=y:PRISM2_PCMCIA=n:' \
-		config.in > default.config
-	fi
-	mv default.config config.in
-
-	if [ -n "`use usb`" ]; then
-		sed -e 's:PRISM2_USB=n:PRISM2_USB=y:' \
-			config.in > default.config
-		mv default.config config.in
-	fi
-
-	mv default.config config.in
-	cp config.in default.config
-
-	emake default_config || die "failed configuring WLAN"
-	emake all || die "failed compiling"
-
-	# compile add-on keygen program.  It seems to actually provide usable keys.
-	cd ${S}/add-ons/keygen
-	emake || die "Failed to compile add-on keygen program"
-	cd ${S}/add-ons/lwepgen
-	emake || die "Failed to compile add-on lwepgen program"
-}
-
-src_install () {
-
-	make install || die "failed installing"
-
-	dodir etc/wlan
-	mv ${D}/etc/conf.d/shared ${D}/etc/wlan/
-
-	if [ -z "`use build`" ]; then
-
-		dodir /usr/share/man/man1
-		newman ${S}/man/nwepgen.man nwepgen.1
-		newman ${S}/man/wlancfg.man wlancfg.1
-		newman ${S}/man/wlanctl-ng.man wlanctl-ng.1
-		newman ${S}/man/wland.man wland.1
-
-		dodoc CHANGES COPYING LICENSE FAQ README THANKS TODO \
-		      doc/config* doc/capturefrm.txt
-	fi
-
-	exeinto /sbin
-	doexe add-ons/keygen/keygen
-	doexe add-ons/lwepgen/lwepgen
-
-}
-
-pkg_postinst() {
-	depmod -a
-
-	einfo "Configuration of the WLAN package has changed since 0.1.16-pre4."
-	einfo ""
-	einfo "/etc/init.d/wlan is used to control startup and shutdown of non-PCMCIA devices."
-	einfo "/etc/init.d/pcmcia from pcmcia-cs is used to control startup and shutdown of"
-	einfo "PCMCIA devices."
-	einfo ""
-	einfo "The wlan-ng.opts file in /etc/pcmcia/ is now depricated."
-	einfo ""
-	einfo "Modify /etc/conf.d/wlan.conf to set global parameters."
-	einfo "Modify /etc/conf.d/wlancfg-* to set individual card parameters."
-	einfo "There are detailed instructions in these config files."
-	einfo ""
-	einfo "Three keygen programs are included: nwepgen, keygen, and lwepgen."
-	einfo "keygen seems provide more usable keys at the moment."
-	einfo ""
-	einfo "Be sure to add iface_wlan0 parameters to /etc/conf.d/net."
-	einfo ""
-	ewarn "Wireless cards which you want to use drivers other than wlan-ng for"
-	ewarn "need to have the appropriate line removed from /etc/pcmcia/wlan-ng.conf"
-	ewarn "Do 'cardctl info' to see the manufacturer ID and remove the corresponding"
-	ewarn "line from that file."
-}
-
-
diff --git a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre11.ebuild b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre11.ebuild
index 803aceae5064..e4d1a0637a44 100644
--- a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre11.ebuild
+++ b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre11.ebuild,v 1.3 2003/09/10 04:47:55 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre11.ebuild,v 1.4 2004/02/01 23:33:51 latexer Exp $
 
 
 inherit eutils
diff --git a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre2.ebuild b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre2.ebuild
deleted file mode 100644
index 6e0e49dba8fd..000000000000
--- a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre2.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre2.ebuild,v 1.3 2003/09/10 04:47:55 msterret Exp $
-
-
-inherit eutils
-
-IUSE="apm build nocardbus pcmcia pnp trusted usb"
-
-PCMCIA_CS="pcmcia-cs-3.2.1"
-PATCH_3_2_2="pcmcia-cs-3.2.1-3.2.2.diff.gz"
-PATCH_3_2_3="pcmcia-cs-3.2.1-3.2.3.diff.gz"
-PATCH_3_2_4="pcmcia-cs-3.2.1-3.2.4.diff.gz"
-PCMCIA_DIR="${WORKDIR}/${PCMCIA_CS}"
-MY_P=${PN}-${PV/_/-}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="The linux-wlan Project"
-SRC_URI="ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/${MY_P}.tar.gz
-		mirror://gentoo/${PN}-gentoo-init.gz
-		pcmcia?	( mirror://sourceforge/pcmcia-cs/${PCMCIA_CS}.tar.gz )
-		pcmcia? ( mirror://gentoo/${PATCH_3_2_2} )
-		pcmcia? ( mirror://gentoo/${PATCH_3_2_3} )
-		pcmcia? ( mirror://gentoo/${PATCH_3_2_4} )"
-
-HOMEPAGE="http://linux-wlan.org"
-DEPEND="sys-kernel/linux-headers
-		dev-libs/openssl
-		sys-apps/baselayout
-		pcmcia?	( sys-apps/pcmcia-cs )"
-SLOT="0"
-LICENSE="MPL-1.1"
-KEYWORDS="~x86"
-
-# check arch for configure
-if [ ${ARCH} = "x86" ] ; then
-	MY_ARCH="i386"
-else
-	MY_ARCH="ppc"
-fi
-
-# Note: To use this ebuild, you should have the usr/src/linux symlink to
-# the kernel directory that linux-wlan-ng should use for configuration.
-#
-# linux-wlan-ng requires a configured pcmcia-cs source tree.
-# unpack/configure it in WORKDIR.  No need to compile it though.
-
-src_unpack() {
-
-	unpack ${MY_P}.tar.gz
-	unpack ${PN}-gentoo-init.gz
-	cp ${WORKDIR}/${PN}-gentoo-init ${S}/etc/rc.wlan
-
-	if [ -n "`use pcmcia`" ]; then
-		unpack ${PCMCIA_CS}.tar.gz
-		cd ${PCMCIA_DIR}
-		if [ -z "`has_version =sys-apps/pcmcia-cs-3.2.4*`" ]; then
-			epatch ${DISTDIR}/${PATCH_3_2_4}
-		elif [ -z "`has_version =sys-apps/pcmcia-cs-3.2.3*`" ]; then
-			epatch ${DISTDIR}/${PATCH_3_2_3}
-		elif [ -z "`has_version =sys-apps/pcmcia-cs-3.2.2*`" ]; then
-			epatch ${DISTDIR}/${PATCH_3_2_2}
-		fi
-	fi
-
-
-	# Lots of sedding to do to get the man pages and a few other
-	# things to end up in the right place.
-
-	cd ${S}
-	mv man/Makefile man/Makefile.orig
-	sed -e "s:mkdir:#mkdir:" \
-		-e "s:cp nwepgen.man:#cp nwepgen.man:" \
-		-e "s:\t\$(TARGET_:\t#\$(TARGET_:" \
-		man/Makefile.orig > man/Makefile
-
-	mv etc/wlan/Makefile etc/wlan/Makefile.orig
-	sed -e "s:/etc/wlan:/etc/conf.d:g" \
-		etc/wlan/Makefile.orig > etc/wlan/Makefile
-
-	mv etc/wlan/wlancfg-DEFAULT etc/wlan/wlancfg-DEFAULT.orig
-	sed -e "s:/sbin/nwepgen:/sbin/keygen:" \
-		etc/wlan/wlancfg-DEFAULT.orig > etc/wlan/wlancfg-DEFAULT
-
-	mv etc/wlan/shared etc/wlan/shared.orig
-	sed -e "s:/etc/wlan/wlan.conf:/etc/conf.d/wlan.conf:g" \
-	    -e "s:/etc/wlan/wlancfg:/etc/conf.d/wlancfg:g" \
-		etc/wlan/shared.orig > etc/wlan/shared
-
-}
-
-src_compile() {
-
-	#
-	# configure pcmcia-cs - we need this for wlan to compile
-	# use same USE flags that the pcmcia-cs ebuild does.
-	# no need to actually compile pcmcia-cs...
-	# * This is actually only used if pcmcia_cs is NOT compiled into
-	# the kernel tree.
-	#
-
-	if [ -n "`use pcmcia`" ]; then
-		cd ${WORKDIR}/${PCMCIA_CS}
-		local myconf
-		if [ -n "`use trusted`" ] ; then
-			myconf="--trust"
-		else
-			myconf="--notrust"
-		fi
-
-		if [ -n "`use apm`" ] ; then
-			myconf="$myconf --apm"
-		else
-			myconf="$myconf --noapm"
-		fi
-
-		if [ -n "`use pnp`" ] ; then
-			myconf="$myconf --pnp"
-		else
-			myconf="$myconf --nopnp"
-		fi
-
-		if [ -n "`use nocardbus`" ] ; then
-			myconf="$myconf --nocardbus"
-		else
-			myconf="$myconf --cardbus"
-		fi
-
-		#use $CFLAGS for user tools, but standard kernel optimizations for
-		#the kernel modules (for compatibility)
-		./Configure -n \
-			--target=${D} \
-			--srctree \
-			--kernel=/usr/src/linux \
-			--arch="${MY_ARCH}" \
-			--uflags="${CFLAGS}" \
-			--kflags="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer" \
-			$myconf || die "failed configuring pcmcia-cs"
-	fi
-	# now lets build wlan-ng
-	cd ${S}
-
-	sed -e 's:TARGET_ROOT_ON_HOST=:TARGET_ROOT_ON_HOST=${D}:' \
-		-e 's:PRISM2_PCI=n:PRISM2_PCI=y:' \
-		config.in > default.config
-	mv default.config config.in
-
-	if [ -n "`use pcmcia`" ]; then
-		export PCMCIA_CS=${PCMCIA_CS}
-		sed -e 's:PCMCIA_SRC=:PCMCIA_SRC=${WORKDIR}/${PCMCIA_CS}:' \
-			-e 's:PRISM2_PLX=n:PRISM2_PLX=y:' \
-			config.in > default.config
-	else
-		sed -e 's:PRISM2_PCMCIA=y:PRISM2_PCMCIA=n:' \
-		config.in > default.config
-	fi
-	mv default.config config.in
-
-	if [ -n "`use usb`" ]; then
-		sed -e 's:PRISM2_USB=n:PRISM2_USB=y:' \
-			config.in > default.config
-		mv default.config config.in
-	fi
-
-	mv default.config config.in
-	cp config.in default.config
-
-	emake default_config || die "failed configuring WLAN"
-	emake all || die "failed compiling"
-
-	# compile add-on keygen program.  It seems to actually provide usable keys.
-	cd ${S}/add-ons/keygen
-	emake || die "Failed to compile add-on keygen program"
-	cd ${S}/add-ons/lwepgen
-	emake || die "Failed to compile add-on lwepgen program"
-}
-
-src_install () {
-
-	make install || die "failed installing"
-
-	dodir etc/wlan
-	mv ${D}/etc/conf.d/shared ${D}/etc/wlan/
-
-	if [ -z "`use build`" ]; then
-
-		dodir /usr/share/man/man1
-		newman ${S}/man/nwepgen.man nwepgen.1
-		newman ${S}/man/wlancfg.man wlancfg.1
-		newman ${S}/man/wlanctl-ng.man wlanctl-ng.1
-		newman ${S}/man/wland.man wland.1
-
-		dodoc CHANGES COPYING LICENSE FAQ README THANKS TODO \
-		      doc/config* doc/capturefrm.txt
-	fi
-
-	exeinto /sbin
-	doexe add-ons/keygen/keygen
-	doexe add-ons/lwepgen/lwepgen
-
-}
-
-pkg_postinst() {
-	depmod -a
-
-	einfo "Configuration of the WLAN package has changed since 0.1.16-pre4."
-	einfo ""
-	einfo "/etc/init.d/wlan is used to control startup and shutdown of non-PCMCIA devices."
-	einfo "/etc/init.d/pcmcia from pcmcia-cs is used to control startup and shutdown of"
-	einfo "PCMCIA devices."
-	einfo ""
-	einfo "The wlan-ng.opts file in /etc/pcmcia/ is now depricated."
-	einfo ""
-	einfo "Modify /etc/conf.d/wlan.conf to set global parameters."
-	einfo "Modify /etc/conf.d/wlancfg-* to set individual card parameters."
-	einfo "There are detailed instructions in these config files."
-	einfo ""
-	einfo "Three keygen programs are included: nwepgen, keygen, and lwepgen."
-	einfo "keygen seems provide more usable keys at the moment."
-	einfo ""
-	einfo "Be sure to add iface_wlan0 parameters to /etc/conf.d/net."
-	einfo ""
-	ewarn "Wireless cards which you want to use drivers other than wlan-ng for"
-	ewarn "need to have the appropriate line removed from /etc/pcmcia/wlan-ng.conf"
-	ewarn "Do 'cardctl info' to see the manufacturer ID and remove the corresponding"
-	ewarn "line from that file."
-}
-
-
diff --git a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre3.ebuild b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre3.ebuild
deleted file mode 100644
index 36e24e0be22e..000000000000
--- a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre3.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre3.ebuild,v 1.3 2003/09/10 04:47:55 msterret Exp $
-
-
-inherit eutils
-
-IUSE="apm build nocardbus pcmcia pnp trusted usb"
-
-PCMCIA_CS="pcmcia-cs-3.2.1"
-PATCH_3_2_2="pcmcia-cs-3.2.1-3.2.2.diff.gz"
-PATCH_3_2_3="pcmcia-cs-3.2.1-3.2.3.diff.gz"
-PATCH_3_2_4="pcmcia-cs-3.2.1-3.2.4.diff.gz"
-PCMCIA_DIR="${WORKDIR}/${PCMCIA_CS}"
-MY_P=${PN}-${PV/_/-}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="The linux-wlan Project"
-SRC_URI="ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/${MY_P}.tar.gz
-		mirror://gentoo/${PN}-gentoo-init.gz
-		pcmcia?	( mirror://sourceforge/pcmcia-cs/${PCMCIA_CS}.tar.gz )
-		pcmcia? ( mirror://gentoo/${PATCH_3_2_2} )
-		pcmcia? ( mirror://gentoo/${PATCH_3_2_3} )
-		pcmcia? ( mirror://gentoo/${PATCH_3_2_4} )"
-
-HOMEPAGE="http://linux-wlan.org"
-DEPEND="sys-kernel/linux-headers
-		dev-libs/openssl
-		sys-apps/baselayout
-		pcmcia?	( sys-apps/pcmcia-cs )"
-SLOT="0"
-LICENSE="MPL-1.1"
-KEYWORDS="~x86"
-
-# check arch for configure
-if [ ${ARCH} = "x86" ] ; then
-	MY_ARCH="i386"
-else
-	MY_ARCH="ppc"
-fi
-
-# Note: To use this ebuild, you should have the usr/src/linux symlink to
-# the kernel directory that linux-wlan-ng should use for configuration.
-#
-# linux-wlan-ng requires a configured pcmcia-cs source tree.
-# unpack/configure it in WORKDIR.  No need to compile it though.
-
-src_unpack() {
-
-	unpack ${MY_P}.tar.gz
-	unpack ${PN}-gentoo-init.gz
-	cp ${WORKDIR}/${PN}-gentoo-init ${S}/etc/rc.wlan
-
-	if [ -n "`use pcmcia`" ]; then
-		unpack ${PCMCIA_CS}.tar.gz
-		cd ${PCMCIA_DIR}
-		if [ -z "`has_version =sys-apps/pcmcia-cs-3.2.4*`" ]; then
-			epatch ${DISTDIR}/${PATCH_3_2_4}
-		elif [ -z "`has_version =sys-apps/pcmcia-cs-3.2.3*`" ]; then
-			epatch ${DISTDIR}/${PATCH_3_2_3}
-		elif [ -z "`has_version =sys-apps/pcmcia-cs-3.2.2*`" ]; then
-			epatch ${DISTDIR}/${PATCH_3_2_2}
-		fi
-	fi
-
-
-	# Lots of sedding to do to get the man pages and a few other
-	# things to end up in the right place.
-
-	cd ${S}
-	mv man/Makefile man/Makefile.orig
-	sed -e "s:mkdir:#mkdir:" \
-		-e "s:cp nwepgen.man:#cp nwepgen.man:" \
-		-e "s:\t\$(TARGET_:\t#\$(TARGET_:" \
-		man/Makefile.orig > man/Makefile
-
-	mv etc/wlan/Makefile etc/wlan/Makefile.orig
-	sed -e "s:/etc/wlan:/etc/conf.d:g" \
-		etc/wlan/Makefile.orig > etc/wlan/Makefile
-
-	mv etc/wlan/wlancfg-DEFAULT etc/wlan/wlancfg-DEFAULT.orig
-	sed -e "s:/sbin/nwepgen:/sbin/keygen:" \
-		etc/wlan/wlancfg-DEFAULT.orig > etc/wlan/wlancfg-DEFAULT
-
-	mv etc/wlan/shared etc/wlan/shared.orig
-	sed -e "s:/etc/wlan/wlan.conf:/etc/conf.d/wlan.conf:g" \
-	    -e "s:/etc/wlan/wlancfg:/etc/conf.d/wlancfg:g" \
-		etc/wlan/shared.orig > etc/wlan/shared
-
-}
-
-src_compile() {
-
-	#
-	# configure pcmcia-cs - we need this for wlan to compile
-	# use same USE flags that the pcmcia-cs ebuild does.
-	# no need to actually compile pcmcia-cs...
-	# * This is actually only used if pcmcia_cs is NOT compiled into
-	# the kernel tree.
-	#
-
-	if [ -n "`use pcmcia`" ]; then
-		cd ${WORKDIR}/${PCMCIA_CS}
-		local myconf
-		if [ -n "`use trusted`" ] ; then
-			myconf="--trust"
-		else
-			myconf="--notrust"
-		fi
-
-		if [ -n "`use apm`" ] ; then
-			myconf="$myconf --apm"
-		else
-			myconf="$myconf --noapm"
-		fi
-
-		if [ -n "`use pnp`" ] ; then
-			myconf="$myconf --pnp"
-		else
-			myconf="$myconf --nopnp"
-		fi
-
-		if [ -n "`use nocardbus`" ] ; then
-			myconf="$myconf --nocardbus"
-		else
-			myconf="$myconf --cardbus"
-		fi
-
-		#use $CFLAGS for user tools, but standard kernel optimizations for
-		#the kernel modules (for compatibility)
-		./Configure -n \
-			--target=${D} \
-			--srctree \
-			--kernel=/usr/src/linux \
-			--arch="${MY_ARCH}" \
-			--uflags="${CFLAGS}" \
-			--kflags="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer" \
-			$myconf || die "failed configuring pcmcia-cs"
-	fi
-	# now lets build wlan-ng
-	cd ${S}
-
-	sed -e 's:TARGET_ROOT_ON_HOST=:TARGET_ROOT_ON_HOST=${D}:' \
-		-e 's:PRISM2_PCI=n:PRISM2_PCI=y:' \
-		config.in > default.config
-	mv default.config config.in
-
-	if [ -n "`use pcmcia`" ]; then
-		export PCMCIA_CS=${PCMCIA_CS}
-		sed -e 's:PCMCIA_SRC=:PCMCIA_SRC=${WORKDIR}/${PCMCIA_CS}:' \
-			-e 's:PRISM2_PLX=n:PRISM2_PLX=y:' \
-			config.in > default.config
-	else
-		sed -e 's:PRISM2_PCMCIA=y:PRISM2_PCMCIA=n:' \
-		config.in > default.config
-	fi
-	mv default.config config.in
-
-	if [ -n "`use usb`" ]; then
-		sed -e 's:PRISM2_USB=n:PRISM2_USB=y:' \
-			config.in > default.config
-		mv default.config config.in
-	fi
-
-	mv default.config config.in
-	cp config.in default.config
-
-	emake default_config || die "failed configuring WLAN"
-	emake all || die "failed compiling"
-
-	# compile add-on keygen program.  It seems to actually provide usable keys.
-	cd ${S}/add-ons/keygen
-	emake || die "Failed to compile add-on keygen program"
-	cd ${S}/add-ons/lwepgen
-	emake || die "Failed to compile add-on lwepgen program"
-}
-
-src_install () {
-
-	make install || die "failed installing"
-
-	dodir etc/wlan
-	mv ${D}/etc/conf.d/shared ${D}/etc/wlan/
-
-	if [ -z "`use build`" ]; then
-
-		dodir /usr/share/man/man1
-		newman ${S}/man/nwepgen.man nwepgen.1
-		newman ${S}/man/wlancfg.man wlancfg.1
-		newman ${S}/man/wlanctl-ng.man wlanctl-ng.1
-		newman ${S}/man/wland.man wland.1
-
-		dodoc CHANGES COPYING LICENSE FAQ README THANKS TODO \
-		      doc/config* doc/capturefrm.txt
-	fi
-
-	exeinto /sbin
-	doexe add-ons/keygen/keygen
-	doexe add-ons/lwepgen/lwepgen
-
-}
-
-pkg_postinst() {
-	depmod -a
-
-	einfo "Configuration of the WLAN package has changed since 0.1.16-pre4."
-	einfo ""
-	einfo "/etc/init.d/wlan is used to control startup and shutdown of non-PCMCIA devices."
-	einfo "/etc/init.d/pcmcia from pcmcia-cs is used to control startup and shutdown of"
-	einfo "PCMCIA devices."
-	einfo ""
-	einfo "The wlan-ng.opts file in /etc/pcmcia/ is now depricated."
-	einfo ""
-	einfo "Modify /etc/conf.d/wlan.conf to set global parameters."
-	einfo "Modify /etc/conf.d/wlancfg-* to set individual card parameters."
-	einfo "There are detailed instructions in these config files."
-	einfo ""
-	einfo "Three keygen programs are included: nwepgen, keygen, and lwepgen."
-	einfo "keygen seems provide more usable keys at the moment."
-	einfo ""
-	einfo "Be sure to add iface_wlan0 parameters to /etc/conf.d/net."
-	einfo ""
-	ewarn "Wireless cards which you want to use drivers other than wlan-ng for"
-	ewarn "need to have the appropriate line removed from /etc/pcmcia/wlan-ng.conf"
-	ewarn "Do 'cardctl info' to see the manufacturer ID and remove the corresponding"
-	ewarn "line from that file."
-}
-
-
diff --git a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre8.ebuild b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre8.ebuild
index 6ae79a89bc05..ebc9993180fb 100644
--- a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre8.ebuild
+++ b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre8.ebuild,v 1.3 2003/09/10 04:47:55 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre8.ebuild,v 1.4 2004/02/01 23:33:51 latexer Exp $
 
 
 inherit eutils