digest to include pcmcia-cs-3.2.4

5 files changed, 7 insertions, 91 deletions

diff --git a/net-wireless/hostap/ChangeLog b/net-wireless/hostap/ChangeLog
index 0d1d6550c529..af8f2c19a9db 100644
--- a/net-wireless/hostap/ChangeLog
+++ b/net-wireless/hostap/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-wireless/hostap
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap/ChangeLog,v 1.7 2003/03/03 01:39:09 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap/ChangeLog,v 1.8 2003/03/05 00:08:25 latexer Exp $
+
+  4 Mar 2003; Peter Johanson <latexer@gentoo.org> hostap-20021012-r1.ebuild :
+  Use full path to cardmgr and cut, should fix PCMCIA_VERSION once and for all
 
   2 Mar 2003; Peter Johanson <latexer@gentoo.org> hostap-20021012-r1.ebuild :
   fix to PCMCIA_VERSION. Combination of double quotes and use of "which" should
diff --git a/net-wireless/hostap/files/digest-hostap-20021012 b/net-wireless/hostap/files/digest-hostap-20021012
deleted file mode 100644
index e6721116c07a..000000000000
--- a/net-wireless/hostap/files/digest-hostap-20021012
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f5170147792a591120437dd33dbb106d hostap-2002-10-12.tar.gz 204390
-MD5 7e9f01a697d2e3e5164340d79474ea30 pcmcia-cs-3.2.1.tar.gz 1250413
-MD5 581749071efdfc8056ed05f0373d5b79 pcmcia-cs-3.2.3.tar.gz 1255022
diff --git a/net-wireless/hostap/files/digest-hostap-20021012-r1 b/net-wireless/hostap/files/digest-hostap-20021012-r1
index e6721116c07a..7b8d5a7cb0e0 100644
--- a/net-wireless/hostap/files/digest-hostap-20021012-r1
+++ b/net-wireless/hostap/files/digest-hostap-20021012-r1
@@ -1,3 +1,4 @@
 MD5 f5170147792a591120437dd33dbb106d hostap-2002-10-12.tar.gz 204390
 MD5 7e9f01a697d2e3e5164340d79474ea30 pcmcia-cs-3.2.1.tar.gz 1250413
 MD5 581749071efdfc8056ed05f0373d5b79 pcmcia-cs-3.2.3.tar.gz 1255022
+MD5 126e2d87e7a8a12e283db37ae82e9e4c pcmcia-cs-3.2.4.tar.gz 1262994
diff --git a/net-wireless/hostap/hostap-20021012-r1.ebuild b/net-wireless/hostap/hostap-20021012-r1.ebuild
index 398aa6746d30..289cba27ec7f 100644
--- a/net-wireless/hostap/hostap-20021012-r1.ebuild
+++ b/net-wireless/hostap/hostap-20021012-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap/hostap-20021012-r1.ebuild,v 1.7 2003/03/03 01:39:09 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap/hostap-20021012-r1.ebuild,v 1.8 2003/03/05 00:08:25 latexer Exp $
 
 inherit eutils
 
 DESCRIPTION="HostAP wireless drivers"
 HOMEPAGE="http://hostap.epitest.fi/"
 
-PCMCIA_VERSION="`$(which cardmgr) -V 2>&1 | $(which cut) -f3 -d' '`"
+PCMCIA_VERSION="`/sbin/cardmgr -V 2>&1 | /usr/bin/cut -f3 -d' '`"
 MY_PCMCIA="pcmcia-cs-${PCMCIA_VERSION}"
 SRC_URI="http://hostap.epitest.fi/releases/${PN}-2002-10-12.tar.gz
 		pcmcia? ( mirror://sourceforge/pcmcia-cs/${MY_PCMCIA}.tar.gz )"
diff --git a/net-wireless/hostap/hostap-20021012.ebuild b/net-wireless/hostap/hostap-20021012.ebuild
deleted file mode 100644
index c905d825e9da..000000000000
--- a/net-wireless/hostap/hostap-20021012.ebuild
+++ /dev/null
@@ -1,85 +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/hostap/hostap-20021012.ebuild,v 1.3 2003/02/25 19:17:52 latexer Exp $
-
-inherit eutils
-
-DESCRIPTION="HostAP wireless drivers"
-HOMEPAGE="http://hostap.epitest.fi/"
-
-PCMCIA_VERSION="`cardmgr -V 2>&1 | cut -f3 -d' '`"
-MY_PCMCIA="pcmcia-cs-${PCMCIA_VERSION}"
-SRC_URI="http://hostap.epitest.fi/releases/${PN}-2002-10-12.tar.gz
-		pcmcia? ( mirror://sourceforge/pcmcia-cs/${MY_PCMCIA}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-
-IUSE="pcmcia"
-
-DEPEND=">=net-wireless/wireless-tools-25
-		pcmcia? ( >=sys-apps/pcmcia-cs-3.2.1* )"
-
-S=${WORKDIR}/${PN}-2002-10-12
-LIB_PATH="/lib/modules/`uname -r`"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# This is a patch that has already been applied to the hostap
-	# cvs tree. It fixes hostapd compilation for gcc-3.2
-
-	epatch ${FILESDIR}/${P}-gentoo-patch.diff
-
-	cp Makefile ${T}
-	sed -e "s:^PCMCIA_PATH=:PCMCIA_PATH=${WORKDIR}/${MY_PCMCIA}:" \
-		-e "s:gcc:${CC}:" \
-		-e "s:-O2:${CFLAGS}:" \
-		-e "s:\$(EXTRA_CFLAGS):\$(EXTRA_CFLAGS) -DPRISM2_HOSTAPD:" \
-		${T}/Makefile > Makefile
-	
-	cd ${S}/hostapd
-	cp Makefile ${T}
-	sed -e "s:gcc:${CC}:" \
-		-e "s:-O2:${CFLAGS}:" \
-		${T}/Makefile > Makefile
-}
-
-src_compile() {
-	
-	HOSTAP_DRIVERS="pci plx"
-
-	use pcmcia && HOSTAP_DRIVERS="${HOSTAP_DRIVERS} pccard"
-
-	emake ${HOSTAP_DRIVERS} hostap crypt || die
-
-	cd ${S}/hostapd
-	emake || die
-}
-
-src_install() {
-	if [ -n "`use pcmcia`" ]; then
-		dodir ${LIB_PATH}/pcmcia
-		dodir /etc/pcmcia
-		cp ${S}/driver/modules/hostap_cs.o ${D}/${LIB_PATH}/pcmcia/
-		cp ${S}/driver/etc/hostap_cs.conf ${D}/etc/pcmcia/
-		if [ -r /etc/pcmcia/prism2.conf ]; then
-			einfo "You may need to remove /etc/pcmcia/prism2.conf"
-		fi
-	fi
-
-	dodir ${LIB_PATH}/net
-	cp ${S}/driver/modules/{hostap.o,hostap_crypt.o,hostap_crypt_wep.o}\
-		${D}${LIB_PATH}/net/
-	cp ${S}/driver/modules/{hostap_pci.o,hostap_plx.o}\
-		${D}${LIB_PATH}/net/
-
-	dodoc FAQ README README.prism2 ChangeLog
-
-	dosbin hostapd/hostapd
-}
-
-	
-