Fix quotes in 0.9.3.2 and 0.9.3.1 and add a check for CONFIG_KMOD in

0.9.3.3 - this should fix bug #174168
(Portage version: 2.1.4)

4 files changed, 53 insertions, 45 deletions

diff --git a/net-wireless/madwifi-ng/ChangeLog b/net-wireless/madwifi-ng/ChangeLog
index 7df5d5ce7147..0db57b77e245 100644
--- a/net-wireless/madwifi-ng/ChangeLog
+++ b/net-wireless/madwifi-ng/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/madwifi-ng
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/ChangeLog,v 1.48 2007/10/26 13:56:08 beandog Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/ChangeLog,v 1.49 2008/01/16 15:56:47 steev Exp $
+
+  16 Jan 2008; Steev Klimaszewski <steev@gentoo.org>
+  madwifi-ng-0.9.3.3.ebuild:
+  Add a check for CONFIG_KMOD and error if it is not set.  This should fix 
+  bug #174168.  Thanks to David Brigada <brigad@rpi.edu> for reporting, 
+  and Gordon Malm <bugs-gentoo-org-02@bumpin.org> for his work tracking it 
+  down.
 
   26 Oct 2007; Steve Dibb <beandog@gentoo.org> madwifi-ng-0.9.3.3.ebuild:
   amd64 stable, security bug 195705
diff --git a/net-wireless/madwifi-ng/madwifi-ng-0.9.3.1.ebuild b/net-wireless/madwifi-ng/madwifi-ng-0.9.3.1.ebuild
index 31654f5278db..572b9cf66331 100644
--- a/net-wireless/madwifi-ng/madwifi-ng-0.9.3.1.ebuild
+++ b/net-wireless/madwifi-ng/madwifi-ng-0.9.3.1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/madwifi-ng-0.9.3.1.ebuild,v 1.5 2007/07/07 11:01:13 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/madwifi-ng-0.9.3.1.ebuild,v 1.6 2008/01/16 15:56:47 steev Exp $
 
 inherit linux-mod
 
 MY_P=${PN/-ng/}-${PV}
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="Next Generation driver for Atheros based IEEE 802.11a/b/g wireless LAN cards"
 HOMEPAGE="http://www.madwifi.org/"
