New versions of 0.2.0 and 0.2.1_pre17 that use the new pcmcia.eclass to make life easier

6 files changed, 206 insertions, 108 deletions

diff --git a/net-wireless/linux-wlan-ng/ChangeLog b/net-wireless/linux-wlan-ng/ChangeLog
index 2d8c389d2d24..d6ffe62b69cd 100644
--- a/net-wireless/linux-wlan-ng/ChangeLog
+++ b/net-wireless/linux-wlan-ng/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/linux-wlan-ng
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/ChangeLog,v 1.32 2004/02/04 00:14:28 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/ChangeLog,v 1.33 2004/02/08 00:22:34 latexer Exp $
+
+*linux-wlan-ng-0.2.1_pre17-r1 (07 Feb 2004)
+
+  07 Feb 2004; Peter Johanson <latexer@gentoo.org>
+  linux-wlan-ng-0.2.0-r3.ebuild, linux-wlan-ng-0.2.1_pre17-r1.ebuild:
+  Updates to both 0.2.0 and 0.2.1_pre series to use new pcmcia.eclass to make
+  life easier.
 
 *linux-wlan-ng-0.2.1_pre17 (03 Feb 2004)
 
diff --git a/net-wireless/linux-wlan-ng/Manifest b/net-wireless/linux-wlan-ng/Manifest
index a8a4066b8f1e..a784077265e2 100644
--- a/net-wireless/linux-wlan-ng/Manifest
+++ b/net-wireless/linux-wlan-ng/Manifest
@@ -1,16 +1,18 @@
 MD5 6e9afe051c9cab1a7af88bc328adbc1f linux-wlan-ng-0.2.0-r2.ebuild 6384
 MD5 ab5ee2a8be5f3ca74da56ba5b72c58f2 linux-wlan-ng-0.2.1_pre16.ebuild 6878
 MD5 1b50a6c92eefec354e814d0c0b930dd8 linux-wlan-ng-0.2.1_pre11.ebuild 6519
+MD5 8bf74fc480cc45fe8c456dd0c54b73d0 linux-wlan-ng-0.2.1_pre17-r1.ebuild 4293
 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 7b9f97b0f4e1a8e964f75cdebe9aae52 linux-wlan-ng-0.2.0-r3.ebuild 4791
 MD5 105bb42e47bc7c1f2cbc62ca7a20c737 linux-wlan-ng-0.2.1_pre17.ebuild 6853
-MD5 3a28e8a5f736cee4bb44808b47d60325 ChangeLog 6433
+MD5 2f1c5566e0c98c2ab5b0caa3f2de1ff7 ChangeLog 6693
 MD5 32831d719499c83f7942f6432ef58278 metadata.xml 252
 MD5 4ba4f50725309cebf376a17edd220b89 files/digest-linux-wlan-ng-0.2.1_pre8 436
 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 6dd9338796686cbdd00a8fb47462c42e files/digest-linux-wlan-ng-0.2.1_pre17 444
+MD5 193d2642942fbefda8f9b4f38992289d files/digest-linux-wlan-ng-0.2.1_pre17-r1 517
 MD5 f57572b64b73079ae2e9bab008d602bc files/digest-linux-wlan-ng-0.2.0-r1 434
 MD5 38926f085b2f76693be9b930c7d216ba files/digest-linux-wlan-ng-0.2.0-r2 504
-MD5 b3ea48b026dcb1b401367881cf219137 files/digest-linux-wlan-ng-0.2.0-r3 438
+MD5 296af9529b8492a5a12f1ba06d2a71de files/digest-linux-wlan-ng-0.2.0-r3 511
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
index b3551928b644..ec2521b6f920 100644
--- 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
@@ -1,6 +1,7 @@
-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 ee4f8227cc28f9a29a609f6e9561ef54 pcmcia-cs-3.2.5-SMP-fix.diff.gz 320
 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
+MD5 42b6d21a29cb5f75f8b1e8a3ad69b19a linux-wlan-ng-0.2.0.tar.gz 329432
+MD5 686631f6942aa47fc0503203c26bfe16 linux-wlan-ng-gentoo-init.gz 859
diff --git a/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.2.1_pre17-r1 b/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.2.1_pre17-r1
new file mode 100644
index 000000000000..6ae657211c79
--- /dev/null
+++ b/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.2.1_pre17-r1
@@ -0,0 +1,7 @@
+MD5 44dbc0a8978fe618eee242b0bd25392c pcmcia-cs-3.2.5.tar.gz 1266494
+MD5 33325ed642b5277a9695d10bd19b3d7a pcmcia-cs-3.2.5-module-init-tools.diff.gz 460
+MD5 ee4f8227cc28f9a29a609f6e9561ef54 pcmcia-cs-3.2.5-SMP-fix.diff.gz 320
+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
+MD5 d759cd71db0789d1bf4f412b8db8788d linux-wlan-ng-0.2.1-pre17.tar.gz 354207
+MD5 686631f6942aa47fc0503203c26bfe16 linux-wlan-ng-gentoo-init.gz 859
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
index 746c047937de..45c5cdf8b1a4 100644
--- 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
@@ -1,30 +1,22 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.0-r3.ebuild,v 1.2 2004/02/08 00:22:34 latexer Exp $
 
-inherit eutils
+inherit pcmcia
 
-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}"
+IUSE="${IUSE} build usb"
 
 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} )"
+SRC_URI="${SRC_URI}
+		ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/${P}.tar.gz
+		mirror://gentoo/${PN}-gentoo-init.gz"
 
 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 )"
+		>=sys-apps/sed-4.0*"
+
 SLOT="0"
 LICENSE="MPL-1.1"
 KEYWORDS="~x86"
