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
Package-Manager: portage-2.1.4

5 files changed, 69 insertions, 61 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/Manifest b/net-wireless/madwifi-ng/Manifest
index 79ccb94580c2..e144c526e432 100644
--- a/net-wireless/madwifi-ng/Manifest
+++ b/net-wireless/madwifi-ng/Manifest
@@ -13,22 +13,22 @@ SHA256 e068fbfaf9c2f27ac9670b6fc43939ceade0e6c40df88d5e23006be640ca0fbe files/ma
 DIST madwifi-0.9.3.1.tar.bz2 3488269 RMD160 5daad5c17d42ee0b5618d46213293c4d6289130b SHA1 96647476b70ec80c83a13e3d381776416f6ccbff SHA256 623aa90dd9da9c0140ae71d205c6e8cb32f8a555f0f12d873494df05a07945ec
 DIST madwifi-0.9.3.2.tar.bz2 3489208 RMD160 f20b7d954d7d3b4bda03ebb762868ed378514c8d SHA1 ccd8f4ba267df75ca002d8dbf66b09347e1bc0b6 SHA256 34ec9fc871edadf1742057152c0253484d95a534e51a48dbb2e11801e87a0a13
 DIST madwifi-0.9.3.3.tar.bz2 3489995 RMD160 ed4b5267171bb11801817b7ba358fe3b08377329 SHA1 13df0e407de0f5b733e5ff1b660ce2fac048b206 SHA256 7e38cb26d5b001e9fb36f48aaefdeee10d1dc57c83e675e3bbd0f1807a3305b7
