Version bump for pcmcia-cs fix

3 files changed, 211 insertions, 1 deletions

diff --git a/net-wireless/linux-wlan-ng/ChangeLog b/net-wireless/linux-wlan-ng/ChangeLog
index c1516ab7d52e..730d38710af4 100644
--- a/net-wireless/linux-wlan-ng/ChangeLog
+++ b/net-wireless/linux-wlan-ng/ChangeLog
@@ -1,6 +1,11 @@
 # 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.18 2003/03/24 23:45:39 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/ChangeLog,v 1.19 2003/04/03 21:55:48 latexer Exp $
+
+*linux-wlan-ng-0.2.0-r1 (03 Apr 2003)
+
+  03 Apr 2003; Peter Johanson <latexer@gentoo.org> linux-wlan-ng-0.2.0-r1.ebuild:
+  Version bump with fixed pcmcia-cs detection
 
   24 Mar 2003; Peter Johanson <latexer@gentoo.org> linux-wlan-ng-0.2.0.ebuild :
   Using has_version now to resolve the PCMCIA_VERSION issues. no more calling commands that portage
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
new file mode 100644
index 000000000000..76abc816f659
--- /dev/null
+++ b/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.2.0-r1
@@ -0,0 +1,4 @@
+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/linux-wlan-ng-0.2.0-r1.ebuild b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.0-r1.ebuild
new file mode 100644
index 000000000000..d704d50d929a
--- /dev/null
+++ b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.0-r1.ebuild
@@ -0,0 +1,201 @@
+# 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.1 2003/04/03 21:55:48 latexer Exp $
+
+
+IUSE="apm build nocardbus pcmcia pnp trusted usb"
+
+PCMCIA_CS=`best_version sys-apps/pcmcia-cs | sed -e "s:sys-apps/::"`
+PCMCIA_DIR="${WORKDIR}/${PCMCIA_CS}"
+
+DESCRIPTION="The linux-wlan Project"
+SRC_URI="ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/${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() {
+
+	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."
+}
+
+