Version bump, and minor tweak

17 files changed, 287 insertions, 15 deletions

diff --git a/net-wireless/linux-wlan-ng/ChangeLog b/net-wireless/linux-wlan-ng/ChangeLog
index 21cff4edc4cf..42c63ffd897d 100644
--- a/net-wireless/linux-wlan-ng/ChangeLog
+++ b/net-wireless/linux-wlan-ng/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-wireless/linux-wlan-ng
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/ChangeLog,v 1.20 2003/04/07 00:08:32 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/ChangeLog,v 1.21 2003/04/09 21:02:36 latexer Exp $
+
+  10 Apr 2003; Peter Johanson <latexer@gentoo.org> :
+  Fixed all ebuilds to do check_KV if needed.
+  
+*linux-wlan-ng-0.2.1_pre1 (10 Apr 2003)
+
+  10 Apr 2003; Peter Johanson <latexer@gentoo.org> linux-wlan-ng-0.2.1_pre1.ebuild:
+  Version bump, uses gentoo style init script.
 
 *linux-wlan-ng-0.2.0-r1 (03 Apr 2003)
 
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
index 943d9d800e7e..bd76ec7ae85e 100644
--- 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
@@ -1,2 +1,3 @@
+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
index de33315f1712..b89886f51b03 100644
--- 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
@@ -1,2 +1,3 @@
+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
index 037fe1ba6d22..91b04c5add57 100644
--- 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
@@ -1,2 +1,3 @@
+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
index 392ddb561721..3525875b2e9d 100644
--- 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
@@ -1,2 +1,3 @@
+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
index 67768f93615c..ef8f847f1c72 100644
--- 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
@@ -1,4 +1,3 @@
+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
-MD5 d4a075b3b0b390fc497c72de79a10922 linux-wlan-ng-0.2.0.tar.gz 329418
-MD5 581749071efdfc8056ed05f0373d5b79 pcmcia-cs-3.2.3.tar.gz 1255022
-MD5 7e9f01a697d2e3e5164340d79474ea30 pcmcia-cs-3.2.1.tar.gz 1250413
diff --git a/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.2.0 b/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.2.0
index 76abc816f659..c112861278a9 100644
--- a/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.2.0
+++ b/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.2.0
@@ -1,4 +1,3 @@
+MD5 f4b0e3997b477ef0338b99cc1944649d /linux-wlan-ng-0.2.0.ebuild 5823
 MD5 42b6d21a29cb5f75f8b1e8a3ad69b19a linux-wlan-ng-0.2.0.tar.gz 329432
 MD5 126e2d87e7a8a12e283db37ae82e9e4c pcmcia-cs-3.2.4.tar.gz 1262994
-MD5 581749071efdfc8056ed05f0373d5b79 pcmcia-cs-3.2.3.tar.gz 1255022
-MD5 7e9f01a697d2e3e5164340d79474ea30 pcmcia-cs-3.2.1.tar.gz 1250413
diff --git a/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.2.0-r1 b/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.2.0-r1
index 9e9219e547a4..f1a9f99ca3e0 100644
--- a/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.2.0-r1
+++ b/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.2.0-r1
@@ -1,4 +1,4 @@
-MD5 137acf16b9329e092828ba47c1fca291 /linux-wlan-ng-0.2.0-r1.ebuild 6240
+MD5 dfc8fc133ad43331ea4fcd1988568dc1 /linux-wlan-ng-0.2.0-r1.ebuild 6251
 MD5 42b6d21a29cb5f75f8b1e8a3ad69b19a linux-wlan-ng-0.2.0.tar.gz 329432
 MD5 7e9f01a697d2e3e5164340d79474ea30 pcmcia-cs-3.2.1.tar.gz 1250413
 MD5 24e8c68d0eac2a9b3446acdd259c22a0 pcmcia-cs-3.2.1-3.2.2.diff.gz 246919
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
index 12720b546b40..368cd498f64d 100644
--- 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
@@ -1,4 +1,4 @@
-MD5 a36cfa15f9d93a2c226dc750f44c21dc /linux-wlan-ng-0.2.1_pre1.ebuild 6410
+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
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
index 862888378f11..89c81df1d940 100644
--- 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
@@ -1,6 +1,6 @@
 # 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.4 2003/03/08 22:59:45 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/linux-wlan-ng-0.1.16_pre4.ebuild,v 1.5 2003/04/09 21:02:36 latexer Exp $
 
 # linux-wlan-ng requires a configured pcmcia-cs source tree.  
 # unpack/configure it in WORKDIR.  No need to compile it though.
