Fixed bug #113155.

(Portage version: 2.0.51.22-r3)

9 files changed, 31 insertions, 17 deletions

diff --git a/net-wireless/ieee80211/ChangeLog b/net-wireless/ieee80211/ChangeLog
index 6a9ff5748892..d76aa1c4bcb1 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.18 2005/11/17 13:35:23 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ChangeLog,v 1.19 2005/11/24 14:30:59 brix Exp $
+
+  24 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:
+  Fixed bug #113155.
 
   17 Nov 2005; Henrik Brix Andersen <brix@gentoo.org>
   ieee80211-1.1.6.ebuild:
diff --git a/net-wireless/ieee80211/ieee80211-1.0.1.ebuild b/net-wireless/ieee80211/ieee80211-1.0.1.ebuild
index f8913796daa4..134e72f7599a 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.2 2005/11/15 12:30:01 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ieee80211-1.0.1.ebuild,v 1.3 2005/11/24 14:30:59 brix Exp $
 
 inherit linux-mod
 
@@ -42,7 +42,8 @@ pkg_setup() {
 		die "${P} does not support building against kernel 2.4.x"
 	fi
 
-	if [[ -f ${KV_DIR}/include/net/ieee80211.h ]]; then
+	if [[ -f ${KV_DIR}/include/net/ieee80211.h ]] || \
+		[[ -f ${KV_DIR}/include/config/ieee80211.h ]]; then
 		eerror
 		eerror "Your kernel source contains an incompatible version of the"
 		eerror "ieee80211 subsystem, which needs to be removed before"
diff --git a/net-wireless/ieee80211/ieee80211-1.0.2.ebuild b/net-wireless/ieee80211/ieee80211-1.0.2.ebuild
index 638c513a8274..36dcb9d6177c 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.2 2005/11/15 12:30:01 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ieee80211-1.0.2.ebuild,v 1.3 2005/11/24 14:30:59 brix Exp $
 
 inherit linux-mod
 
@@ -42,7 +42,8 @@ pkg_setup() {
 		die "${P} does not support building against kernel 2.4.x"
 	fi
 
-	if [[ -f ${KV_DIR}/include/net/ieee80211.h ]]; then
+	if [[ -f ${KV_DIR}/include/net/ieee80211.h ]] || \
+		[[ -f ${KV_DIR}/include/config/ieee80211.h ]]; then
 		eerror
 		eerror "Your kernel source contains an incompatible version of the"
 		eerror "ieee80211 subsystem, which needs to be removed before"
diff --git a/net-wireless/ieee80211/ieee80211-1.0.3-r1.ebuild b/net-wireless/ieee80211/ieee80211-1.0.3-r1.ebuild
index 2d5edd2df617..2bbc8ef0e520 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.2 2005/11/15 12:30:01 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ieee80211-1.0.3-r1.ebuild,v 1.3 2005/11/24 14:30:59 brix Exp $
 
 inherit eutils linux-mod
 
@@ -42,7 +42,8 @@ pkg_setup() {
 		die "${P} does not support building against kernel 2.4.x"
 	fi
 
-	if [[ -f ${KV_DIR}/include/net/ieee80211.h ]]; then
+	if [[ -f ${KV_DIR}/include/net/ieee80211.h ]] || \
+		[[ -f ${KV_DIR}/include/config/ieee80211.h ]]; then
 		eerror
 		eerror "Your kernel source contains an incompatible version of the"
 		eerror "ieee80211 subsystem, which needs to be removed before"
diff --git a/net-wireless/ieee80211/ieee80211-1.0.3-r2.ebuild b/net-wireless/ieee80211/ieee80211-1.0.3-r2.ebuild
index 1b8093d4397e..a23b872561c4 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.5 2005/11/15 12:30:01 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ieee80211-1.0.3-r2.ebuild,v 1.6 2005/11/24 14:30:59 brix Exp $
 
 inherit eutils linux-mod
 
@@ -42,7 +42,8 @@ pkg_setup() {
 		die "${P} does not support building against kernel 2.4.x"
 	fi
 
-	if [[ -f ${KV_DIR}/include/net/ieee80211.h ]]; then
+	if [[ -f ${KV_DIR}/include/net/ieee80211.h ]] || \
+		[[ -f ${KV_DIR}/include/config/ieee80211.h ]]; then
 		eerror
 		eerror "Your kernel source contains an incompatible version of the"
 		eerror "ieee80211 subsystem, which needs to be removed before"
diff --git a/net-wireless/ieee80211/ieee80211-1.0.3.ebuild b/net-wireless/ieee80211/ieee80211-1.0.3.ebuild
index 141cde881aae..0725d81c9cd9 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.4 2005/11/15 12:30:01 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ieee80211-1.0.3.ebuild,v 1.5 2005/11/24 14:30:59 brix Exp $
 
 inherit linux-mod
 
@@ -42,7 +42,8 @@ pkg_setup() {
 		die "${P} does not support building against kernel 2.4.x"
 	fi
 
-	if [[ -f ${KV_DIR}/include/net/ieee80211.h ]]; then
+	if [[ -f ${KV_DIR}/include/net/ieee80211.h ]] || \
+		[[ -f ${KV_DIR}/include/config/ieee80211.h ]]; then
 		eerror
 		eerror "Your kernel source contains an incompatible version of the"
 		eerror "ieee80211 subsystem, which needs to be removed before"
diff --git a/net-wireless/ieee80211/ieee80211-1.1.5-r1.ebuild b/net-wireless/ieee80211/ieee80211-1.1.5-r1.ebuild
index f118cc138d54..c45a772a87e8 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.4 2005/11/15 12:30:01 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ieee80211-1.1.5-r1.ebuild,v 1.5 2005/11/24 14:30:59 brix Exp $
 
 inherit eutils linux-mod
 
@@ -42,7 +42,8 @@ pkg_setup() {
 		die "${P} does not support building against kernel 2.4.x"
 	fi
 
-	if [[ -f ${KV_DIR}/include/net/ieee80211.h ]]; then
+	if [[ -f ${KV_DIR}/include/net/ieee80211.h ]] || \
+		[[ -f ${KV_DIR}/include/config/ieee80211.h ]]; then
 		eerror
 		eerror "Your kernel source contains an incompatible version of the"
 		eerror "ieee80211 subsystem, which needs to be removed before"
diff --git a/net-wireless/ieee80211/ieee80211-1.1.5.ebuild b/net-wireless/ieee80211/ieee80211-1.1.5.ebuild
index 3f6a9762791f..362a879eccfd 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.5 2005/11/15 12:30:01 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ieee80211-1.1.5.ebuild,v 1.6 2005/11/24 14:30:59 brix Exp $
 
 inherit eutils linux-mod
 
@@ -42,7 +42,8 @@ pkg_setup() {
 		die "${P} does not support building against kernel 2.4.x"
 	fi
 
-	if [[ -f ${KV_DIR}/include/net/ieee80211.h ]]; then
+	if [[ -f ${KV_DIR}/include/net/ieee80211.h ]] || \
+		[[ -f ${KV_DIR}/include/config/ieee80211.h ]]; then
 		eerror
 		eerror "Your kernel source contains an incompatible version of the"
 		eerror "ieee80211 subsystem, which needs to be removed before"
diff --git a/net-wireless/ieee80211/ieee80211-1.1.6.ebuild b/net-wireless/ieee80211/ieee80211-1.1.6.ebuild
index fae56dde6575..f5ea82af681e 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.6 2005/11/17 13:35:23 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ieee80211-1.1.6.ebuild,v 1.7 2005/11/24 14:30:59 brix Exp $
 
 inherit linux-mod
 
@@ -42,7 +42,8 @@ pkg_setup() {
 		die "${P} does not support building against kernel 2.4.x"
 	fi
 
-	if [[ -f ${KV_DIR}/include/net/ieee80211.h ]]; then
+	if [[ -f ${KV_DIR}/include/net/ieee80211.h ]] || \
+		[[ -f ${KV_DIR}/include/config/ieee80211.h ]]; then
 		eerror
 		eerror "Your kernel source contains an incompatible version of the"
 		eerror "ieee80211 subsystem, which needs to be removed before"