Add wireless-tools to RDEPEND and add back the injection useflag/patch. Closes bug #159006 and bug #174198

Package-Manager: portage-2.1.2.4

4 files changed, 117 insertions, 15 deletions

diff --git a/net-wireless/madwifi-ng/ChangeLog b/net-wireless/madwifi-ng/ChangeLog
index f7ed18b92401..7e8dc456446e 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.33 2007/04/09 19:53:25 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/ChangeLog,v 1.34 2007/04/16 19:37:23 steev Exp $
+
+*madwifi-ng-0.9.3-r3 (16 Apr 2007)
+
+  16 Apr 2007; Steev Klimaszewski <steev@gentoo.org>
+  +madwifi-ng-0.9.3-r3.ebuild:
+  Add wireless-tools to RDEPEND and add back the injection useflag/patch.
+  Closes bug #159006 and bug #174198.
 
   09 Apr 2007; Marcus D. Hanwell <cryos@gentoo.org>
   madwifi-ng-0.9.3-r2.ebuild:
diff --git a/net-wireless/madwifi-ng/Manifest b/net-wireless/madwifi-ng/Manifest
index a93e463e4102..3a3297a18e8b 100644
--- a/net-wireless/madwifi-ng/Manifest
+++ b/net-wireless/madwifi-ng/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX madwifi-association-fix.patch 2530 RMD160 405689db0b214e2e4378a2471a9584b2195440e3 SHA1 c4d67684238c51a4632ae9e01caabe9750f705fa SHA256 787fc4061571fe87f0a1575189743974ebbce73c7ee07e66d37731f234caf8ff
 MD5 6f2c3ea19061fa433c6777e202fb636c files/madwifi-association-fix.patch 2530
 RMD160 405689db0b214e2e4378a2471a9584b2195440e3 files/madwifi-association-fix.patch 2530
@@ -47,10 +44,14 @@ EBUILD madwifi-ng-0.9.3-r2.ebuild 2771 RMD160 cf350ff3a98dc9651b8e19b49f2aa3f37c
 MD5 52d9b4b6c091c21ddfa7b1c7adbbf81a madwifi-ng-0.9.3-r2.ebuild 2771
 RMD160 cf350ff3a98dc9651b8e19b49f2aa3f37caff25a madwifi-ng-0.9.3-r2.ebuild 2771
 SHA256 c3d0fc8c880bfc2a2d30481ca43448ada8bd0d82d526241cade5ecc8f9353f6b madwifi-ng-0.9.3-r2.ebuild 2771
-MISC ChangeLog 15581 RMD160 ef0062553db1b4649d5eb1bf73b1aea9737473cd SHA1 41e27d844fdd6f7b0cd408e6b8d48900fb83a578 SHA256 b5f2cd7ef00c67689753098e3ad1c55a096ab67607fc8c32a933f3765d810040
-MD5 2555716df119c9e6ca94fc245a550147 ChangeLog 15581
-RMD160 ef0062553db1b4649d5eb1bf73b1aea9737473cd ChangeLog 15581
-SHA256 b5f2cd7ef00c67689753098e3ad1c55a096ab67607fc8c32a933f3765d810040 ChangeLog 15581
+EBUILD madwifi-ng-0.9.3-r3.ebuild 2878 RMD160 1fbef998627b76383e67b0f29d5b23ec49abeaec SHA1 3b26d544e43221e99bfe92ef373a47dee378e83b SHA256 d6a39a5ab69fd62486ebec4028f2b336a5039f5e29410be1ec7c74cfb926bfd9
+MD5 f95e7d2e83b401da4a05548e7d299992 madwifi-ng-0.9.3-r3.ebuild 2878
+RMD160 1fbef998627b76383e67b0f29d5b23ec49abeaec madwifi-ng-0.9.3-r3.ebuild 2878
+SHA256 d6a39a5ab69fd62486ebec4028f2b336a5039f5e29410be1ec7c74cfb926bfd9 madwifi-ng-0.9.3-r3.ebuild 2878
+MISC ChangeLog 15814 RMD160 05b2e488e745139f2159b6a26049e55d0c49a1fe SHA1 fe74d739b1681877d53a5141a51e285ddb868944 SHA256 b1c47604f33c029c88e177afa38b6fec4ccbec75e7cb9e92a3a5c443cf89eca2
+MD5 4d598d58f4d00a49cd0a57171d3b271e ChangeLog 15814
+RMD160 05b2e488e745139f2159b6a26049e55d0c49a1fe ChangeLog 15814
+SHA256 b1c47604f33c029c88e177afa38b6fec4ccbec75e7cb9e92a3a5c443cf89eca2 ChangeLog 15814
 MISC metadata.xml 256 RMD160 af310503f82b971c1d6e8e1a5282d455f3427a3e SHA1 c7c8144660775d9edc93ea9cfb820944f7eb3109 SHA256 0bece0d60e3a88523cbaab4bfaafc904a11efd49099bc37388954a243a096f59
 MD5 1e76dba4899dcc307c5a880a729e20ee metadata.xml 256
 RMD160 af310503f82b971c1d6e8e1a5282d455f3427a3e metadata.xml 256
