Backported work-around for linux-2.6.14+ to older ebuilds, bug #112499.

Package-Manager: portage-2.0.51.22-r3

10 files changed, 132 insertions, 62 deletions

diff --git a/net-wireless/ieee80211/ChangeLog b/net-wireless/ieee80211/ChangeLog
index 7c2157333df4..5849a82b2e58 100644
--- a/net-wireless/ieee80211/ChangeLog
+++ b/net-wireless/ieee80211/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/ieee80211
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ChangeLog,v 1.15 2005/10/29 09:52:37 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ChangeLog,v 1.16 2005/11/15 12:30:01 brix Exp $
+
+  15 Nov 2005; Henrik Brix Andersen <brix@gentoo.org>
+  ieee80211-1.0.1.ebuild, ieee80211-1.0.2.ebuild, ieee80211-1.0.3.ebuild,
+  ieee80211-1.0.3-r1.ebuild, ieee80211-1.0.3-r2.ebuild,
+  ieee80211-1.1.5.ebuild, ieee80211-1.1.5-r1.ebuild, ieee80211-1.1.6.ebuild:
+  Backported work-around for linux-2.6.14+ to older ebuilds, bug #112499.
 
   29 Oct 2005; Henrik Brix Andersen <brix@gentoo.org> +files/remove-old,
   ieee80211-1.1.5.ebuild, ieee80211-1.1.5-r1.ebuild, ieee80211-1.1.6.ebuild:
diff --git a/net-wireless/ieee80211/Manifest b/net-wireless/ieee80211/Manifest
index 9046e2079bba..3b45301b0808 100644
--- a/net-wireless/ieee80211/Manifest
+++ b/net-wireless/ieee80211/Manifest
@@ -1,13 +1,13 @@
-MD5 205ad9adc36c1538667c08b26290874b ieee80211-1.0.3.ebuild 2073
-MD5 0b37106be6c69fa6ce87d5925f2a31dc ieee80211-1.0.3-r1.ebuild 2093
-MD5 f1b20051182c9f7a8ec10ce6175fc886 ieee80211-1.1.6.ebuild 2721
-MD5 d94f6f0e594496b23768753d8f2fbccc ieee80211-1.0.2.ebuild 2067
-MD5 d061f352b4274e25107d66756ee6a0be ieee80211-1.1.5.ebuild 2774
-MD5 48d421aede5a38ba059958ed545b09be ieee80211-1.0.3-r2.ebuild 2745
-MD5 612004997c5f08e127319a3d5d6e1eba ieee80211-1.1.5-r1.ebuild 2818
-MD5 d16752488657a3239defb0f1fdf0d8c7 ChangeLog 2518
+MD5 017a3d7be41875576be147103d5191c3 ieee80211-1.0.3.ebuild 2721
+MD5 429e2b02bd1b4c4c557ff0ae705ad14b ieee80211-1.0.3-r1.ebuild 2783
+MD5 a78d318490730d95a5efb47c83feaff9 ieee80211-1.1.6.ebuild 2722
+MD5 544613237e9ebe69e1a78925131c9dda ieee80211-1.0.2.ebuild 2715
+MD5 187bc564efd8fa14fa917ddfb6c60f0f ieee80211-1.1.5.ebuild 2775
+MD5 68d16a43f0caa21d3d7d5c1cfc88e53c ieee80211-1.0.3-r2.ebuild 2875
+MD5 26c7b675732d23770674e7ef10ce9311 ieee80211-1.1.5-r1.ebuild 2819
+MD5 93950cd56b019dadf6d837b4bd6903ad ChangeLog 2854
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
-MD5 54836c698b04ed62f6d7a3f6f8fa6232 ieee80211-1.0.1.ebuild 2067
+MD5 7c5302566475e0c6c55564da7eae0898 ieee80211-1.0.1.ebuild 2715
 MD5 03afa38292ff5bbcc62500c4b6163888 files/ieee80211-1.0.3-broadcast.patch 622
 MD5 61bac627a89e0cafb9996d2887d8a3e9 files/ieee80211-1.1.5-broadcast.patch 1939
 MD5 cc0dea5fff30f8ea5fe5e62a749115d3 files/digest-ieee80211-1.0.1 63
