More elegant pcmcia-cs handling

3 files changed, 31 insertions, 7 deletions

diff --git a/net-wireless/linux-wlan-ng/ChangeLog b/net-wireless/linux-wlan-ng/ChangeLog
index 730d38710af4..21cff4edc4cf 100644
--- a/net-wireless/linux-wlan-ng/ChangeLog
+++ b/net-wireless/linux-wlan-ng/ChangeLog
@@ -1,9 +1,13 @@
 # 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.19 2003/04/03 21:55:48 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/ChangeLog,v 1.20 2003/04/07 00:08:32 latexer Exp $
 
 *linux-wlan-ng-0.2.0-r1 (03 Apr 2003)
 
+  07 Apr 2003; Peter Johanson <latexer@gentoo.org>
+  linux-wlan-ng-0.2.0-r1.ebuild:
+  Major fix to how the pcmcia-cs version is handled. Much better now.
+
   03 Apr 2003; Peter Johanson <latexer@gentoo.org> linux-wlan-ng-0.2.0-r1.ebuild:
   Version bump with fixed pcmcia-cs detection
 
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 d6c80e68c327..9e9219e547a4 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 557fca4b211cf04429a2a1fe34253e50 /linux-wlan-ng-0.2.0-r1.ebuild 6240
+MD5 137acf16b9329e092828ba47c1fca291 /linux-wlan-ng-0.2.0-r1.ebuild 6240
 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/linux-wlan-ng-0.2.0-r1.ebuild b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.0-r1.ebuild
index d704d50d929a..ea1713afd9db 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,16 +1,24 @@
 # 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 $
+# $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 $
 
 
+inherit eutils
+
 IUSE="apm build nocardbus pcmcia pnp trusted usb"
 
-PCMCIA_CS=`best_version sys-apps/pcmcia-cs | sed -e "s:sys-apps/::"`
+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}"
 
 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 )"
+		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
@@ -36,12 +44,24 @@ fi
 
 src_unpack() {
 
-	unpack ${A}
-	cd ${S}
+	unpack ${P}.tar.gz
+	if [ -n "`use pcmcia`" ]; then
+		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:" \