Move pcmcia functions from the eclass, bug 140116

Package-Manager: portage-2.1.1_pre3-r1

5 files changed, 85 insertions, 21 deletions

diff --git a/net-wireless/hostap-driver/ChangeLog b/net-wireless/hostap-driver/ChangeLog
index 78db5e9dc74d..dd090db6684c 100644
--- a/net-wireless/hostap-driver/ChangeLog
+++ b/net-wireless/hostap-driver/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/hostap-driver
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/ChangeLog,v 1.55 2006/06/26 22:09:46 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/ChangeLog,v 1.56 2006/07/18 12:30:57 genstef Exp $
+
+  18 Jul 2006; Stefan Schweizer <genstef@gentoo.org>
+  hostap-driver-0.4.7.ebuild, hostap-driver-0.4.9.ebuild:
+  Move pcmcia functions from the eclass, bug 140116
 
   26 Jun 2006; Henrik Brix Andersen <brix@gentoo.org>
   hostap-driver-0.4.9.ebuild:
diff --git a/net-wireless/hostap-driver/Manifest b/net-wireless/hostap-driver/Manifest
index b578d675c4a9..202e91a5e06c 100644
--- a/net-wireless/hostap-driver/Manifest
+++ b/net-wireless/hostap-driver/Manifest
@@ -7,19 +7,19 @@ MD5 3b2078eb6aa3c5754d282f6537ecd771 files/hostap-driver-0.4.9-firmware.patch 73
 RMD160 0bc9c949723fb7b1c16c954f284f3cf7ce049af9 files/hostap-driver-0.4.9-firmware.patch 739
 SHA256 a3a2a5323ca4ff802ab8d93dfe65130e1d542a3ded30f3fd0bab32650fbdd28a files/hostap-driver-0.4.9-firmware.patch 739
 DIST hostap-driver-0.4.7.tar.gz 202602
-DIST hostap-driver-0.4.9.tar.gz 202959
-EBUILD hostap-driver-0.4.7.ebuild 3186 RMD160 b1eed2a461a54fa98c5aa40967e1bb17f84cf6a5 SHA1 fd14faab12b498e4c4b43fc77fe5dce77398fe57 SHA256 7327a64eb5b9dbea52af4d08c37af86c22b144c0b0ad998a560a24728c360b7b
-MD5 934bdf885e6f3a37723bf711c61cdb7a hostap-driver-0.4.7.ebuild 3186
-RMD160 b1eed2a461a54fa98c5aa40967e1bb17f84cf6a5 hostap-driver-0.4.7.ebuild 3186
-SHA256 7327a64eb5b9dbea52af4d08c37af86c22b144c0b0ad998a560a24728c360b7b hostap-driver-0.4.7.ebuild 3186
-EBUILD hostap-driver-0.4.9.ebuild 2993 RMD160 485d9d67d1afa01add2d961e6b0198ee75734567 SHA1 e250c1d9709654031a33a9272322f92b82b8ebea SHA256 cc35bdc8e9d2ef24d35ab91cf4999f361d779a87397361545075ac2ab2284ce6
-MD5 007076a699f2b74eafa8259bcfe47b4e hostap-driver-0.4.9.ebuild 2993
-RMD160 485d9d67d1afa01add2d961e6b0198ee75734567 hostap-driver-0.4.9.ebuild 2993
-SHA256 cc35bdc8e9d2ef24d35ab91cf4999f361d779a87397361545075ac2ab2284ce6 hostap-driver-0.4.9.ebuild 2993
-MISC ChangeLog 10158 RMD160 7f0bd58bba844992526b966dca6af198a4c46a1c SHA1 373cb33d57d75a49c288f26b8db6509ab0392c77 SHA256 5a3418433c392d0ef7a81c96a67924ab962fd2ecac151bee43234a9317e8e8d7
-MD5 627593e4dde203b4545d8e1991a5456c ChangeLog 10158
-RMD160 7f0bd58bba844992526b966dca6af198a4c46a1c ChangeLog 10158
-SHA256 5a3418433c392d0ef7a81c96a67924ab962fd2ecac151bee43234a9317e8e8d7 ChangeLog 10158
+DIST hostap-driver-0.4.9.tar.gz 202959 RMD160 5fd9801f69f5da8ca0f5beb9d2a5155cfcf7bdaf SHA1 7985621b2cf979a5681afb9191dfde0dba5e7cb8 SHA256 4c419410f080ab01eb7edf7feed6b9971599e4ca02fe3f40fd87e6f9d7bf9783
+EBUILD hostap-driver-0.4.7.ebuild 4152 RMD160 d790709c4ffc753516afecf9854c8b49d7f619c8 SHA1 a07a6fae6df3f39eb70c28f08d8def75844a5ebe SHA256 74a2c873227421e0457a7bea3e52784888f1eee35824226671df8d21f0c8b407
+MD5 29a1a54b0fd0045787552f6bc8361615 hostap-driver-0.4.7.ebuild 4152
+RMD160 d790709c4ffc753516afecf9854c8b49d7f619c8 hostap-driver-0.4.7.ebuild 4152
+SHA256 74a2c873227421e0457a7bea3e52784888f1eee35824226671df8d21f0c8b407 hostap-driver-0.4.7.ebuild 4152
+EBUILD hostap-driver-0.4.9.ebuild 3959 RMD160 5e898ab018115834ba53027cd409707f20287680 SHA1 2f28696e89d0072db11eddd9dece0eb7a8590f3e SHA256 18d297cb15b4ad9f7fc96b5852c5a5bb1136af03d65c491213bdb4a002a4da56
+MD5 4acbdd03e4b5ae9ffbe4a43feb91092f hostap-driver-0.4.9.ebuild 3959
+RMD160 5e898ab018115834ba53027cd409707f20287680 hostap-driver-0.4.9.ebuild 3959
+SHA256 18d297cb15b4ad9f7fc96b5852c5a5bb1136af03d65c491213bdb4a002a4da56 hostap-driver-0.4.9.ebuild 3959
+MISC ChangeLog 10325 RMD160 23bad7f4625016feab362fb881910d8fec947001 SHA1 d41eb69b969b36f87c77d05dafc19299909cc1e3 SHA256 3ab65e86d8dee68300a7f30b3e17ecc2a46f4bc05936db67d135c00690cc6460
+MD5 cc37a3cb915c7984381a38476b2b9378 ChangeLog 10325
+RMD160 23bad7f4625016feab362fb881910d8fec947001 ChangeLog 10325
+SHA256 3ab65e86d8dee68300a7f30b3e17ecc2a46f4bc05936db67d135c00690cc6460 ChangeLog 10325
 MISC metadata.xml 722 RMD160 7f6836aecf7103706d56513ee7592668c38555d0 SHA1 ff280214649d738f30bb99941107f1bf2980638b SHA256 609e6addfb708308c251d776a6f556c8d5c5a2da6ff855bb2e3cbcfb201a59d5
 MD5 5f6ec5c50fa3a91a429fec8670cf241b metadata.xml 722
 RMD160 7f6836aecf7103706d56513ee7592668c38555d0 metadata.xml 722
