Refuse to compile if the in-kernel version of the hostap-driver is enabled.

Package-Manager: portage-2.0.51.22-r3

5 files changed, 22 insertions, 14 deletions

diff --git a/net-wireless/hostap-driver/ChangeLog b/net-wireless/hostap-driver/ChangeLog
index 75f30b8cfdee..2bc73f2159d1 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.47 2005/10/22 10:45:39 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/ChangeLog,v 1.48 2005/10/29 12:53:55 brix Exp $
+
+  29 Oct 2005; Henrik Brix Andersen <brix@gentoo.org>
+  hostap-driver-0.3.7.ebuild, hostap-driver-0.3.9.ebuild,
+  hostap-driver-0.4.5.ebuild:
+  Refuse to compile if the in-kernel version of the hostap-driver is enabled.
 
   22 Oct 2005; Henrik Brix Andersen <brix@gentoo.org>
   -files/hostap-driver-0.4.1-firmware.patch,
diff --git a/net-wireless/hostap-driver/Manifest b/net-wireless/hostap-driver/Manifest
index 00e67b2b6b4f..0d09bc55a1e9 100644
--- a/net-wireless/hostap-driver/Manifest
+++ b/net-wireless/hostap-driver/Manifest
@@ -1,7 +1,7 @@
-MD5 47085a6a44c13e4ca6a2599fe6585cb5 hostap-driver-0.3.7.ebuild 2716
-MD5 b3f2b5cf25af4efe2547fe64ec311d0b hostap-driver-0.4.5.ebuild 2586
-MD5 f493ca27e9bc7ac772ba021782faaee9 hostap-driver-0.3.9.ebuild 2468
-MD5 59cc444300a2790d3db29c375dec1c9b ChangeLog 8704
+MD5 9266805cc29763534c288adeffa52552 hostap-driver-0.3.7.ebuild 2827
+MD5 e7c4fa99cedd513a9e78eeff7ef9bbaa hostap-driver-0.4.5.ebuild 2697
+MD5 fa0cd400901b4e1e598f9ff47ebd2f02 hostap-driver-0.3.9.ebuild 2579
+MD5 1a4422da2140c76a680116784e807069 ChangeLog 8925
 MD5 5f6ec5c50fa3a91a429fec8670cf241b metadata.xml 722
 MD5 8214baf7253070b31cf2d9f976229bec files/hostap-driver-0.3.9-firmware.patch 739
 MD5 c28ccef49868cb855e9832c66e146318 files/digest-hostap-driver-0.3.7 71
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 07993cfce786..525ea005ee26 100644
--- a/net-wireless/hostap-driver/hostap-driver-0.3.7.ebuild
+++ b/net-wireless/hostap-driver/hostap-driver-0.3.7.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.7.ebuild,v 1.5 2005/08/13 16:06:58 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.3.7.ebuild,v 1.6 2005/10/29 12:53:55 brix Exp $
 
 inherit toolchain-funcs eutils linux-mod
 
@@ -19,8 +19,9 @@ BUILD_PARAMS="KERNEL_PATH=${KV_DIR}"
 BUILD_TARGETS="all"
 MODULESD_HOSTAP_DOCS="README"
 
-CONFIG_CHECK="NET_RADIO"
-NET_RADIO_ERROR="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
+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)."
 
 pkg_setup() {
 	MODULE_NAMES="hostap(net::${S}/driver/modules)
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 c263c8a9c05e..4ced805f8047 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.3 2005/08/16 12:34:58 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.3.9.ebuild,v 1.4 2005/10/29 12:53:55 brix Exp $
 
 inherit toolchain-funcs eutils linux-mod
 
@@ -19,8 +19,9 @@ BUILD_PARAMS="KERNEL_PATH=${KV_DIR}"
 BUILD_TARGETS="all"
 MODULESD_HOSTAP_DOCS="README"
 
-CONFIG_CHECK="NET_RADIO"
-NET_RADIO_ERROR="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
+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)."
 
 pkg_setup() {
 	MODULE_NAMES="hostap(net::${S}/driver/modules)
diff --git a/net-wireless/hostap-driver/hostap-driver-0.4.5.ebuild b/net-wireless/hostap-driver/hostap-driver-0.4.5.ebuild
index bc06eeb207e4..79a4d50a5669 100644
--- a/net-wireless/hostap-driver/hostap-driver-0.4.5.ebuild
+++ b/net-wireless/hostap-driver/hostap-driver-0.4.5.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.5.ebuild,v 1.1 2005/10/17 10:14:45 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.4.5.ebuild,v 1.2 2005/10/29 12:53:55 brix Exp $
 
 inherit toolchain-funcs eutils linux-mod
 
@@ -21,8 +21,9 @@ MODULESD_HOSTAP_CRYPT_WEP_ENABLED="no"
 MODULESD_HOSTAP_CRYPT_TKIP_ENABLED="no"
 MODULESD_HOSTAP_CRYPT_CCMP_ENABLED="no"
 
-CONFIG_CHECK="NET_RADIO"
-NET_RADIO_ERROR="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
+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)."
 
 pkg_setup() {
 	linux-mod_pkg_setup