Fix bug #119854.

(Portage version: 2.0.54)

12 files changed, 49 insertions, 31 deletions

diff --git a/net-wireless/ieee80211/ChangeLog b/net-wireless/ieee80211/ChangeLog
index b78e348566e8..abbea9c7ee9d 100644
--- a/net-wireless/ieee80211/ChangeLog
+++ b/net-wireless/ieee80211/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/ieee80211
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ChangeLog,v 1.24 2006/01/16 22:48:50 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ChangeLog,v 1.25 2006/02/01 21:25:34 brix Exp $
+
+  01 Feb 2006; 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,
+  ieee80211-1.1.7.ebuild, ieee80211-1.1.8.ebuild, ieee80211-1.1.9.ebuild:
+  Fix bug #119854.
 
 *ieee80211-1.1.9 (16 Jan 2006)
 
diff --git a/net-wireless/ieee80211/ieee80211-1.0.1.ebuild b/net-wireless/ieee80211/ieee80211-1.0.1.ebuild
index 134e72f7599a..40eed0ddbca7 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
+# Copyright 1999-2006 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.3 2005/11/24 14:30:59 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ieee80211-1.0.1.ebuild,v 1.4 2006/02/01 21:25:34 brix Exp $
 
 inherit linux-mod
 
@@ -43,7 +43,8 @@ pkg_setup() {
 	fi
 
 	if [[ -f ${KV_DIR}/include/net/ieee80211.h ]] || \
-		[[ -f ${KV_DIR}/include/config/ieee80211.h ]]; then
+		[[ -f ${KV_DIR}/include/config/ieee80211.h ]] || \
+		egrep -q "^#(un)?def.*(CONFIG_IEEE80211.*)" ${KV_DIR}/include/linux/autoconf.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 36dcb9d6177c..cf71cbc98c18 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
+# Copyright 1999-2006 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.3 2005/11/24 14:30:59 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ieee80211-1.0.2.ebuild,v 1.4 2006/02/01 21:25:34 brix Exp $
 
 inherit linux-mod
 
@@ -43,7 +43,8 @@ pkg_setup() {
 	fi
 
 	if [[ -f ${KV_DIR}/include/net/ieee80211.h ]] || \
-		[[ -f ${KV_DIR}/include/config/ieee80211.h ]]; then
+		[[ -f ${KV_DIR}/include/config/ieee80211.h ]] || \
+		egrep -q "^#(un)?def.*(CONFIG_IEEE80211.*)" ${KV_DIR}/include/linux/autoconf.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 2bbc8ef0e520..a4924caa42ba 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
+# Copyright 1999-2006 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.3 2005/11/24 14:30:59 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ieee80211-1.0.3-r1.ebuild,v 1.4 2006/02/01 21:25:34 brix Exp $
 
 inherit eutils linux-mod
 
@@ -43,7 +43,8 @@ pkg_setup() {
 	fi
 
 	if [[ -f ${KV_DIR}/include/net/ieee80211.h ]] || \
-		[[ -f ${KV_DIR}/include/config/ieee80211.h ]]; then
+		[[ -f ${KV_DIR}/include/config/ieee80211.h ]] || \
+		egrep -q "^#(un)?def.*(CONFIG_IEEE80211.*)" ${KV_DIR}/include/linux/autoconf.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 a23b872561c4..fda999bbfeed 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
+# Copyright 1999-2006 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.6 2005/11/24 14:30:59 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ieee80211-1.0.3-r2.ebuild,v 1.7 2006/02/01 21:25:34 brix Exp $
 
 inherit eutils linux-mod
 
@@ -43,7 +43,8 @@ pkg_setup() {
 	fi
 
 	if [[ -f ${KV_DIR}/include/net/ieee80211.h ]] || \
-		[[ -f ${KV_DIR}/include/config/ieee80211.h ]]; then
+		[[ -f ${KV_DIR}/include/config/ieee80211.h ]] || \
+		egrep -q "^#(un)?def.*(CONFIG_IEEE80211.*)" ${KV_DIR}/include/linux/autoconf.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 0725d81c9cd9..5e5107005b04 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
+# Copyright 1999-2006 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.5 2005/11/24 14:30:59 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ieee80211-1.0.3.ebuild,v 1.6 2006/02/01 21:25:34 brix Exp $
 
 inherit linux-mod
 
@@ -43,7 +43,8 @@ pkg_setup() {
 	fi
 
 	if [[ -f ${KV_DIR}/include/net/ieee80211.h ]] || \
-		[[ -f ${KV_DIR}/include/config/ieee80211.h ]]; then
+		[[ -f ${KV_DIR}/include/config/ieee80211.h ]] || \
+		egrep -q "^#(un)?def.*(CONFIG_IEEE80211.*)" ${KV_DIR}/include/linux/autoconf.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 c45a772a87e8..b363292b462d 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
+# Copyright 1999-2006 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.5 2005/11/24 14:30:59 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ieee80211-1.1.5-r1.ebuild,v 1.6 2006/02/01 21:25:34 brix Exp $
 
 inherit eutils linux-mod
 
@@ -43,7 +43,8 @@ pkg_setup() {
 	fi
 
 	if [[ -f ${KV_DIR}/include/net/ieee80211.h ]] || \
-		[[ -f ${KV_DIR}/include/config/ieee80211.h ]]; then
+		[[ -f ${KV_DIR}/include/config/ieee80211.h ]] || \
+		egrep -q "^#(un)?def.*(CONFIG_IEEE80211.*)" ${KV_DIR}/include/linux/autoconf.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 362a879eccfd..a8eb1e83f0e5 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
+# Copyright 1999-2006 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.6 2005/11/24 14:30:59 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ieee80211-1.1.5.ebuild,v 1.7 2006/02/01 21:25:34 brix Exp $
 
 inherit eutils linux-mod
 
@@ -43,7 +43,8 @@ pkg_setup() {
 	fi
 
 	if [[ -f ${KV_DIR}/include/net/ieee80211.h ]] || \
-		[[ -f ${KV_DIR}/include/config/ieee80211.h ]]; then
+		[[ -f ${KV_DIR}/include/config/ieee80211.h ]] || \
+		egrep -q "^#(un)?def.*(CONFIG_IEEE80211.*)" ${KV_DIR}/include/linux/autoconf.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 f5ea82af681e..200baa2f3a48 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
+# Copyright 1999-2006 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.7 2005/11/24 14:30:59 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ieee80211-1.1.6.ebuild,v 1.8 2006/02/01 21:25:34 brix Exp $
 
 inherit linux-mod
 
@@ -43,7 +43,8 @@ pkg_setup() {
 	fi
 
 	if [[ -f ${KV_DIR}/include/net/ieee80211.h ]] || \
-		[[ -f ${KV_DIR}/include/config/ieee80211.h ]]; then
+		[[ -f ${KV_DIR}/include/config/ieee80211.h ]] || \
+		egrep -q "^#(un)?def.*(CONFIG_IEEE80211.*)" ${KV_DIR}/include/linux/autoconf.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.7.ebuild b/net-wireless/ieee80211/ieee80211-1.1.7.ebuild
index ea0d557205ac..cc34c1164097 100644
--- a/net-wireless/ieee80211/ieee80211-1.1.7.ebuild
+++ b/net-wireless/ieee80211/ieee80211-1.1.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/ieee80211/ieee80211-1.1.7.ebuild,v 1.2 2006/01/08 13:09:19 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ieee80211-1.1.7.ebuild,v 1.3 2006/02/01 21:25:34 brix Exp $
 
 inherit linux-mod
 
@@ -43,7 +43,8 @@ pkg_setup() {
 	fi
 
 	if [[ -f ${KV_DIR}/include/net/ieee80211.h ]] || \
-		[[ -f ${KV_DIR}/include/config/ieee80211.h ]]; then
+		[[ -f ${KV_DIR}/include/config/ieee80211.h ]] || \
+		egrep -q "^#(un)?def.*(CONFIG_IEEE80211.*)" ${KV_DIR}/include/linux/autoconf.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.8.ebuild b/net-wireless/ieee80211/ieee80211-1.1.8.ebuild
index 4d9c52053ae8..c580dbb61f20 100644
--- a/net-wireless/ieee80211/ieee80211-1.1.8.ebuild
+++ b/net-wireless/ieee80211/ieee80211-1.1.8.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/ieee80211/ieee80211-1.1.8.ebuild,v 1.3 2006/01/11 12:28:56 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ieee80211-1.1.8.ebuild,v 1.4 2006/02/01 21:25:34 brix Exp $
 
 inherit eutils linux-mod
 
@@ -43,7 +43,8 @@ pkg_setup() {
 	fi
 
 	if [[ -f ${KV_DIR}/include/net/ieee80211.h ]] || \
-		[[ -f ${KV_DIR}/include/config/ieee80211.h ]]; then
+		[[ -f ${KV_DIR}/include/config/ieee80211.h ]] || \
+		egrep -q "^#(un)?def.*(CONFIG_IEEE80211.*)" ${KV_DIR}/include/linux/autoconf.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.9.ebuild b/net-wireless/ieee80211/ieee80211-1.1.9.ebuild
index 2115e0cd42c7..17221c94639e 100644
--- a/net-wireless/ieee80211/ieee80211-1.1.9.ebuild
+++ b/net-wireless/ieee80211/ieee80211-1.1.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/ieee80211/ieee80211-1.1.9.ebuild,v 1.1 2006/01/16 22:48:50 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ieee80211-1.1.9.ebuild,v 1.2 2006/02/01 21:25:34 brix Exp $
 
 inherit linux-mod
 
@@ -43,7 +43,8 @@ pkg_setup() {
 	fi
 
 	if [[ -f ${KV_DIR}/include/net/ieee80211.h ]] || \
-		[[ -f ${KV_DIR}/include/config/ieee80211.h ]]; then
+		[[ -f ${KV_DIR}/include/config/ieee80211.h ]] || \
+		egrep -q "^#(un)?def.*(CONFIG_IEEE80211.*)" ${KV_DIR}/include/linux/autoconf.h; then
 		eerror
 		eerror "Your kernel source contains an incompatible version of the"
 		eerror "ieee80211 subsystem, which needs to be removed before"