@@ -61,10 +62,6 @@ SHA256 fad1921d8e6f2fbd11167b5ddc0af6eb24ac70b17b7e8e5fa6eec1400fe0bae0 files/di
 MD5 08d87d4cb379b29c4e24063b03dc75a3 files/digest-madwifi-ng-0.9.3-r2 247
 RMD160 a3b16a034a59b6f8208c0e1e29653d0756de0b8a files/digest-madwifi-ng-0.9.3-r2 247
 SHA256 c35fa1fbdf62a5dc311f54e25a329e6fe220b00e6858f8e5335149056ab97bf0 files/digest-madwifi-ng-0.9.3-r2 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGGpm7ntT9W3vfTuoRAv/jAJ0fhf5Gz+J+4gU/r+unRDkdnakv+ACeOKsC
-Q2bosLgDCYLv9uhtyIOtUCA=
-=q90R
------END PGP SIGNATURE-----
+MD5 08d87d4cb379b29c4e24063b03dc75a3 files/digest-madwifi-ng-0.9.3-r3 247
+RMD160 a3b16a034a59b6f8208c0e1e29653d0756de0b8a files/digest-madwifi-ng-0.9.3-r3 247
+SHA256 c35fa1fbdf62a5dc311f54e25a329e6fe220b00e6858f8e5335149056ab97bf0 files/digest-madwifi-ng-0.9.3-r3 247
diff --git a/net-wireless/madwifi-ng/files/digest-madwifi-ng-0.9.3-r3 b/net-wireless/madwifi-ng/files/digest-madwifi-ng-0.9.3-r3
new file mode 100644
index 000000000000..c898ea732b56
--- /dev/null
+++ b/net-wireless/madwifi-ng/files/digest-madwifi-ng-0.9.3-r3
@@ -0,0 +1,3 @@
+MD5 26c31e8e1528fd098e3aaa11c0d34d99 madwifi-0.9.3.tar.bz2 3488332
+RMD160 52eb553669ab83a9c594afd4eb1e297bea07089c madwifi-0.9.3.tar.bz2 3488332
+SHA256 847596646417abbdce9cfd0e1dca2cced29c6a8b814d1bd28d0c7301e9e4e9d8 madwifi-0.9.3.tar.bz2 3488332
diff --git a/net-wireless/madwifi-ng/madwifi-ng-0.9.3-r3.ebuild b/net-wireless/madwifi-ng/madwifi-ng-0.9.3-r3.ebuild
new file mode 100644
index 000000000000..399fe6807be8
--- /dev/null
+++ b/net-wireless/madwifi-ng/madwifi-ng-0.9.3-r3.ebuild
@@ -0,0 +1,95 @@
+# 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-r3.ebuild,v 1.1 2007/04/16 19:37:23 steev Exp $
+
+inherit linux-mod
+
+MY_P=${PN/-ng/}-${PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Next Generation driver for Atheros based IEEE 802.11a/b/g wireless LAN cards"
+HOMEPAGE="http://www.madwifi.org/"
+SRC_URI="mirror://sourceforge/madwifi/madwifi-${PV}.tar.bz2"
+
+LICENSE="atheros-hal
+	|| ( BSD GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="injection"
+
+DEPEND="app-arch/sharutils"
+RDEPEND="!net-wireless/madwifi-old
+		net-wireless/wireless-tools
+		~net-wireless/madwifi-ng-tools-${PV:0:5}"
+
+CONFIG_CHECK="CRYPTO NET_RADIO SYSCTL"
+ERROR_CRYPTO="${P} requires Cryptographic API support (CONFIG_CRYPTO)."
+ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
+ERROR_SYSCTL="${P} requires Sysctl support (CONFIG_SYSCTL)."
+BUILD_TARGETS="all"
+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)"
+
+	BUILD_PARAMS="KERNELPATH=${KV_OUT_DIR}"
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-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
+	done
+}
+
+src_install() {
+	linux-mod_src_install
+
+	dodoc README THANKS docs/users-guide.pdf docs/WEP-HOWTO.txt
+
+	# install headers for use by
+	# net-wireless/wpa_supplicant and net-wireless/hostapd
+	insinto /usr/include/madwifi/include/
+	doins include/*.h
+	insinto /usr/include/madwifi/net80211
+	doins net80211/*.h
+}
+
+pkg_postinst() {
+	local moddir="${ROOT}/lib/modules/${KV_FULL}/net/"
+
+	linux-mod_pkg_postinst
+
+	einfo
+	einfo "Interfaces (athX) are now automatically created upon loading the ath_pci"
+	einfo "module."
+	einfo
+	einfo "The type of the created interface can be controlled through the 'autocreate'"
+	einfo "module parameter."
+	einfo
+	einfo "As of net-wireless/madwifi-ng-0.9.3 rate control module selection is done at"
+	einfo "module load time via the 'ratectl' module parameter. USE flags amrr and onoe"
+	einfo "no longer serve any purpose."
+	einfo
+	einfo "If you use net-wireless/wpa_supplicant or net-wireless/hostapd with madwifi"
+	einfo "you should remerge them now."
+	einfo
+}