@@ -27,6 +27,6 @@ SHA256 609e6addfb708308c251d776a6f556c8d5c5a2da6ff855bb2e3cbcfb201a59d5 metadata
 MD5 c5800b90593d3826c5cef81cca46526a files/digest-hostap-driver-0.4.7 71
 RMD160 5b43b90577802dd343b08856d63fe44bb318fcff files/digest-hostap-driver-0.4.7 71
 SHA256 f90cd0a85e210c7bd92636fa6411d6c57a7541970c2b74c97c033b722d21c239 files/digest-hostap-driver-0.4.7 71
-MD5 b7a0ab3af34f51bdaa93f5a8d9b2ec66 files/digest-hostap-driver-0.4.9 71
-RMD160 d67f40c8cb44f4ccaa6b32473916f4e856b8decd files/digest-hostap-driver-0.4.9 71
-SHA256 0a5b145106654dd8a76f08ba8faec0f59698b2f955d9aaf9f400cf7563f3834a files/digest-hostap-driver-0.4.9 71
+MD5 940424fe698bedc40a78cab57fb4d08e files/digest-hostap-driver-0.4.9 259
+RMD160 ac8cc5d4530ae8d70aa689d68d27d093d1686a13 files/digest-hostap-driver-0.4.9 259
+SHA256 2890e88d1f528172ce85003078f7cdcd96c84883643bda49ea6cd721ae62b908 files/digest-hostap-driver-0.4.9 259
diff --git a/net-wireless/hostap-driver/files/digest-hostap-driver-0.4.9 b/net-wireless/hostap-driver/files/digest-hostap-driver-0.4.9
index 397918c176be..385ec8984906 100644
--- a/net-wireless/hostap-driver/files/digest-hostap-driver-0.4.9
+++ b/net-wireless/hostap-driver/files/digest-hostap-driver-0.4.9
@@ -1 +1,3 @@
 MD5 c7534dc040ab90218257a78488ecd378 hostap-driver-0.4.9.tar.gz 202959
+RMD160 5fd9801f69f5da8ca0f5beb9d2a5155cfcf7bdaf hostap-driver-0.4.9.tar.gz 202959
+SHA256 4c419410f080ab01eb7edf7feed6b9971599e4ca02fe3f40fd87e6f9d7bf9783 hostap-driver-0.4.9.tar.gz 202959
diff --git a/net-wireless/hostap-driver/hostap-driver-0.4.7.ebuild b/net-wireless/hostap-driver/hostap-driver-0.4.7.ebuild
index 5cbc7f59dc70..fc9084548fe6 100644
--- a/net-wireless/hostap-driver/hostap-driver-0.4.7.ebuild
+++ b/net-wireless/hostap-driver/hostap-driver-0.4.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.7.ebuild,v 1.4 2006/03/26 16:06:24 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.4.7.ebuild,v 1.5 2006/07/18 12:30:57 genstef Exp $
 
 inherit toolchain-funcs eutils linux-mod
 
