summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Johanson <latexer@gentoo.org>2003-04-07 00:28:13 +0000
committerPeter Johanson <latexer@gentoo.org>2003-04-07 00:28:13 +0000
commit5e6c1ffb7cfbcc58ac76b74ef2ce9cba93bbd67e (patch)
treeac14dfb04fb75c34e7744bbd03dbd2954d18d46d /net-wireless
parentFix for pcmcia-cs version choosing (diff)
downloadhistorical-5e6c1ffb7cfbcc58ac76b74ef2ce9cba93bbd67e.tar.gz
historical-5e6c1ffb7cfbcc58ac76b74ef2ce9cba93bbd67e.tar.bz2
historical-5e6c1ffb7cfbcc58ac76b74ef2ce9cba93bbd67e.zip
Fix for pcmcia-cs version choosing
Diffstat (limited to 'net-wireless')
-rw-r--r--net-wireless/hostap/files/digest-hostap-20021012-r12
-rw-r--r--net-wireless/hostap/hostap-20021012-r1.ebuild34
2 files changed, 25 insertions, 11 deletions
diff --git a/net-wireless/hostap/files/digest-hostap-20021012-r1 b/net-wireless/hostap/files/digest-hostap-20021012-r1
index 9438bcb9853f..fa3bf2671514 100644
--- a/net-wireless/hostap/files/digest-hostap-20021012-r1
+++ b/net-wireless/hostap/files/digest-hostap-20021012-r1
@@ -1,5 +1,5 @@
MD5 72d2af56025069ea611a9cc8456ef12e /files/hostap-20021012-gentoo-patch.diff 517
-MD5 2928dc698532e6f94d14d83a1f03db65 /hostap-20021012-r1.ebuild 4458
+MD5 e7ee504bf9ceaecb9ff4415ebd94827c /hostap-20021012-r1.ebuild 4459
MD5 f5170147792a591120437dd33dbb106d hostap-2002-10-12.tar.gz 204390
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/hostap/hostap-20021012-r1.ebuild b/net-wireless/hostap/hostap-20021012-r1.ebuild
index 25b80bf7c4c4..b6dfc1d9e665 100644
--- a/net-wireless/hostap/hostap-20021012-r1.ebuild
+++ b/net-wireless/hostap/hostap-20021012-r1.ebuild
@@ -1,21 +1,22 @@
# 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.9 2003/03/24 23:57:17 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap/hostap-20021012-r1.ebuild,v 1.10 2003/04/07 00:28:03 latexer Exp $
inherit eutils
DESCRIPTION="HostAP wireless drivers"
HOMEPAGE="http://hostap.epitest.fi/"
-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
+MY_PCMCIA="pcmcia-cs-3.2.1"
-MY_PCMCIA="pcmcia-cs-${PCMCIA_VERSION}"
+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
- pcmcia? ( mirror://sourceforge/pcmcia-cs/${MY_PCMCIA}.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} )
+ pcmcia? ( mirror://gentoo/${PATCH_3_2_4} )"
LICENSE="GPL-2"
SLOT="0"
@@ -37,12 +38,25 @@ else
fi
src_unpack() {
- unpack ${A}
- cd ${S}
+ unpack ${PN}-2002-10-12.tar.gz
+
+ if [ -n "`use pcmcia`" ]; then
+ unpack ${MY_PCMCIA}.tar.gz
+ cd ${WORKDIR}/${MY_PCMCIA}
+ 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
+
# 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}