@@ -32,34 +32,34 @@ MODULESD_ATH_PCI_DOCS="README"
 pkg_setup() {
 	linux-mod_pkg_setup
 
-	MODULE_NAMES="ath_hal(net:${S}/ath_hal)
-				wlan(net:${S}/net80211)
-				wlan_acl(net:${S}/net80211)
-				wlan_ccmp(net:${S}/net80211)
-				wlan_tkip(net:${S}/net80211)
-				wlan_wep(net:${S}/net80211)
-				wlan_xauth(net:${S}/net80211)
-				wlan_scan_sta(net:${S}/net80211)
-				wlan_scan_ap(net:${S}/net80211)
-				ath_rate_amrr(net:${S}/ath_rate/amrr)
-				ath_rate_onoe(net:${S}/ath_rate/onoe)
-				ath_rate_sample(net:${S}/ath_rate/sample)
-				ath_pci(net:${S}/ath)"
+	MODULE_NAMES="ath_hal(net:"${S}"/ath_hal)
+				wlan(net:"${S}"/net80211)
+				wlan_acl(net:"${S}"/net80211)
+				wlan_ccmp(net:"${S}"/net80211)
+				wlan_tkip(net:"${S}"/net80211)
+				wlan_wep(net:"${S}"/net80211)
+				wlan_xauth(net:"${S}"/net80211)
+				wlan_scan_sta(net:"${S}"/net80211)
+				wlan_scan_ap(net:"${S}"/net80211)
+				ath_rate_amrr(net:"${S}"/ath_rate/amrr)
+				ath_rate_onoe(net:"${S}"/ath_rate/onoe)
+				ath_rate_sample(net:"${S}"/ath_rate/sample)
+				ath_pci(net:"${S}"/ath)"
 
 	BUILD_PARAMS="KERNELPATH=${KV_OUT_DIR}"
 }
 
 src_unpack() {
-	unpack ${A}
+	unpack "${A}"
 
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-0.9.3-uudecode-gcda-fix.patch
-	if use injection; then epatch ${FILESDIR}/${PN}-r1886.patch; fi
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-0.9.3-uudecode-gcda-fix.patch"
+	if use injection; then epatch "${FILESDIR}/${PN}-r1886.patch"; fi
 	for dir in ath ath_hal net80211 ath_rate ath_rate/amrr ath_rate/onoe ath_rate/sample; do
-		convert_to_m ${S}/${dir}/Makefile
+		convert_to_m "${S}"/${dir}/Makefile
 	done
 
-	kernel_is ge 2 6 22 && epatch ${FILESDIR}/madwifi-2.6.22.patch
+	kernel_is ge 2 6 22 && epatch "${FILESDIR}"/madwifi-2.6.22.patch
 }
 
 src_install() {
diff --git a/net-wireless/madwifi-ng/madwifi-ng-0.9.3.2.ebuild b/net-wireless/madwifi-ng/madwifi-ng-0.9.3.2.ebuild
index 0fd9c07ff8c6..0ff331b34b1d 100644
--- a/net-wireless/madwifi-ng/madwifi-ng-0.9.3.2.ebuild
+++ b/net-wireless/madwifi-ng/madwifi-ng-0.9.3.2.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/madwifi-ng/madwifi-ng-0.9.3.2.ebuild,v 1.4 2007/08/15 21:29:30 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/madwifi-ng-0.9.3.2.ebuild,v 1.5 2008/01/16 15:56:47 steev Exp $
 
 inherit linux-mod
 
@@ -32,31 +32,31 @@ MODULESD_ATH_PCI_DOCS="README"
 pkg_setup() {
 	linux-mod_pkg_setup
 
-	MODULE_NAMES="ath_hal(net:${S}/ath_hal)
-				wlan(net:${S}/net80211)
-				wlan_acl(net:${S}/net80211)
-				wlan_ccmp(net:${S}/net80211)
-				wlan_tkip(net:${S}/net80211)
-				wlan_wep(net:${S}/net80211)
-				wlan_xauth(net:${S}/net80211)
-				wlan_scan_sta(net:${S}/net80211)
-				wlan_scan_ap(net:${S}/net80211)
-				ath_rate_amrr(net:${S}/ath_rate/amrr)
-				ath_rate_onoe(net:${S}/ath_rate/onoe)
-				ath_rate_sample(net:${S}/ath_rate/sample)
-				ath_pci(net:${S}/ath)"
+	MODULE_NAMES="ath_hal(net:"${S}"/ath_hal)
+				wlan(net:"${S}"/net80211)
+				wlan_acl(net:"${S}"/net80211)
+				wlan_ccmp(net:"${S}"/net80211)
+				wlan_tkip(net:"${S}"/net80211)
+				wlan_wep(net:"${S}"/net80211)
+				wlan_xauth(net:"${S}"/net80211)
+				wlan_scan_sta(net:"${S}"/net80211)
+				wlan_scan_ap(net:"${S}"/net80211)
+				ath_rate_amrr(net:"${S}"/ath_rate/amrr)
+				ath_rate_onoe(net:"${S}"/ath_rate/onoe)
+				ath_rate_sample(net:"${S}"/ath_rate/sample)
+				ath_pci(net:"${S}"/ath)"
 
 	BUILD_PARAMS="KERNELPATH=${KV_OUT_DIR}"
 }
 
 src_unpack() {
-	unpack ${A}
+	unpack "${A}"
 
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-0.9.3-uudecode-gcda-fix.patch
-	if use injection; then epatch ${FILESDIR}/${PN}-r1886.patch; fi
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-0.9.3-uudecode-gcda-fix.patch"
+	if use injection; then epatch "${FILESDIR}/${PN}-r1886.patch"; fi
 	for dir in ath ath_hal net80211 ath_rate ath_rate/amrr ath_rate/onoe ath_rate/sample; do
-		convert_to_m ${S}/${dir}/Makefile
+		convert_to_m "${S}"/${dir}/Makefile
 	done
 }
 
diff --git a/net-wireless/madwifi-ng/madwifi-ng-0.9.3.3.ebuild b/net-wireless/madwifi-ng/madwifi-ng-0.9.3.3.ebuild
index d0a2f74ad2e9..3201a491c642 100644
--- a/net-wireless/madwifi-ng/madwifi-ng-0.9.3.3.ebuild
+++ b/net-wireless/madwifi-ng/madwifi-ng-0.9.3.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/madwifi-ng-0.9.3.3.ebuild,v 1.4 2007/10/26 13:56:08 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/madwifi-ng-0.9.3.3.ebuild,v 1.5 2008/01/16 15:56:47 steev Exp $
 
 inherit linux-mod
 
@@ -22,10 +22,11 @@ RDEPEND="!net-wireless/madwifi-old
 		net-wireless/wireless-tools
 		~net-wireless/madwifi-ng-tools-${PV}"
 
-CONFIG_CHECK="CRYPTO WIRELESS_EXT SYSCTL"
+CONFIG_CHECK="CRYPTO WIRELESS_EXT SYSCTL CONFIG_KMOD"
 ERROR_CRYPTO="${P} requires Cryptographic API support (CONFIG_CRYPTO)."
 ERROR_WIRELESS_EXT="${P} requires CONFIG_WIRELESS_EXT selected by Wireless LAN drivers (non-hamradio) & Wireless Extensions"
 ERROR_SYSCTL="${P} requires Sysctl support (CONFIG_SYSCTL)."
+ERROR_KMOD="${F} requires CONFIG_KMOD to be set to y or m"
 BUILD_TARGETS="all"
 MODULESD_ATH_PCI_DOCS="README"