-EBUILD madwifi-ng-0.9.3.1.ebuild 2609 RMD160 0360c43b922ce8512d7859c3cadae4cba0f01443 SHA1 a7f38f64e12ec47668632b25522e1dca4a47978b SHA256 ddc5312dce1ca282066ac1a02944638faef1dc20a6acce15076f355eccf36bc3
-MD5 d53a62756391ab02b659da9f953014c8 madwifi-ng-0.9.3.1.ebuild 2609
-RMD160 0360c43b922ce8512d7859c3cadae4cba0f01443 madwifi-ng-0.9.3.1.ebuild 2609
-SHA256 ddc5312dce1ca282066ac1a02944638faef1dc20a6acce15076f355eccf36bc3 madwifi-ng-0.9.3.1.ebuild 2609
-EBUILD madwifi-ng-0.9.3.2.ebuild 2547 RMD160 f6d32ff5121b41f3d539231c5eb4be4df975dfd0 SHA1 695a7585575d3ec8a323ecb3412f7c81548d2ca4 SHA256 490962c1ed65cbf8226a2eeb6b38af30fe14d19c65de1c09cb49936b7fc73c26
-MD5 4445047f48a3ba059cd422558adb2476 madwifi-ng-0.9.3.2.ebuild 2547
-RMD160 f6d32ff5121b41f3d539231c5eb4be4df975dfd0 madwifi-ng-0.9.3.2.ebuild 2547
-SHA256 490962c1ed65cbf8226a2eeb6b38af30fe14d19c65de1c09cb49936b7fc73c26 madwifi-ng-0.9.3.2.ebuild 2547
-EBUILD madwifi-ng-0.9.3.3.ebuild 2582 RMD160 ac9d4017a8d6d745504ec8f291fe31b8287f8f3b SHA1 00abce28174ce11227289a7052d9a21222ba7d4b SHA256 bce6f6515fc2435e015753704805888b3cc62acae1738231e6cbc49b60bc73b4
-MD5 26af00b406804b356e3b7463a7418f7a madwifi-ng-0.9.3.3.ebuild 2582
-RMD160 ac9d4017a8d6d745504ec8f291fe31b8287f8f3b madwifi-ng-0.9.3.3.ebuild 2582
-SHA256 bce6f6515fc2435e015753704805888b3cc62acae1738231e6cbc49b60bc73b4 madwifi-ng-0.9.3.3.ebuild 2582
-MISC ChangeLog 18111 RMD160 c2d49d0f5f9f5007b43119bfa38014bb593ab397 SHA1 85c1aa18de2ba7deb96efe331ad5768b7929b595 SHA256 e2b460fe9e8b9a200c35260ef70c4c144c9e4f617cc89df9db4018bcffebab6f
-MD5 b652f8be13faefaf469935525118b5a0 ChangeLog 18111
-RMD160 c2d49d0f5f9f5007b43119bfa38014bb593ab397 ChangeLog 18111
-SHA256 e2b460fe9e8b9a200c35260ef70c4c144c9e4f617cc89df9db4018bcffebab6f ChangeLog 18111
+EBUILD madwifi-ng-0.9.3.1.ebuild 2647 RMD160 a1afdfe3e91d1561618e4d7c4df85dbb75311503 SHA1 20d317d2bc8708ddb8ebd10e92cf1e86ba7e1596 SHA256 666378e091abde5fc4580f2c3d99e8d8372eba2759c50cdfa9b5b5ce62e3fec3
+MD5 bd7d49b79082a58f91ea75e2fe1bb3ce madwifi-ng-0.9.3.1.ebuild 2647
+RMD160 a1afdfe3e91d1561618e4d7c4df85dbb75311503 madwifi-ng-0.9.3.1.ebuild 2647
+SHA256 666378e091abde5fc4580f2c3d99e8d8372eba2759c50cdfa9b5b5ce62e3fec3 madwifi-ng-0.9.3.1.ebuild 2647
+EBUILD madwifi-ng-0.9.3.2.ebuild 2578 RMD160 ec2ca52066d0516bbe9621bf1ee2da21927e4aba SHA1 c3d072110860868e9d9d6e4c3a763acc1d6eb597 SHA256 7497a7c5dc896b6d70582102f4e7ad7297b4c1e2f00466e799d9ded8a158b05e
+MD5 0204b92e614a18742effc113ed340ec2 madwifi-ng-0.9.3.2.ebuild 2578
+RMD160 ec2ca52066d0516bbe9621bf1ee2da21927e4aba madwifi-ng-0.9.3.2.ebuild 2578
+SHA256 7497a7c5dc896b6d70582102f4e7ad7297b4c1e2f00466e799d9ded8a158b05e madwifi-ng-0.9.3.2.ebuild 2578
+EBUILD madwifi-ng-0.9.3.3.ebuild 2651 RMD160 b0de3d9aaf2e50ca47f7472c6d5ac23c8a46cc6a SHA1 6c8cd997b87d2c1d74a494937339a3b8b7c0fe21 SHA256 f24cb6c024ef6f1f61ea6dc2d4136d0e73f210168b9dde24ec93db8f72cecc51
+MD5 441dc7cb0e05cb18915f179a111e770c madwifi-ng-0.9.3.3.ebuild 2651
+RMD160 b0de3d9aaf2e50ca47f7472c6d5ac23c8a46cc6a madwifi-ng-0.9.3.3.ebuild 2651
+SHA256 f24cb6c024ef6f1f61ea6dc2d4136d0e73f210168b9dde24ec93db8f72cecc51 madwifi-ng-0.9.3.3.ebuild 2651
+MISC ChangeLog 18425 RMD160 bd32d87456ea9fc92e0e37c2c06c0c948686b2cd SHA1 79dd25c5d50c7c78fa33f226530c782a2ebc28ae SHA256 726ec01cc190dc675424feb335384ed53d03c89cad211abbdecd43f53d273e42
+MD5 99b79f475a90199d76a7d718d7d1cc81 ChangeLog 18425
+RMD160 bd32d87456ea9fc92e0e37c2c06c0c948686b2cd ChangeLog 18425
+SHA256 726ec01cc190dc675424feb335384ed53d03c89cad211abbdecd43f53d273e42 ChangeLog 18425
 MISC metadata.xml 256 RMD160 af310503f82b971c1d6e8e1a5282d455f3427a3e SHA1 c7c8144660775d9edc93ea9cfb820944f7eb3109 SHA256 0bece0d60e3a88523cbaab4bfaafc904a11efd49099bc37388954a243a096f59
 MD5 1e76dba4899dcc307c5a880a729e20ee metadata.xml 256
 RMD160 af310503f82b971c1d6e8e1a5282d455f3427a3e metadata.xml 256
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"