diff --git a/net-wireless/ieee80211/ieee80211-1.0.1.ebuild b/net-wireless/ieee80211/ieee80211-1.0.1.ebuild
index c03e072d3770..f8913796daa4 100644
--- a/net-wireless/ieee80211/ieee80211-1.0.1.ebuild
+++ b/net-wireless/ieee80211/ieee80211-1.0.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/ieee80211/ieee80211-1.0.1.ebuild,v 1.1 2005/07/12 21:48:36 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ieee80211-1.0.1.ebuild,v 1.2 2005/11/15 12:30:01 brix Exp $
 
 inherit linux-mod
 
@@ -28,24 +28,40 @@ MODULE_NAMES="ieee80211(net/ieee80211:)
 			ieee80211_crypt_ccmp(net/ieee80211:)
 			ieee80211_crypt_tkip(net/ieee80211:)"
 
-CONFIG_CHECK="NET_RADIO CRYPTO_ARC4 CRYPTO_MICHAEL_MIC CRC32"
+CONFIG_CHECK="NET_RADIO CRYPTO_ARC4 CRYPTO_MICHAEL_MIC CRC32 !IEEE80211"
 ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
 ERROR_CRYPTO_ARC4="${P} requires support for ARC4 cipher algorithm (CONFIG_CRYPTO_ARC4)."
 ERROR_CRYPTO_MICHAEL_MIC="${P} requires support for Michael MIC keyed digest algorithm (CONFIG_CRYPTO_MICHAEL_MIC)."
 ERROR_CRC32="${P} requires support for CRC32 functions (CONFIG_CRC32)."
+ERROR_IEEE80211="${P} requires the in-kernel version of the IEEE802.11 subsystem to be disabled (CONFIG_IEEE80211)"
 
 pkg_setup() {
+	linux-mod_pkg_setup
+
 	if kernel_is 2 4; then
 		die "${P} does not support building against kernel 2.4.x"
 	fi
 
-	if ! (linux_chkconfig_present CRYPTO_AES_586 || linux_chkconfig_present CRYPTO_AES); then
-		eerror "${P} requires support for AES cipher algorithms (i586) (CONFIG_CRYPTO_AES_586)."
-		eerror "This option is called CONFIG_CRYPTO_AES in kernels prior to 2.6.8."
-		die "CONFIG_CRYPTO_AES_586 support not detected"
+	if [[ -f ${KV_DIR}/include/net/ieee80211.h ]]; then
+		eerror
+		eerror "Your kernel source contains an incompatible version of the"
+		eerror "ieee80211 subsystem, which needs to be removed before"
+		eerror "${P} can be installed. This can be accomplished by running:"
+		eerror
+		eerror "  # /bin/sh ${FILESDIR}/remove-old ${KV_DIR}"
+		eerror
+		eerror "Please note that this will make it impossible to use some of the"
+		eerror "in-kernel IEEE 802.11 wireless LAN drivers (eg. orinoco)."
+		eerror
+		die "Incompatible in-kernel ieee80211 subsystem detected"
 	fi
 
-	linux-mod_pkg_setup
+	if ! (linux_chkconfig_present CRYPTO_AES_586 || \
+		  linux_chkconfig_present CRYPTO_AES_X86_64 || \
+		  linux_chkconfig_present CRYPTO_AES); then
+		eerror "${P} requires support for AES cipher algorithms."
+		die "CONFIG_CRYPTO_AES{_586,_X86_64} support not detected"
+	fi
 
 	BUILD_PARAMS="KSRC=${KV_DIR} KSRC_OUTPUT=${KV_OUT_DIR}"
 }
