Only care about pcmcia-cs if USE=pcmcia + minor clean-ups.

(Portage version: 2.0.51.22-r2)

6 files changed, 47 insertions, 53 deletions

diff --git a/net-wireless/hostap-driver/ChangeLog b/net-wireless/hostap-driver/ChangeLog
index 0be40c451583..e4395dac818a 100644
--- a/net-wireless/hostap-driver/ChangeLog
+++ b/net-wireless/hostap-driver/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/hostap-driver
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/ChangeLog,v 1.40 2005/07/13 10:11:13 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/ChangeLog,v 1.41 2005/08/13 16:06:58 brix Exp $
+
+  13 Aug 2005; Henrik Brix Andersen <brix@gentoo.org>
+  hostap-driver-0.3.7.ebuild, hostap-driver-0.3.9.ebuild,
+  hostap-driver-0.4.1.ebuild:
+  Only care about pcmcia-cs if USE=pcmcia + minor clean-ups.
 
   13 Jul 2005; <brix@gentoo.org>
   -files/hostap-driver-0.2.5.firmware.diff.bz2,
diff --git a/net-wireless/hostap-driver/Manifest b/net-wireless/hostap-driver/Manifest
index 0686940da646..bd50c837bf9f 100644
--- a/net-wireless/hostap-driver/Manifest
+++ b/net-wireless/hostap-driver/Manifest
@@ -1,10 +1,10 @@
-MD5 2a6fd182016005782748e6ac9b83443c hostap-driver-0.3.7.ebuild 2807
-MD5 ccd31df0034ec3fab6aa209699d7e43e hostap-driver-0.3.9.ebuild 2493
-MD5 a66a370c4b6499f92c9b427d5d0351ba hostap-driver-0.4.1.ebuild 2535
+MD5 3139380e95d9f3e97984f5dc1a38fae4 hostap-driver-0.3.7.ebuild 2716
+MD5 d56859709051aeab11e6449769dd7f04 hostap-driver-0.3.9.ebuild 2469
+MD5 6f1952a982683c41788fdd6e85346c1b hostap-driver-0.4.1.ebuild 2469
 MD5 a015c459286bccac6c255e3d67fbb3e3 ChangeLog 7670
 MD5 5f6ec5c50fa3a91a429fec8670cf241b metadata.xml 722
 MD5 8214baf7253070b31cf2d9f976229bec files/hostap-driver-0.3.9-firmware.patch 739
-MD5 176b7133187acc58466f505d727149ac files/digest-hostap-driver-0.3.7 441
+MD5 c28ccef49868cb855e9832c66e146318 files/digest-hostap-driver-0.3.7 71
 MD5 d56a1f3da96fc43c6a4a13838b71d3f6 files/digest-hostap-driver-0.3.9 71
 MD5 4ddbfa2123a5985cf0494985b1d7414f files/digest-hostap-driver-0.4.1 71
 MD5 b414820b5fa133ecc86165c83e3bff5b files/hostap-driver-0.4.1-firmware.patch 739
diff --git a/net-wireless/hostap-driver/files/digest-hostap-driver-0.3.7 b/net-wireless/hostap-driver/files/digest-hostap-driver-0.3.7
index 2353eac59d3b..041a1e90fd97 100644
--- a/net-wireless/hostap-driver/files/digest-hostap-driver-0.3.7
+++ b/net-wireless/hostap-driver/files/digest-hostap-driver-0.3.7
@@ -1,6 +1 @@
-MD5 44dbc0a8978fe618eee242b0bd25392c pcmcia-cs-3.2.5.tar.gz 1266494
-MD5 33325ed642b5277a9695d10bd19b3d7a pcmcia-cs-3.2.5-module-init-tools.diff.gz 460
-MD5 ee4f8227cc28f9a29a609f6e9561ef54 pcmcia-cs-3.2.5-SMP-fix.diff.gz 320
-MD5 2b2cba3fdd498b001ea3c27d8b2da31b pcmcia-cs-3.2.5-3.2.6.diff.gz 23034
-MD5 f2feda5eb46c1a2b99ae9db274879afc pcmcia-cs-3.2.5-3.2.7.diff.gz 28244
 MD5 9d56a65386fd8e688f039ef927ac2ccb hostap-driver-0.3.7.tar.gz 200649
diff --git a/net-wireless/hostap-driver/hostap-driver-0.3.7.ebuild b/net-wireless/hostap-driver/hostap-driver-0.3.7.ebuild
index f7845dadfbaf..07993cfce786 100644
--- a/net-wireless/hostap-driver/hostap-driver-0.3.7.ebuild
+++ b/net-wireless/hostap-driver/hostap-driver-0.3.7.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.3.7.ebuild,v 1.4 2005/07/24 12:43:29 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.3.7.ebuild,v 1.5 2005/08/13 16:06:58 brix Exp $
 
-inherit toolchain-funcs eutils pcmcia linux-mod
+inherit toolchain-funcs eutils linux-mod
 
 DESCRIPTION="Driver for Intersil Prism2/2.5/3 based IEEE 802.11b wireless LAN products"
 HOMEPAGE="http://hostap.epitest.fi"
@@ -43,28 +43,24 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${P}-firmware.patch
 
-	# set compiler
-	sed -i "s:gcc:$(tc-getCC):" ${S}/Makefile
+	sed -i \
+		-e "s:gcc:$(tc-getCC):" \
+		-e "s:tail -1:tail -n 1:" \
+		${S}/Makefile
 
