Bump and remove old

4 files changed, 23 insertions, 27 deletions

diff --git a/net-wireless/hostap/ChangeLog b/net-wireless/hostap/ChangeLog
index b01c2e3887a8..3a2a8d9c3875 100644
--- a/net-wireless/hostap/ChangeLog
+++ b/net-wireless/hostap/ChangeLog
@@ -1,6 +1,11 @@
 # 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.11 2003/04/15 19:18:56 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap/ChangeLog,v 1.12 2003/05/13 15:39:16 latexer Exp $
+
+*hostap-0.0.2 (13 May 2003)
+
+  13 May 2003; Peter Johanson <latexer@gentoo.org> hostap-0.0.2.ebuild;
+  Bump
 
 *hostap-0.0.1 (16 Apr 2003)
 
diff --git a/net-wireless/hostap/Manifest b/net-wireless/hostap/Manifest
index ceb0db4ed5b4..4a6a0cc34da9 100644
--- a/net-wireless/hostap/Manifest
+++ b/net-wireless/hostap/Manifest
@@ -1,8 +1,6 @@
 MD5 1792c1d78c928fa0e303eb5c36860bf3 hostap-0.0.1.ebuild 4295
-MD5 7cd580b2e05ad8cb3910b8e7cdb9ace5 hostap-20021012-r1.ebuild 4470
-MD5 1792c1d78c928fa0e303eb5c36860bf3 hostap-0.0.2.ebuild 4295
-MD5 36cb3684ad7a3e3085a4f37de5f8b47e ChangeLog 2086
+MD5 9a707000b69439cec58c9bee73c84583 hostap-0.0.2.ebuild 4295
+MD5 ff47900f940247c41c3ca9f716b20136 ChangeLog 2195
 MD5 423cd360c12fa0a6530fb01f334a0bd6 files/digest-hostap-0.0.1 354
 MD5 6033278b29022d54d25048af3af5e4d8 files/digest-hostap-0.0.2 354
 MD5 72d2af56025069ea611a9cc8456ef12e files/hostap-20021012-gentoo-patch.diff 517
-MD5 6e519f92b3d38795a4280e3970daf89c files/digest-hostap-20021012-r1 510
diff --git a/net-wireless/hostap/files/digest-hostap-20021012-r1 b/net-wireless/hostap/files/digest-hostap-0.0.2
index fa3bf2671514..f5bbd5d57676 100644
--- a/net-wireless/hostap/files/digest-hostap-20021012-r1
+++ b/net-wireless/hostap/files/digest-hostap-0.0.2
@@ -1,6 +1,4 @@
-MD5 72d2af56025069ea611a9cc8456ef12e /files/hostap-20021012-gentoo-patch.diff 517
-MD5 e7ee504bf9ceaecb9ff4415ebd94827c /hostap-20021012-r1.ebuild 4459
-MD5 f5170147792a591120437dd33dbb106d hostap-2002-10-12.tar.gz 204390
+MD5 78b4043f36b11ae7d549e3111698ac7f hostap-0.0.2.tar.gz 263095
 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
diff --git a/net-wireless/hostap/hostap-20021012-r1.ebuild b/net-wireless/hostap/hostap-0.0.2.ebuild
index d93dba95bf61..dc2744632afc 100644
--- a/net-wireless/hostap/hostap-20021012-r1.ebuild
+++ b/net-wireless/hostap/hostap-0.0.2.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/hostap/hostap-20021012-r1.ebuild,v 1.11 2003/04/15 19:18:56 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap/hostap-0.0.2.ebuild,v 1.1 2003/05/13 15:39:16 latexer Exp $
 
 inherit eutils
 
@@ -8,11 +8,11 @@ DESCRIPTION="HostAP wireless drivers"
 HOMEPAGE="http://hostap.epitest.fi/"
 
 MY_PCMCIA="pcmcia-cs-3.2.1"
-
 PATCH_3_2_2="${MY_PCMCIA}-3.2.2.diff.gz"
 PATCH_3_2_3="${MY_PCMCIA}-3.2.3.diff.gz"
 PATCH_3_2_4="${MY_PCMCIA}-3.2.4.diff.gz"
-SRC_URI="http://hostap.epitest.fi/releases/${PN}-2002-10-12.tar.gz
+
+SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz
 		pcmcia? ( mirror://sourceforge/pcmcia-cs/${MY_PCMCIA}.tar.gz )
 		pcmcia? ( mirror://gentoo/${PATCH_3_2_2} )
 		pcmcia? ( mirror://gentoo/${PATCH_3_2_3} )
@@ -27,21 +27,19 @@ 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/${KV}"
 
-if [ -z "${HOSTAP_DRIVERS}" ]; then
+if [  x"${HOSTAP_DRIVERS}" = x ]; then
 	CUSTOM="no"
-	HOSTAP_DRIVERS="pci plx"
 else
 	CUSTOM="yes"
 fi
 
 src_unpack() {
-	unpack ${PN}-2002-10-12.tar.gz
+	check_KV
+	unpack ${P}.tar.gz
 
 	if [ -n "`use pcmcia`" ]; then
-		check_KV
 		unpack ${MY_PCMCIA}.tar.gz
 		cd ${WORKDIR}/${MY_PCMCIA}
 		if [ -z "`has_version =sys-apps/pcmcia-cs-3.2.4*`" ]; then
@@ -54,12 +52,7 @@ src_unpack() {
 	fi
 
 
-	# This is a patch that has already been applied to the hostap
-	# cvs tree. It fixes hostapd compilation for gcc-3.2
-
 	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo-patch.diff
-
 	mv Makefile ${T}
 	sed -e "s:gcc:${CC}:" \
 		-e "s:-O2:${CFLAGS}:" \
@@ -94,15 +87,17 @@ src_compile() {
 	# try disabling CONFIG_MODVERSION from your kernel.
 	#
 
-	if [ "${CUSTOM}" == no ]; then
+	if [ "${CUSTOM}" == yes ]; then
+		einfo "Building the folowing drivers: ${HOSTAP_DRIVERS}"
+		emake ${HOSTAP_DRIVERS} hostap crypt || die
+	else
 		if [ -n "`use pcmcia`" ]; then
-			emake ${HOSTAP_DRIVERS} pccard hostap crypt || die
+			einfo "Building the folowing drivers: pci plx pccard"
+			emake pci plx pccard || die
 		else
-			emake ${HOSTAP_DRIVERS} hostap crypt || die
+			einfo "Building the folowing drivers: pci plx"
+			emake ${HOSTAP_DRIVERS} || die
 		fi
-	else
-		einfo "Building the folowing drivers: ${HOSTAP_DRIVERS}"
-		emake ${HOSTAP_DRIVERS} hostap crypt || die
 	fi
 
 	cd ${S}/hostapd