@@ -13,7 +13,8 @@ KEYWORDS="~amd64 ppc x86"
 IUSE="pcmcia"
 SLOT="0"
 
-RDEPEND=">=net-wireless/wireless-tools-25"
+RDEPEND=">=net-wireless/wireless-tools-25
+	pcmcia? ( virtual/pcmcia )"
 
 BUILD_TARGETS="all"
 MODULESD_HOSTAP_DOCS="README"
@@ -25,6 +26,34 @@ CONFIG_CHECK="!HOSTAP NET_RADIO"
 ERROR_HOSTAP="${P} requires the in-kernel version of the hostap driver to be disabled (CONFIG_HOSTAP)"
 ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
 
+pcmcia_src_unpack() {
+	local pcmcia_tbz="${ROOT}/usr/src/pcmcia-cs/pcmcia-cs-build-env.tbz2"
+	local PCMCIA_SOURCE_DIR="${WORKDIR}/pcmcia-cs/"
+
+	# if the kernel has pcmcia support built in, then we just ignore all this.
+	if linux_chkconfig_present PCMCIA; then
+		einfo "Kernel based PCMCIA support has been detected."
+	else
+		if kernel_is 2 6; then
+			einfo "We have detected that you are running a 2.6 kernel"
+			einfo "but you are not using the built-in PCMCIA support."
+			einfo "We will assume you know what you are doing, but please"
+			einfo "consider using the built in PCMCIA support instead."
+			epause 10
+		fi
+
+		ebegin "Decompressing pcmcia-cs sources"
+		mkdir -p ${PCMCIA_SOURCE_DIR}
+		tar -xjf ${pcmcia_tbz} -C ${PCMCIA_SOURCE_DIR}
+		eend $?
+
+		if [[ -f ${PCMCIA_SOURCE_DIR}/pcmcia-cs-version ]]; then
+			PCMCIA_VERSION=$(cat ${PCMCIA_SOURCE_DIR}/pcmcia-cs-version)
+			einfo "Found pcmcia-cs-${PCMCIA_VERSION}"
+		fi
+	fi
+}
+
 pkg_setup() {
 	linux-mod_pkg_setup
 
diff --git a/net-wireless/hostap-driver/hostap-driver-0.4.9.ebuild b/net-wireless/hostap-driver/hostap-driver-0.4.9.ebuild
index 5cffe5719cef..11a51f079a60 100644
--- a/net-wireless/hostap-driver/hostap-driver-0.4.9.ebuild
+++ b/net-wireless/hostap-driver/hostap-driver-0.4.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.9.ebuild,v 1.2 2006/06/26 22:09:46 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.4.9.ebuild,v 1.3 2006/07/18 12:30:57 genstef Exp $
 
 inherit toolchain-funcs eutils linux-mod
 
@@ -13,7 +13,8 @@ KEYWORDS="~amd64 ~ppc x86"
 IUSE="pcmcia"
 SLOT="0"
 
-RDEPEND=">=net-wireless/wireless-tools-25"
+RDEPEND=">=net-wireless/wireless-tools-25
+	pcmcia? ( virtual/pcmcia )"
 
 BUILD_TARGETS="all"
 MODULESD_HOSTAP_DOCS="README"
@@ -25,6 +26,34 @@ CONFIG_CHECK="!HOSTAP NET_RADIO"
 ERROR_HOSTAP="${P} requires the in-kernel version of the hostap driver to be disabled (CONFIG_HOSTAP)"
 ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
 
+pcmcia_src_unpack() {
+	local pcmcia_tbz="${ROOT}/usr/src/pcmcia-cs/pcmcia-cs-build-env.tbz2"
+	local PCMCIA_SOURCE_DIR="${WORKDIR}/pcmcia-cs/"
+
+	# if the kernel has pcmcia support built in, then we just ignore all this.
+	if linux_chkconfig_present PCMCIA; then
+		einfo "Kernel based PCMCIA support has been detected."
+	else
+		if kernel_is 2 6; then
+			einfo "We have detected that you are running a 2.6 kernel"
+			einfo "but you are not using the built-in PCMCIA support."
+			einfo "We will assume you know what you are doing, but please"
+			einfo "consider using the built in PCMCIA support instead."
+			epause 10
+		fi
+
+		ebegin "Decompressing pcmcia-cs sources"
+		mkdir -p ${PCMCIA_SOURCE_DIR}
+		tar -xjf ${pcmcia_tbz} -C ${PCMCIA_SOURCE_DIR}
+		eend $?
+
+		if [[ -f ${PCMCIA_SOURCE_DIR}/pcmcia-cs-version ]]; then
+			PCMCIA_VERSION=$(cat ${PCMCIA_SOURCE_DIR}/pcmcia-cs-version)
+			einfo "Found pcmcia-cs-${PCMCIA_VERSION}"
+		fi
+	fi
+}
+
 pkg_setup() {
 	linux-mod_pkg_setup