@@ -36,32 +28,25 @@ KEYWORDS="~x86"
 # unpack/configure it in WORKDIR.  No need to compile it though.
 
 src_unpack() {
+	check_KV
+
+	okvminor="${KV#*.}" ; okvminor="${okvminor%%.*}"
+	if [ "${okvminor}" -gt 4 ]; then
+		eerror "This version of linux-wlan-ng will NOT work with 2.6 kernels"
+		eerror "Please use linux-wlan-ng-0.2.1_pre17 for 2.6 kernels."
+		eerror "For now, you will need to disable sandbox to get this to merge."
+		eerror "See bug #32737 for info on work being done to fix this."
+		die "This version of linux-wlan-ng does not support 2.6 kernels"
+	fi
 
 	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
+	# Use pcmcia.eclass to figure out what to do about pcmcia
+	pcmcia_src_unpack
 
+	# install a gentoo style init script
+	cp ${WORKDIR}/${PN}-gentoo-init ${S}/etc/rc.wlan
 
 	# Lots of sedding to do to get the man pages and a few other
 	# things to end up in the right place.
@@ -89,69 +74,9 @@ src_unpack() {
 }
 
 src_compile() {
+	# Configure the pcmcia-cs sources if we actually are going to use them
+	pcmcia_configure
 
-	#
-	# 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}
 
@@ -163,10 +88,10 @@ src_compile() {
 	#mv default.config config.in
 
 	if [ -n "`use pcmcia`" ]; then
-		if [ "${kernelpcmcia}" = "no" ]
+		if [ -n "${PCMCIA_SOURCE_DIR}" ]
 		then
-			export PCMCIA_CS=${PCMCIA_CS}
-			sed -i -e 's:PCMCIA_SRC=:PCMCIA_SRC=${WORKDIR}/${PCMCIA_CS}:' \
+			export PCMCIA_SOURCE_DIR=${PCMCIA_SOURCE_DIR}
+			sed -i -e 's:PCMCIA_SRC=:PCMCIA_SRC=${PCMCIA_SOURCE_DIR}:' \
 				config.in
 		fi
 		sed -i -e 's:PRISM2_PLX=n:PRISM2_PLX=y:' \
diff --git a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre17-r1.ebuild b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre17-r1.ebuild
new file mode 100644
index 000000000000..6c4872300e95
--- /dev/null
+++ b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre17-r1.ebuild
@@ -0,0 +1,156 @@
+# 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_pre17-r1.ebuild,v 1.1 2004/02/08 00:22:34 latexer Exp $
+
+inherit pcmcia
+
+IUSE="${IUSE} usb build"
+
+MY_P=${PN}-${PV/_/-}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="The linux-wlan Project"
+SRC_URI="${SRC_URI}
+		ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/${MY_P}.tar.gz
+		mirror://gentoo/${PN}-gentoo-init.gz"
+
+HOMEPAGE="http://linux-wlan.org"
+DEPEND="sys-kernel/linux-headers
+		dev-libs/openssl
+		>=sys-apps/sed-4.0*"
+
+SLOT="0"
+LICENSE="MPL-1.1"
+KEYWORDS="~x86"
+
+src_unpack() {
+	check_KV
+
+	unpack ${MY_P}.tar.gz
+	unpack ${PN}-gentoo-init.gz
+
+	# Use pcmcia.eclass to setup pcmcia-cs sources as needed
+	pcmcia_src_unpack
+
+	cp ${WORKDIR}/${PN}-gentoo-init ${S}/etc/rc.wlan
+
+	# Lots of sedding to do to get the man pages and a few other
+	# things to end up in the right place.
+
+	cd ${S}
+	sed -i -e "s:mkdir:#mkdir:" \
+		-e "s:cp nwepgen.man:#cp nwepgen.man:" \
+		-e "s:\t\$(TARGET_:\t#\$(TARGET_:" \
+		man/Makefile
+
+	sed -i -e "s:/etc/wlan:/etc/conf.d:g" \
+		etc/wlan/Makefile
+
+	sed -i -e "s:/sbin/nwepgen:/sbin/keygen:" \
+		etc/wlan/wlancfg-DEFAULT
+
+	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 the pcmcia-cs tree if it exists
+	pcmcia_configure
+
+	# now lets build wlan-ng
+	cd ${S}
+
+	sed -i -e 's:TARGET_ROOT_ON_HOST=:TARGET_ROOT_ON_HOST=${D}:' \
+		-e 's:PRISM2_PCI=n:PRISM2_PCI=y:' \
+		config.in
+
+	if [ -n "`use pcmcia`" ]; then
+		if [ -n "${PCMCIA_SOURCE_DIR}" ];
+		then
+			export PCMCIA_SOURCE_DIR=${PCMCIA_SOURCE_DIR}
+			sed -i -e 's:PCMCIA_SRC=:PCMCIA_SRC=${PCMCIA_SOURCE_DIR}:' \
+				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
+
+	if [ -n "`use usb`" ]; then
+		sed -i -e 's:PRISM2_USB=n:PRISM2_USB=y:' \
+			config.in
+	fi
+
+	cp config.in default.config
+
+	emake default_config || die "failed configuring WLAN"
+	# 2.6 needs ARCH unset since it uses it
+	unset ARCH
+	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 "/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 "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."
+
+	ewarn "Previous versions of linux-wlan-ng recommended creating symlinks in"
+	ewarn "/usr/src/linux for 2.6 kernel merges. This is NOT needed and will"
+	ewarn "merely clutter things. This has been fixed in the ebuild where it"
+	ewarn "should be handled."
+	ewarn "Users emerging this with a 2.6 kernel still need to disable"
+	ewarn "sandbox and userpriv from FEATURES."
+}
+
+