From c9066e85e3747b87572b416d6706d92d040cbf23 Mon Sep 17 00:00:00 2001 From: Stefan Schweizer Date: Tue, 10 Jul 2007 09:49:50 +0000 Subject: Fix CONFIG_CHECKs (Portage version: 2.1.3_rc7) --- net-wireless/ipw3945/ChangeLog | 6 +++++- net-wireless/ipw3945/ipw3945-1.0.5.ebuild | 8 ++++---- net-wireless/ipw3945/ipw3945-1.2.0.ebuild | 6 +++--- net-wireless/ipw3945/ipw3945-1.2.1.ebuild | 10 +++------- 4 files changed, 15 insertions(+), 15 deletions(-) (limited to 'net-wireless/ipw3945') diff --git a/net-wireless/ipw3945/ChangeLog b/net-wireless/ipw3945/ChangeLog index 909df3a06721..61cd4d478dde 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.28 2007/05/20 17:51:25 phreak Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945/ChangeLog,v 1.29 2007/07/10 09:49:50 genstef Exp $ + + 10 Jul 2007; Stefan Schweizer ipw3945-1.0.5.ebuild, + ipw3945-1.2.0.ebuild, ipw3945-1.2.1.ebuild: + Fix CONFIG_CHECKs 20 May 2007; Christian Heim ipw3945-1.2.1.ebuild: Make ipw3945-1.2.1 aware of the changed CONFIG options of Linux 2.6.22 diff --git a/net-wireless/ipw3945/ipw3945-1.0.5.ebuild b/net-wireless/ipw3945/ipw3945-1.0.5.ebuild index 80d56847667d..b7dd30aa717b 100644 --- a/net-wireless/ipw3945/ipw3945-1.0.5.ebuild +++ b/net-wireless/ipw3945/ipw3945-1.0.5.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# 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.0.5.ebuild,v 1.3 2006/12/07 21:04:16 phreak Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945/ipw3945-1.0.5.ebuild,v 1.4 2007/07/10 09:49:50 genstef Exp $ inherit linux-mod eutils @@ -27,8 +27,8 @@ BUILD_TARGETS="all" MODULE_NAMES="ipw3945(net/wireless:)" MODULESD_IPW3945_DOCS="README.ipw3945" -CONFIG_CHECK="NET_RADIO FW_LOADER !IPW3945" -ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)." +CONFIG_CHECK="WIRELESS_EXT FW_LOADER !IPW3945" +ERROR_WIRELESS_EXT="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions" ERROR_FW_LOADER="${P} requires Hotplug firmware loading support (CONFIG_FW_LOADER)." ERROR_IPW3945="${P} requires the in-kernel version of the IPW3945 driver to be disabled (CONFIG_IPW3945)" diff --git a/net-wireless/ipw3945/ipw3945-1.2.0.ebuild b/net-wireless/ipw3945/ipw3945-1.2.0.ebuild index 069227a1c8b5..556ee7057dbd 100644 --- a/net-wireless/ipw3945/ipw3945-1.2.0.ebuild +++ b/net-wireless/ipw3945/ipw3945-1.2.0.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.0.ebuild,v 1.7 2007/02/15 23:56:17 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945/ipw3945-1.2.0.ebuild,v 1.8 2007/07/10 09:49:50 genstef Exp $ inherit linux-mod eutils @@ -26,8 +26,8 @@ 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)." +CONFIG_CHECK="WIRELESS_EXT FW_LOADER IEEE80211 IEEE80211_CRYPT_CCMP IEEE80211_CRYPT_TKIP" +ERROR_WIRELESS_EXT="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions" 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)." diff --git a/net-wireless/ipw3945/ipw3945-1.2.1.ebuild b/net-wireless/ipw3945/ipw3945-1.2.1.ebuild index 3a8800c35d98..8837e5f36213 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.2 2007/05/20 17:51:25 phreak Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945/ipw3945-1.2.1.ebuild,v 1.3 2007/07/10 09:49:50 genstef Exp $ inherit linux-mod eutils @@ -26,6 +26,8 @@ MODULE_NAMES="ipw3945(net/wireless:)" MODULESD_IPW3945_DOCS="README.ipw3945" KV_OBJ="ko" +CONFIG_CHECK="WIRELESS_EXT FW_LOADER IEEE80211 IEEE80211_CRYPT_CCMP IEEE80211_CRYPT_TKIP" +ERROR_WIRELESS_EXT="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions" 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)." @@ -36,12 +38,6 @@ 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 -- cgit v1.2.3-65-gdbad