-	# unpack the pcmcia-cs sources if needed
-	pcmcia_src_unpack
-
-	# fix for new coreutils (#31801)
-	sed -i "s:tail -1:tail -n 1:" ${S}/Makefile
+	if use pcmcia; then
+		# unpack the pcmcia-cs sources if needed
+		pcmcia_src_unpack
 
-	# set correct pcmcia path (PCMCIA_VERSION gets set from pcmcia_src_unpack)
-	if [ -n "${PCMCIA_VERSION}" ]; then
-		sed -i "s:^\(PCMCIA_PATH\)=:\1=${PCMCIA_SOURCE_DIR}:" ${S}/Makefile
+		# set correct pcmcia path (PCMCIA_VERSION gets set from pcmcia_src_unpack)
+		if [ -n "${PCMCIA_VERSION}" ]; then
+			sed -i "s:^\(PCMCIA_PATH\)=:\1=${PCMCIA_SOURCE_DIR}:" ${S}/Makefile
+		fi
 	fi
 
 	convert_to_m ${S}/Makefile
 }
 
-src_compile() {
-	pcmcia_configure
-	linux-mod_src_compile
-}
-
 src_install() {
 	if use pcmcia; then
 		insinto /etc/pcmcia
diff --git a/net-wireless/hostap-driver/hostap-driver-0.3.9.ebuild b/net-wireless/hostap-driver/hostap-driver-0.3.9.ebuild
index 47509c8772bc..2f857bd4ed00 100644
--- a/net-wireless/hostap-driver/hostap-driver-0.3.9.ebuild
+++ b/net-wireless/hostap-driver/hostap-driver-0.3.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.3.9.ebuild,v 1.1 2005/06/11 09:36:31 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.3.9.ebuild,v 1.2 2005/08/13 16:06:58 brix Exp $
 
 inherit toolchain-funcs eutils linux-mod
 
@@ -43,18 +43,19 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${P}-firmware.patch
 
-	# set compiler
-	sed -i "s:gcc:$(tc-getCC):" ${S}/Makefile
+	sed -i \
+		-e "s:gcc:$(tc-getCC):" \
+		-e "s:tail -1:tail -n 1:" \
+		${S}/Makefile
 
-	# unpack the pcmcia-cs sources if needed
-	pcmcia_src_unpack
-
-	# fix for new coreutils (#31801)
-	sed -i "s:tail -1:tail -n 1:" ${S}/Makefile
+	if use pcmcia; then
+		# unpack the pcmcia-cs sources if needed
+		pcmcia_src_unpack
 
-	# set correct pcmcia path (PCMCIA_VERSION gets set from pcmcia_src_unpack)
-	if [ -n "${PCMCIA_VERSION}" ]; then
-		sed -i "s:^\(PCMCIA_PATH\)=:\1=${PCMCIA_SOURCE_DIR}:" ${S}/Makefile
+		# set correct pcmcia path (PCMCIA_VERSION gets set from pcmcia_src_unpack)
+		if [ -n "${PCMCIA_VERSION}" ]; then
+			sed -i "s:^\(PCMCIA_PATH\)=:\1=${PCMCIA_SOURCE_DIR}:" ${S}/Makefile
+		fi
 	fi
 
 	convert_to_m ${S}/Makefile
diff --git a/net-wireless/hostap-driver/hostap-driver-0.4.1.ebuild b/net-wireless/hostap-driver/hostap-driver-0.4.1.ebuild
index e06194f4f61e..e8926a4faa43 100644
--- a/net-wireless/hostap-driver/hostap-driver-0.4.1.ebuild
+++ b/net-wireless/hostap-driver/hostap-driver-0.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.4.1.ebuild,v 1.2 2005/07/24 12:43:29 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.4.1.ebuild,v 1.3 2005/08/13 16:06:58 brix Exp $
 
 inherit toolchain-funcs eutils linux-mod
 
@@ -43,27 +43,24 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${P}-firmware.patch
 
-	# set compiler
-	sed -i "s:gcc:$(tc-getCC):" ${S}/Makefile
+	sed -i \
+		-e "s:gcc:$(tc-getCC):" \
+		-e "s:tail -1:tail -n 1:" \
+		${S}/Makefile
 
-	# unpack the pcmcia-cs sources if needed
-	pcmcia_src_unpack
-
-	# fix for new coreutils (#31801)
-	sed -i "s:tail -1:tail -n 1:" ${S}/Makefile
+	if use pcmcia; then
+		# unpack the pcmcia-cs sources if needed
+		pcmcia_src_unpack
 
-	# set correct pcmcia path (PCMCIA_VERSION gets set from pcmcia_src_unpack)
-	if [ -n "${PCMCIA_VERSION}" ]; then
-		sed -i "s:^\(PCMCIA_PATH\)=:\1=${PCMCIA_SOURCE_DIR}:" ${S}/Makefile
+		# set correct pcmcia path (PCMCIA_VERSION gets set from pcmcia_src_unpack)
+		if [ -n "${PCMCIA_VERSION}" ]; then
+			sed -i "s:^\(PCMCIA_PATH\)=:\1=${PCMCIA_SOURCE_DIR}:" ${S}/Makefile
+		fi
 	fi
 
 	convert_to_m ${S}/Makefile
 }
 
-src_compile() {
-	linux-mod_src_compile
-}
-
 src_install() {
 	if use pcmcia; then
 		insinto /etc/pcmcia