@@ -36,6 +36,13 @@ 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
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
index 324773a4e2d1..ad508a679390 100644
--- 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
@@ -1,6 +1,6 @@
 # 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.4 2003/03/08 22:59:45 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/linux-wlan-ng-0.1.16_pre6.ebuild,v 1.5 2003/04/09 21:02:36 latexer Exp $
 
 # linux-wlan-ng requires a configured pcmcia-cs source tree.  
 # unpack/configure it in WORKDIR.  No need to compile it though.
@@ -35,6 +35,13 @@ 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
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
index 82f1fbd36b3b..5cf32fd75ddc 100644
--- 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
@@ -1,6 +1,6 @@
 # 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.4 2003/03/08 22:59:45 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/linux-wlan-ng-0.1.16_pre7.ebuild,v 1.5 2003/04/09 21:02:36 latexer Exp $
 
 # linux-wlan-ng requires a configured pcmcia-cs source tree.  
 # unpack/configure it in WORKDIR.  No need to compile it though.
@@ -35,6 +35,13 @@ 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
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
index 57de6f92ed47..e1a6a6c40f0e 100644
--- 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
@@ -1,6 +1,6 @@
 # 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.3 2003/03/08 22:59:45 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/linux-wlan-ng-0.1.16_pre8.ebuild,v 1.4 2003/04/09 21:02:36 latexer Exp $
 
 IUSE="apm build nocardbus pcmcia pnp trusted usb"
 
@@ -36,6 +36,10 @@ fi
 # 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}
 
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
index 1014937db0bb..9e03a9de314f 100644
--- 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
@@ -1,6 +1,6 @@
 # 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.8 2003/03/08 22:59:45 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/linux-wlan-ng-0.1.16_pre9.ebuild,v 1.9 2003/04/09 21:02:36 latexer Exp $
 
 IUSE="apm build nocardbus pcmcia pnp trusted usb"
 
@@ -37,6 +37,11 @@ fi
 # 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}
 
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 ea1713afd9db..4d973a144ca8 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.
 # 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.2 2003/04/07 00:08:32 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.0-r1.ebuild,v 1.3 2003/04/09 21:02:36 latexer Exp $
 
 
 inherit eutils
@@ -46,6 +46,7 @@ src_unpack() {
 
 	unpack ${P}.tar.gz
 	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
diff --git a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.0.ebuild b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.0.ebuild
index 9793d654ddd2..4ee2e9af368c 100644
--- a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.0.ebuild
+++ b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.0.ebuild
@@ -1,6 +1,6 @@
 # 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.0.ebuild,v 1.5 2003/03/24 23:52:31 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.0.ebuild,v 1.6 2003/04/09 21:02:36 latexer Exp $
 
 
 IUSE="apm build nocardbus pcmcia pnp trusted usb"
@@ -42,6 +42,7 @@ fi
 
 src_unpack() {
 
+	check_KV
 	unpack ${A}
 	cd ${S}
 
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
new file mode 100644
index 000000000000..3c9d7409e75e
--- /dev/null
+++ b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre1.ebuild
@@ -0,0 +1,230 @@
+# 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.1 2003/04/09 21:02:36 latexer 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."
+}
+
+