@@ -63,7 +79,7 @@ src_install() {
 	linux-mod_src_install
 
 	insinto /usr/include/net
-	doins net/*
+	doins net/*.h
 
 	dodoc CHANGES
 }
diff --git a/net-wireless/ieee80211/ieee80211-1.0.2.ebuild b/net-wireless/ieee80211/ieee80211-1.0.2.ebuild
index b3b57325f317..638c513a8274 100644
--- a/net-wireless/ieee80211/ieee80211-1.0.2.ebuild
+++ b/net-wireless/ieee80211/ieee80211-1.0.2.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/ieee80211/ieee80211-1.0.2.ebuild,v 1.1 2005/07/14 07:12:41 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ieee80211-1.0.2.ebuild,v 1.2 2005/11/15 12:30:01 brix Exp $
 
 inherit linux-mod
 
@@ -28,24 +28,40 @@ MODULE_NAMES="ieee80211(net/ieee80211:)
 			ieee80211_crypt_ccmp(net/ieee80211:)
 			ieee80211_crypt_tkip(net/ieee80211:)"
 
-CONFIG_CHECK="NET_RADIO CRYPTO_ARC4 CRYPTO_MICHAEL_MIC CRC32"
+CONFIG_CHECK="NET_RADIO CRYPTO_ARC4 CRYPTO_MICHAEL_MIC CRC32 !IEEE80211"
 ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
 ERROR_CRYPTO_ARC4="${P} requires support for ARC4 cipher algorithm (CONFIG_CRYPTO_ARC4)."
 ERROR_CRYPTO_MICHAEL_MIC="${P} requires support for Michael MIC keyed digest algorithm (CONFIG_CRYPTO_MICHAEL_MIC)."
 ERROR_CRC32="${P} requires support for CRC32 functions (CONFIG_CRC32)."
+ERROR_IEEE80211="${P} requires the in-kernel version of the IEEE802.11 subsystem to be disabled (CONFIG_IEEE80211)"
 
 pkg_setup() {
+	linux-mod_pkg_setup
+
 	if kernel_is 2 4; then
 		die "${P} does not support building against kernel 2.4.x"
 	fi
 
-	if ! (linux_chkconfig_present CRYPTO_AES_586 || linux_chkconfig_present CRYPTO_AES); then
-		eerror "${P} requires support for AES cipher algorithms (i586) (CONFIG_CRYPTO_AES_586)."
-		eerror "This option is called CONFIG_CRYPTO_AES in kernels prior to 2.6.8."
-		die "CONFIG_CRYPTO_AES_586 support not detected"
+	if [[ -f ${KV_DIR}/include/net/ieee80211.h ]]; then
+		eerror
+		eerror "Your kernel source contains an incompatible version of the"
+		eerror "ieee80211 subsystem, which needs to be removed before"
+		eerror "${P} can be installed. This can be accomplished by running:"
+		eerror
+		eerror "  # /bin/sh ${FILESDIR}/remove-old ${KV_DIR}"
+		eerror
+		eerror "Please note that this will make it impossible to use some of the"
+		eerror "in-kernel IEEE 802.11 wireless LAN drivers (eg. orinoco)."
+		eerror
+		die "Incompatible in-kernel ieee80211 subsystem detected"
 	fi
 
-	linux-mod_pkg_setup
+	if ! (linux_chkconfig_present CRYPTO_AES_586 || \
+		  linux_chkconfig_present CRYPTO_AES_X86_64 || \
+		  linux_chkconfig_present CRYPTO_AES); then
+		eerror "${P} requires support for AES cipher algorithms."
+		die "CONFIG_CRYPTO_AES{_586,_X86_64} support not detected"
+	fi
 
 	BUILD_PARAMS="KSRC=${KV_DIR} KSRC_OUTPUT=${KV_OUT_DIR}"
 }
@@ -63,7 +79,7 @@ src_install() {
 	linux-mod_src_install
 
 	insinto /usr/include/net
-	doins net/*
+	doins net/*.h
 
 	dodoc CHANGES
 }
diff --git a/net-wireless/ieee80211/ieee80211-1.0.3-r1.ebuild b/net-wireless/ieee80211/ieee80211-1.0.3-r1.ebuild
index 7db0f08279ab..2d5edd2df617 100644
--- a/net-wireless/ieee80211/ieee80211-1.0.3-r1.ebuild
+++ b/net-wireless/ieee80211/ieee80211-1.0.3-r1.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/ieee80211/ieee80211-1.0.3-r1.ebuild,v 1.1 2005/09/02 17:32:44 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ieee80211-1.0.3-r1.ebuild,v 1.2 2005/11/15 12:30:01 brix Exp $
 
 inherit eutils linux-mod
 
@@ -28,17 +28,34 @@ MODULE_NAMES="ieee80211(net/ieee80211:)
 			ieee80211_crypt_ccmp(net/ieee80211:)
 			ieee80211_crypt_tkip(net/ieee80211:)"
 
-CONFIG_CHECK="NET_RADIO CRYPTO_ARC4 CRYPTO_MICHAEL_MIC CRC32"
+CONFIG_CHECK="NET_RADIO CRYPTO_ARC4 CRYPTO_MICHAEL_MIC CRC32 !IEEE80211"
 ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
 ERROR_CRYPTO_ARC4="${P} requires support for ARC4 cipher algorithm (CONFIG_CRYPTO_ARC4)."
 ERROR_CRYPTO_MICHAEL_MIC="${P} requires support for Michael MIC keyed digest algorithm (CONFIG_CRYPTO_MICHAEL_MIC)."
 ERROR_CRC32="${P} requires support for CRC32 functions (CONFIG_CRC32)."
+ERROR_IEEE80211="${P} requires the in-kernel version of the IEEE802.11 subsystem to be disabled (CONFIG_IEEE80211)"
 
 pkg_setup() {
+	linux-mod_pkg_setup
+
 	if kernel_is 2 4; then
 		die "${P} does not support building against kernel 2.4.x"
 	fi
 
+	if [[ -f ${KV_DIR}/include/net/ieee80211.h ]]; then
+		eerror
+		eerror "Your kernel source contains an incompatible version of the"
+		eerror "ieee80211 subsystem, which needs to be removed before"
+		eerror "${P} can be installed. This can be accomplished by running:"
+		eerror
+		eerror "  # /bin/sh ${FILESDIR}/remove-old ${KV_DIR}"
+		eerror
+		eerror "Please note that this will make it impossible to use some of the"
+		eerror "in-kernel IEEE 802.11 wireless LAN drivers (eg. orinoco)."
+		eerror
+		die "Incompatible in-kernel ieee80211 subsystem detected"
+	fi
+
 	if ! (linux_chkconfig_present CRYPTO_AES_586 || \
 		  linux_chkconfig_present CRYPTO_AES_X86_64 || \
 		  linux_chkconfig_present CRYPTO_AES); then
@@ -46,8 +63,6 @@ pkg_setup() {
 		die "CONFIG_CRYPTO_AES{_586,_X86_64} support not detected"
 	fi
 
-	linux-mod_pkg_setup
-
 	BUILD_PARAMS="KSRC=${KV_DIR} KSRC_OUTPUT=${KV_OUT_DIR}"
 }
 
@@ -67,7 +82,7 @@ src_install() {
 	linux-mod_src_install
 
 	insinto /usr/include/net
-	doins net/*
+	doins net/*.h
 
 	dodoc CHANGES
 }
diff --git a/net-wireless/ieee80211/ieee80211-1.0.3-r2.ebuild b/net-wireless/ieee80211/ieee80211-1.0.3-r2.ebuild
index ab8a2d6a8667..1b8093d4397e 100644
--- a/net-wireless/ieee80211/ieee80211-1.0.3-r2.ebuild
+++ b/net-wireless/ieee80211/ieee80211-1.0.3-r2.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/ieee80211/ieee80211-1.0.3-r2.ebuild,v 1.4 2005/11/11 14:01:49 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ieee80211-1.0.3-r2.ebuild,v 1.5 2005/11/15 12:30:01 brix Exp $
 
 inherit eutils linux-mod
 
@@ -28,11 +28,12 @@ MODULE_NAMES="ieee80211(net/ieee80211:)
 			ieee80211_crypt_ccmp(net/ieee80211:)
 			ieee80211_crypt_tkip(net/ieee80211:)"
 
-CONFIG_CHECK="NET_RADIO CRYPTO_ARC4 CRYPTO_MICHAEL_MIC CRC32"
+CONFIG_CHECK="NET_RADIO CRYPTO_ARC4 CRYPTO_MICHAEL_MIC CRC32 !IEEE80211"
 ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
 ERROR_CRYPTO_ARC4="${P} requires support for ARC4 cipher algorithm (CONFIG_CRYPTO_ARC4)."
 ERROR_CRYPTO_MICHAEL_MIC="${P} requires support for Michael MIC keyed digest algorithm (CONFIG_CRYPTO_MICHAEL_MIC)."
 ERROR_CRC32="${P} requires support for CRC32 functions (CONFIG_CRC32)."
+ERROR_IEEE80211="${P} requires the in-kernel version of the IEEE802.11 subsystem to be disabled (CONFIG_IEEE80211)"
 
 pkg_setup() {
 	linux-mod_pkg_setup
@@ -47,7 +48,7 @@ pkg_setup() {
 		eerror "ieee80211 subsystem, which needs to be removed before"
 		eerror "${P} can be installed. This can be accomplished by running:"
 		eerror
-		eerror "  # rm -i ${KV_DIR}/include/net/ieee80211.h"
+		eerror "  # /bin/sh ${FILESDIR}/remove-old ${KV_DIR}"
 		eerror
 		eerror "Please note that this will make it impossible to use some of the"
 		eerror "in-kernel IEEE 802.11 wireless LAN drivers (eg. orinoco)."
@@ -84,7 +85,7 @@ src_install() {
 	linux-mod_src_install
 
 	insinto /usr/include/net
-	doins net/*
+	doins net/*.h
 
 	dodoc CHANGES
 }
diff --git a/net-wireless/ieee80211/ieee80211-1.0.3.ebuild b/net-wireless/ieee80211/ieee80211-1.0.3.ebuild
index 23c6cdb20837..141cde881aae 100644
--- a/net-wireless/ieee80211/ieee80211-1.0.3.ebuild
+++ b/net-wireless/ieee80211/ieee80211-1.0.3.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/ieee80211/ieee80211-1.0.3.ebuild,v 1.3 2005/08/16 12:30:29 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ieee80211-1.0.3.ebuild,v 1.4 2005/11/15 12:30:01 brix Exp $
 
 inherit linux-mod
 
@@ -28,24 +28,40 @@ MODULE_NAMES="ieee80211(net/ieee80211:)
 			ieee80211_crypt_ccmp(net/ieee80211:)
 			ieee80211_crypt_tkip(net/ieee80211:)"
 
-CONFIG_CHECK="NET_RADIO CRYPTO_ARC4 CRYPTO_MICHAEL_MIC CRC32"
+CONFIG_CHECK="NET_RADIO CRYPTO_ARC4 CRYPTO_MICHAEL_MIC CRC32 !IEEE80211"
 ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
 ERROR_CRYPTO_ARC4="${P} requires support for ARC4 cipher algorithm (CONFIG_CRYPTO_ARC4)."
 ERROR_CRYPTO_MICHAEL_MIC="${P} requires support for Michael MIC keyed digest algorithm (CONFIG_CRYPTO_MICHAEL_MIC)."
 ERROR_CRC32="${P} requires support for CRC32 functions (CONFIG_CRC32)."
+ERROR_IEEE80211="${P} requires the in-kernel version of the IEEE802.11 subsystem to be disabled (CONFIG_IEEE80211)"
 
 pkg_setup() {
+	linux-mod_pkg_setup
+
 	if kernel_is 2 4; then
 		die "${P} does not support building against kernel 2.4.x"
 	fi
 
-	if ! (linux_chkconfig_present CRYPTO_AES_586 || linux_chkconfig_present CRYPTO_AES); then
-		eerror "${P} requires support for AES cipher algorithms (i586) (CONFIG_CRYPTO_AES_586)."
-		eerror "This option is called CONFIG_CRYPTO_AES in kernels prior to 2.6.8."
-		die "CONFIG_CRYPTO_AES_586 support not detected"
+	if [[ -f ${KV_DIR}/include/net/ieee80211.h ]]; then
+		eerror
+		eerror "Your kernel source contains an incompatible version of the"
+		eerror "ieee80211 subsystem, which needs to be removed before"
+		eerror "${P} can be installed. This can be accomplished by running:"
+		eerror
+		eerror "  # /bin/sh ${FILESDIR}/remove-old ${KV_DIR}"
+		eerror
+		eerror "Please note that this will make it impossible to use some of the"
+		eerror "in-kernel IEEE 802.11 wireless LAN drivers (eg. orinoco)."
+		eerror
+		die "Incompatible in-kernel ieee80211 subsystem detected"
 	fi
 
-	linux-mod_pkg_setup
+	if ! (linux_chkconfig_present CRYPTO_AES_586 || \
+		  linux_chkconfig_present CRYPTO_AES_X86_64 || \
+		  linux_chkconfig_present CRYPTO_AES); then
+		eerror "${P} requires support for AES cipher algorithms."
+		die "CONFIG_CRYPTO_AES{_586,_X86_64} support not detected"
+	fi
 
 	BUILD_PARAMS="KSRC=${KV_DIR} KSRC_OUTPUT=${KV_OUT_DIR}"
 }
@@ -63,7 +79,7 @@ src_install() {
 	linux-mod_src_install
 
 	insinto /usr/include/net
-	doins net/*
+	doins net/*.h
 
 	dodoc CHANGES
 }
diff --git a/net-wireless/ieee80211/ieee80211-1.1.5-r1.ebuild b/net-wireless/ieee80211/ieee80211-1.1.5-r1.ebuild
index 8d53d3259b43..f118cc138d54 100644
--- a/net-wireless/ieee80211/ieee80211-1.1.5-r1.ebuild
+++ b/net-wireless/ieee80211/ieee80211-1.1.5-r1.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/ieee80211/ieee80211-1.1.5-r1.ebuild,v 1.3 2005/11/11 14:01:49 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ieee80211-1.1.5-r1.ebuild,v 1.4 2005/11/15 12:30:01 brix Exp $
 
 inherit eutils linux-mod
 
@@ -44,7 +44,7 @@ pkg_setup() {
 
 	if [[ -f ${KV_DIR}/include/net/ieee80211.h ]]; then
 		eerror
-		eerror "Your kernel source contains an incomptible version of the"
+		eerror "Your kernel source contains an incompatible version of the"
 		eerror "ieee80211 subsystem, which needs to be removed before"
 		eerror "${P} can be installed. This can be accomplished by running:"
 		eerror
diff --git a/net-wireless/ieee80211/ieee80211-1.1.5.ebuild b/net-wireless/ieee80211/ieee80211-1.1.5.ebuild
index 4d653f5f6bb6..3f6a9762791f 100644
--- a/net-wireless/ieee80211/ieee80211-1.1.5.ebuild
+++ b/net-wireless/ieee80211/ieee80211-1.1.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/ieee80211/ieee80211-1.1.5.ebuild,v 1.4 2005/11/11 14:01:49 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ieee80211-1.1.5.ebuild,v 1.5 2005/11/15 12:30:01 brix Exp $
 
 inherit eutils linux-mod
 
@@ -44,7 +44,7 @@ pkg_setup() {
 
 	if [[ -f ${KV_DIR}/include/net/ieee80211.h ]]; then
 		eerror
-		eerror "Your kernel source contains an incomptible version of the"
+		eerror "Your kernel source contains an incompatible version of the"
 		eerror "ieee80211 subsystem, which needs to be removed before"
 		eerror "${P} can be installed. This can be accomplished by running:"
 		eerror
diff --git a/net-wireless/ieee80211/ieee80211-1.1.6.ebuild b/net-wireless/ieee80211/ieee80211-1.1.6.ebuild
index 29d227f0ba47..e796583f08e2 100644
--- a/net-wireless/ieee80211/ieee80211-1.1.6.ebuild
+++ b/net-wireless/ieee80211/ieee80211-1.1.6.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/ieee80211/ieee80211-1.1.6.ebuild,v 1.3 2005/11/11 14:01:49 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ieee80211-1.1.6.ebuild,v 1.4 2005/11/15 12:30:01 brix Exp $
 
 inherit linux-mod
 
@@ -42,6 +42,20 @@ pkg_setup() {
 		die "${P} does not support building against kernel 2.4.x"
 	fi
 
+	if [[ -f ${KV_DIR}/include/net/ieee80211.h ]]; then
+		eerror
+		eerror "Your kernel source contains an incompatible version of the"
+		eerror "ieee80211 subsystem, which needs to be removed before"
+		eerror "${P} can be installed. This can be accomplished by running:"
+		eerror
+		eerror "  # /bin/sh ${FILESDIR}/remove-old ${KV_DIR}"
+		eerror
+		eerror "Please note that this will make it impossible to use some of the"
+		eerror "in-kernel IEEE 802.11 wireless LAN drivers (eg. orinoco)."
+		eerror
+		die "Incompatible in-kernel ieee80211 subsystem detected"
+	fi
+
 	if ! (linux_chkconfig_present CRYPTO_AES_586 || \
 		  linux_chkconfig_present CRYPTO_AES_X86_64 || \
 		  linux_chkconfig_present CRYPTO_AES); then
@@ -57,20 +71,6 @@ src_unpack() {
 
 	unpack ${A}
 
-	if [[ -f ${KV_DIR}/include/net/ieee80211.h ]]; then
-		eerror
-		eerror "Your kernel source contains an incomptible version of the"
-		eerror "ieee80211 subsystem, which needs to be removed before"
-		eerror "${P} can be installed. This can be accomplished by running:"
-		eerror
-		eerror "  # /bin/sh ${FILESDIR}/remove-old ${KV_DIR}"
-		eerror
-		eerror "Please note that this will make it impossible to use some of the"
-		eerror "in-kernel IEEE 802.11 wireless LAN drivers (eg. orinoco)."
-		eerror
-		die "Incompatible in-kernel ieee80211 subsystem detected"
-	fi
-
 	use debug && debug="y"
 	sed -i -e "s:^\(CONFIG_IEEE80211_DEBUG\)=.*:\1=${debug}:" ${S}/Makefile
 }