Fix bug #119854.

Package-Manager: portage-2.0.54

13 files changed, 61 insertions, 43 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/Manifest b/net-wireless/ieee80211/Manifest
index 72049d338e72..dfe9fea473be 100644
--- a/net-wireless/ieee80211/Manifest
+++ b/net-wireless/ieee80211/Manifest
@@ -1,4 +1,4 @@
-MD5 edd3264e4b4e5259ae9f6cecf45e24f7 ChangeLog 4096
+MD5 e33f5a1336c3dffa98a96bb4fa2074f3 ChangeLog 4451
 MD5 cc0dea5fff30f8ea5fe5e62a749115d3 files/digest-ieee80211-1.0.1 63
 MD5 affd67ec6900c1e7f9c123969f709181 files/digest-ieee80211-1.0.2 63
 MD5 777627671d6848e14270d9f65d9d0be6 files/digest-ieee80211-1.0.3 63
@@ -17,15 +17,15 @@ MD5 61bac627a89e0cafb9996d2887d8a3e9 files/ieee80211-1.1.5-broadcast.patch 1939
 MD5 ccf8b6ee79df516fce26c5780b058ac6 files/ieee80211-1.1.5-we18.patch 1973
 MD5 4c49e8e5e739551dd8a68f88131529a4 files/ieee80211-1.1.8-nocast.patch 959
 MD5 1c7250a90205590d6a477efdc0efe963 files/remove-old 1444
-MD5 1054af781be5183132744e65a5043a8d ieee80211-1.0.1.ebuild 2768
-MD5 c09bd847f99062b5e22ebe9f8976a49c ieee80211-1.0.2.ebuild 2768
-MD5 2258001f4252bdf42a23aa76e25752ce ieee80211-1.0.3-r1.ebuild 2836
-MD5 fad918874603fc69eda3f8fe4158b27c ieee80211-1.0.3-r2.ebuild 2928
-MD5 8238246854b96312d70840d942bce144 ieee80211-1.0.3.ebuild 2774
-MD5 71c6e2c242e709e0649b534c96736d25 ieee80211-1.1.5-r1.ebuild 2872
-MD5 49f0d303a477f0b091dd498e02576a5b ieee80211-1.1.5.ebuild 2828
-MD5 42dbbe85c5f5dd959a3da2fa12c4df9e ieee80211-1.1.6.ebuild 2779
-MD5 0dadded27c72eb389fecc48bc9b94604 ieee80211-1.1.7.ebuild 2787
-MD5 eca48471432047fdb5f0a23aaebecf97 ieee80211-1.1.8.ebuild 2844
-MD5 542838cc253262bb0fa9f35fa6efab15 ieee80211-1.1.9.ebuild 2787
+MD5 05cc27af1cbe90cba2f171da7b206626 ieee80211-1.0.1.ebuild 2854
+MD5 ee21ce6fbe7bb505f1c7450a8fe3b095 ieee80211-1.0.2.ebuild 2854
+MD5 b3058bbabbb154c955660df2abca157e ieee80211-1.0.3-r1.ebuild 2922
+MD5 df4eac245b2e86fa8d987d2ba46d0977 ieee80211-1.0.3-r2.ebuild 3014
+MD5 7b5e4732cb141dcedb4478c13f3d1550 ieee80211-1.0.3.ebuild 2860
+MD5 36309ea7ca19a844d0904965cfcf8cca ieee80211-1.1.5-r1.ebuild 2958
+MD5 7dd7db03af9e51f1c373e6bc8ef9d37d ieee80211-1.1.5.ebuild 2914
+MD5 edf83168cccae504ea65f0ae2da7d4a7 ieee80211-1.1.6.ebuild 2865
+MD5 612c2bdc4961ed57b5db4857f94ac5f4 ieee80211-1.1.7.ebuild 2873
+MD5 33e0a477d70e7489b7af2ba40f0b39e0 ieee80211-1.1.8.ebuild 2930
+MD5 8ddf269b9fe8d8e566bc1b61603318c2 ieee80211-1.1.9.ebuild 2873
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
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"