Fixed bug #113155.

Package-Manager: portage-2.0.51.22-r3

10 files changed, 40 insertions, 26 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/Manifest b/net-wireless/ieee80211/Manifest
index bf3d39c8a5aa..8b8ec0abff53 100644
--- a/net-wireless/ieee80211/Manifest
+++ b/net-wireless/ieee80211/Manifest
@@ -1,13 +1,13 @@
-MD5 017a3d7be41875576be147103d5191c3 ieee80211-1.0.3.ebuild 2721
-MD5 429e2b02bd1b4c4c557ff0ae705ad14b ieee80211-1.0.3-r1.ebuild 2783
-MD5 94cfd35e9d5024ed98e4b2b6c3b53d1a ieee80211-1.1.6.ebuild 2726
-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 f4f09ef679cabe0148312c1f9ac91d69 ChangeLog 3040
+MD5 8238246854b96312d70840d942bce144 ieee80211-1.0.3.ebuild 2774
+MD5 2258001f4252bdf42a23aa76e25752ce ieee80211-1.0.3-r1.ebuild 2836
+MD5 42dbbe85c5f5dd959a3da2fa12c4df9e ieee80211-1.1.6.ebuild 2779
+MD5 c09bd847f99062b5e22ebe9f8976a49c ieee80211-1.0.2.ebuild 2768
+MD5 49f0d303a477f0b091dd498e02576a5b ieee80211-1.1.5.ebuild 2828
+MD5 fad918874603fc69eda3f8fe4158b27c ieee80211-1.0.3-r2.ebuild 2928
+MD5 71c6e2c242e709e0649b534c96736d25 ieee80211-1.1.5-r1.ebuild 2872
+MD5 c89d82eb0d4cd480ae12df71b3fe81ff ChangeLog 3323
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
-MD5 7c5302566475e0c6c55564da7eae0898 ieee80211-1.0.1.ebuild 2715
+MD5 1054af781be5183132744e65a5043a8d ieee80211-1.0.1.ebuild 2768
 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 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"