summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Johanson <latexer@gentoo.org>2003-03-24 23:45:39 +0000
committerPeter Johanson <latexer@gentoo.org>2003-03-24 23:45:39 +0000
commit08f4ba9263ba085e882b2872c166b11dc1a68138 (patch)
treec06b8f13a9762edd8c2ff41b87a9a47387b6ad3e /net-wireless
parentun-merging module-init-tools migration until more testing (diff)
downloadgentoo-2-08f4ba9263ba085e882b2872c166b11dc1a68138.tar.gz
gentoo-2-08f4ba9263ba085e882b2872c166b11dc1a68138.tar.bz2
gentoo-2-08f4ba9263ba085e882b2872c166b11dc1a68138.zip
Now use has_version for PCMCIA_VERSION
Diffstat (limited to 'net-wireless')
-rw-r--r--net-wireless/linux-wlan-ng/ChangeLog6
-rw-r--r--net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.0.ebuild11
2 files changed, 14 insertions, 3 deletions
diff --git a/net-wireless/linux-wlan-ng/ChangeLog b/net-wireless/linux-wlan-ng/ChangeLog
index db3c861670f1..c1516ab7d52e 100644
--- a/net-wireless/linux-wlan-ng/ChangeLog
+++ b/net-wireless/linux-wlan-ng/ChangeLog
@@ -1,6 +1,10 @@
# 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.17 2003/03/08 22:59:45 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/ChangeLog,v 1.18 2003/03/24 23:45:39 latexer Exp $
+
+ 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
+ doesn't know about. This should fix it.
8 Mar 2003; Peter Johanson <latexer@gentoo.org> :
Added more extensive comment to postinst section.
diff --git a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.0.ebuild b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.0.ebuild
index 94a60aea3b3a..030ecc910dc5 100644
--- a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.0.ebuild
+++ b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.0.ebuild
@@ -1,10 +1,16 @@
# 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.ebuild,v 1.3 2003/03/08 22:59:45 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.0.ebuild,v 1.4 2003/03/24 23:45:39 latexer Exp $
+
IUSE="apm build nocardbus pcmcia pnp trusted usb"
-PCMCIA_VERSION="`/sbin/cardmgr -V 2>&1 | /usr/bin/cut -f3 -d' '`"
+if [ -n "'use pcmcia'" ]; then
+ has_version '=sys-apps/pcmcia-cs-3.2.1*' && PCMCIA_VERSION="3.2.1"
+ has_version '=sys-apps/pcmcia-cs-3.2.3*' && PCMCIA_VERSION="3.2.3"
+ has_version '=sys-apps/pcmcia-cs-3.2.4*' && PCMCIA_VERSION="3.2.4"
+fi
+
PCMCIA_CS="pcmcia-cs-${PCMCIA_VERSION}"
PCMCIA_DIR="${WORKDIR}/${PCMCIA_CS}"
@@ -35,6 +41,7 @@ fi
# unpack/configure it in WORKDIR. No need to compile it though.
src_unpack() {
+
unpack ${A}
cd ${S}