Make ipw3945-1.2.1 aware of the changed CONFIG options of Linux 2.6.22 (thanks to Momsen Reincke <mreincke at gmx.net> in #179028).

Package-Manager: portage-2.1.2.7

3 files changed, 23 insertions, 15 deletions

diff --git a/net-wireless/ipw3945/ChangeLog b/net-wireless/ipw3945/ChangeLog
index 1d3ec50f896c..909df3a06721 100644
--- a/net-wireless/ipw3945/ChangeLog
+++ b/net-wireless/ipw3945/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/ipw3945
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945/ChangeLog,v 1.27 2007/05/20 17:14:17 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945/ChangeLog,v 1.28 2007/05/20 17:51:25 phreak Exp $
+
+  20 May 2007; Christian Heim <phreak@gentoo.org> ipw3945-1.2.1.ebuild:
+  Make ipw3945-1.2.1 aware of the changed CONFIG options of Linux 2.6.22
+  (thanks to Momsen Reincke <mreincke at gmx.net> in #179028).
 
 *ipw3945-1.2.1 (20 May 2007)
 
diff --git a/net-wireless/ipw3945/Manifest b/net-wireless/ipw3945/Manifest
index 8714425280f2..f9cc56931263 100644
--- a/net-wireless/ipw3945/Manifest
+++ b/net-wireless/ipw3945/Manifest
@@ -20,14 +20,14 @@ EBUILD ipw3945-1.2.0.ebuild 2550 RMD160 43240a8e344ef9baa3ac1cf37f2cc65e710b272c
 MD5 cd866644246bd9afcf15844b2cf5e1f8 ipw3945-1.2.0.ebuild 2550
 RMD160 43240a8e344ef9baa3ac1cf37f2cc65e710b272c ipw3945-1.2.0.ebuild 2550
 SHA256 32d49f5c4607799f87fc968f759cee1b7a902abc9eb098392e7e474133d8e5ff ipw3945-1.2.0.ebuild 2550
-EBUILD ipw3945-1.2.1.ebuild 2559 RMD160 2650ebdb4e6f699133987f1be049112b093c86dd SHA1 e35d48ae17ac8d051649fe75f496a7a5c0e9c32f SHA256 8302fcf11bf6d5eae774f78138b640991d86b45c8f5cca5200ab15bd6e27ed4a
-MD5 d09648d57106c77ef3efed0ba30a215b ipw3945-1.2.1.ebuild 2559
-RMD160 2650ebdb4e6f699133987f1be049112b093c86dd ipw3945-1.2.1.ebuild 2559
-SHA256 8302fcf11bf6d5eae774f78138b640991d86b45c8f5cca5200ab15bd6e27ed4a ipw3945-1.2.1.ebuild 2559
-MISC ChangeLog 5303 RMD160 61fb622f4dcd1eef791df854aafb8b6e5f7465cd SHA1 264c66e64789de8f5389d82d9051302c9c588085 SHA256 cdb6316f3193b98c495efd42f8171c5e89e29d7a2094b6869e00f6c2f023679b
-MD5 4a08fd1b2a80b3baec80740c8da73503 ChangeLog 5303
-RMD160 61fb622f4dcd1eef791df854aafb8b6e5f7465cd ChangeLog 5303
-SHA256 cdb6316f3193b98c495efd42f8171c5e89e29d7a2094b6869e00f6c2f023679b ChangeLog 5303
+EBUILD ipw3945-1.2.1.ebuild 2818 RMD160 e9ee8bbd3b4e61c6cf4176f62e2056a238b9db78 SHA1 132b4abf00765cede9cf03c5eaf385887d6fe812 SHA256 82a06955825c656951a629f3e3b990e93e3e24c14d0b6b97bce068efd7d9fc42
+MD5 0e1ce1b399da8b17511d5e2590cbff53 ipw3945-1.2.1.ebuild 2818
+RMD160 e9ee8bbd3b4e61c6cf4176f62e2056a238b9db78 ipw3945-1.2.1.ebuild 2818
+SHA256 82a06955825c656951a629f3e3b990e93e3e24c14d0b6b97bce068efd7d9fc42 ipw3945-1.2.1.ebuild 2818
+MISC ChangeLog 5512 RMD160 b01cf1ae2140a4d938115a909076f5f48fc2a9d2 SHA1 d4b1c8345e88d281187df762024a45aee304afa8 SHA256 1f6fe09ea083bfc3304204cece1d1d5f5ea9ebc7002810c908da7e15cd6631eb
+MD5 72bfd759cbef47ef14b54f84ae5c4173 ChangeLog 5512
+RMD160 b01cf1ae2140a4d938115a909076f5f48fc2a9d2 ChangeLog 5512
+SHA256 1f6fe09ea083bfc3304204cece1d1d5f5ea9ebc7002810c908da7e15cd6631eb ChangeLog 5512
 MISC metadata.xml 350 RMD160 5211e204927a69b9a6db516ada2ecb6f999b3733 SHA1 7d738b5835510288a15729917f3cc272535ec550 SHA256 4c12367eb2d4a151bfdfe4c2809f164ae6092fd2448321a800cd1a3a063c085c
 MD5 792d2ecc8cee12c92c45b9878fdb2192 metadata.xml 350
 RMD160 5211e204927a69b9a6db516ada2ecb6f999b3733 metadata.xml 350
@@ -44,7 +44,7 @@ SHA256 510436a1bfd01ea605e11b6a2d5d6166eeee099565f106a54486eb8e922a40c8 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGUIHzyuNVb5qfaOYRAvTTAJ4locN/6eR8ooLK3D/wsyqG9cs3NACgy/ls
-NNxtAL6xMYWMPrTY7GaMndw=
-=i1cC
+iD4DBQFGUIqnyuNVb5qfaOYRAj9/AJjvPtWteZmBmkPOoosLc9bpc+3/AKDM19Xk
+b+FpiK459APRiAxZiuVcZQ==
+=27iY
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/ipw3945/ipw3945-1.2.1.ebuild b/net-wireless/ipw3945/ipw3945-1.2.1.ebuild
index d2ffebda5adf..3a8800c35d98 100644
--- a/net-wireless/ipw3945/ipw3945-1.2.1.ebuild
+++ b/net-wireless/ipw3945/ipw3945-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945/ipw3945-1.2.1.ebuild,v 1.1 2007/05/20 17:14:17 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945/ipw3945-1.2.1.ebuild,v 1.2 2007/05/20 17:51:25 phreak Exp $
 
 inherit linux-mod eutils
 
@@ -26,8 +26,6 @@ MODULE_NAMES="ipw3945(net/wireless:)"
 MODULESD_IPW3945_DOCS="README.ipw3945"
 KV_OBJ="ko"
 
-CONFIG_CHECK="NET_RADIO FW_LOADER IEEE80211 IEEE80211_CRYPT_CCMP IEEE80211_CRYPT_TKIP"
-ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
 ERROR_FW_LOADER="${P} requires Hotplug firmware loading support (CONFIG_FW_LOADER)."
 ERROR_IEEE80211="${P} requires support for Generic IEEE 802.11 Networking Stack (CONFIG_IEEE80211)."
 
@@ -38,6 +36,12 @@ pkg_setup() {
 
 	if kernel_is lt 2 6 18; then
 		die "${P} needs a kernel >=2.6.18! Please set your KERNEL_DIR or /usr/src/linux suitably"
+	elif kernel_is ge 2 6 22 ; then
+		CONFIG_CHECK="WLAN_80211 FW_LOADER IEEE80211 IEEE80211_CRYPT_CCMP IEEE80211_CRYPT_TKIP"
+		ERROR_WLAN_80211="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_WLAN_80211)."
+	else
+		CONFIG_CHECK="NET_RADIO FW_LOADER IEEE80211 IEEE80211_CRYPT_CCMP IEEE80211_CRYPT_TKIP"
+		ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
 	fi
 
 	linux-mod_pkg_setup