From: Stephen Klimaszewski Date: Wed, 21 Mar 2007 00:22:15 +0000 (+0000) Subject: Fix up the ebuild a bit (and revbump because of building all the rate control X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d2e8b7f005d5f6b0be2d95d6ac31429de73ddeb3;p=gentoo.git Fix up the ebuild a bit (and revbump because of building all the rate control Package-Manager: portage-2.1.2.2 --- diff --git a/net-wireless/madwifi-ng/ChangeLog b/net-wireless/madwifi-ng/ChangeLog index 7b020792743c..d52a6e68a444 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.27 2007/03/20 01:40:22 steev Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/ChangeLog,v 1.28 2007/03/21 00:22:15 steev Exp $ + +*madwifi-ng-0.9.3-r1 (21 Mar 2007) + + 21 Mar 2007; Steev Klimaszewski + -madwifi-ng-0.9.3.ebuild, +madwifi-ng-0.9.3-r1.ebuild: + Fix up the ebuild a bit (and revbump because of building all the rate control + modules now) - thanks to the unknown person in bug #171529. *madwifi-ng-0.9.3 (20 Mar 2007) diff --git a/net-wireless/madwifi-ng/Manifest b/net-wireless/madwifi-ng/Manifest index 9fcada62b3d1..3f4cd7c89cc4 100644 --- a/net-wireless/madwifi-ng/Manifest +++ b/net-wireless/madwifi-ng/Manifest @@ -40,14 +40,14 @@ EBUILD madwifi-ng-0.9.2.1.ebuild 4292 RMD160 9c2f2d8661ba28d72d7b1d251380ace7a70 MD5 9ee2bb28973ce555eefce8adae20923a madwifi-ng-0.9.2.1.ebuild 4292 RMD160 9c2f2d8661ba28d72d7b1d251380ace7a70ca45a madwifi-ng-0.9.2.1.ebuild 4292 SHA256 c4c97df7bcea36d108baba660a13b83f0ee36779371675d9aa0fdafaf0ec8d6c madwifi-ng-0.9.2.1.ebuild 4292 -EBUILD madwifi-ng-0.9.3.ebuild 3700 RMD160 c8ba7e31406e91a6af11c13e2dedde8ca6c8778c SHA1 314f436668cd98fd1562fce9389a85f93d172fd8 SHA256 ae073b9bcb9426899cdf553cd824163308040a3a288c76aef1c7ceec753b9ae5 -MD5 4ac4fa2ead62f6fb0c11bb583228f1b9 madwifi-ng-0.9.3.ebuild 3700 -RMD160 c8ba7e31406e91a6af11c13e2dedde8ca6c8778c madwifi-ng-0.9.3.ebuild 3700 -SHA256 ae073b9bcb9426899cdf553cd824163308040a3a288c76aef1c7ceec753b9ae5 madwifi-ng-0.9.3.ebuild 3700 -MISC ChangeLog 14467 RMD160 18ec181c12a71a50f5be7b8bd85b019e89a4204f SHA1 94d7872067bf30f661f8d5b7299b4585895d21b3 SHA256 68b11bbd4d2e671557d222552a3216b2b379194d86de2604fd2e37e90b23c0ef -MD5 f016b59bbc600cf765ddde80ae368a1c ChangeLog 14467 -RMD160 18ec181c12a71a50f5be7b8bd85b019e89a4204f ChangeLog 14467 -SHA256 68b11bbd4d2e671557d222552a3216b2b379194d86de2604fd2e37e90b23c0ef ChangeLog 14467 +EBUILD madwifi-ng-0.9.3-r1.ebuild 2731 RMD160 10a36c209d06230d6cee9f3ecb2f033230e62940 SHA1 ec7b9b03ac9c79f6eb76c892494aba39076d22b3 SHA256 d397dd0063ab9d6850f55c2fd901ea73bd1b75a4dcd6e3206ba4df95c995fcfd +MD5 e8b1d138fd2bf1201a8aa724d5211aef madwifi-ng-0.9.3-r1.ebuild 2731 +RMD160 10a36c209d06230d6cee9f3ecb2f033230e62940 madwifi-ng-0.9.3-r1.ebuild 2731 +SHA256 d397dd0063ab9d6850f55c2fd901ea73bd1b75a4dcd6e3206ba4df95c995fcfd madwifi-ng-0.9.3-r1.ebuild 2731 +MISC ChangeLog 14756 RMD160 823c5d3358b6cdb0ca3ca6aece5eb401e09b6cfd SHA1 0db91a72baf1d2a0e58045939974e54a30c657af SHA256 d2896ab56eea0c36059c9f8737f907b00949e050f46faaf64308bd512b457aea +MD5 e7df5fa8416f6fa42a2311c86269c0a2 ChangeLog 14756 +RMD160 823c5d3358b6cdb0ca3ca6aece5eb401e09b6cfd ChangeLog 14756 +SHA256 d2896ab56eea0c36059c9f8737f907b00949e050f46faaf64308bd512b457aea ChangeLog 14756 MISC metadata.xml 256 RMD160 af310503f82b971c1d6e8e1a5282d455f3427a3e SHA1 c7c8144660775d9edc93ea9cfb820944f7eb3109 SHA256 0bece0d60e3a88523cbaab4bfaafc904a11efd49099bc37388954a243a096f59 MD5 1e76dba4899dcc307c5a880a729e20ee metadata.xml 256 RMD160 af310503f82b971c1d6e8e1a5282d455f3427a3e metadata.xml 256 @@ -55,6 +55,6 @@ SHA256 0bece0d60e3a88523cbaab4bfaafc904a11efd49099bc37388954a243a096f59 metadata MD5 4759e10919b6002661f86f34d4d1bc7b files/digest-madwifi-ng-0.9.2.1 253 RMD160 2e13cbbae0eb8588a73d66fd4760e0c2dcd3f077 files/digest-madwifi-ng-0.9.2.1 253 SHA256 fad1921d8e6f2fbd11167b5ddc0af6eb24ac70b17b7e8e5fa6eec1400fe0bae0 files/digest-madwifi-ng-0.9.2.1 253 -MD5 08d87d4cb379b29c4e24063b03dc75a3 files/digest-madwifi-ng-0.9.3 247 -RMD160 a3b16a034a59b6f8208c0e1e29653d0756de0b8a files/digest-madwifi-ng-0.9.3 247 -SHA256 c35fa1fbdf62a5dc311f54e25a329e6fe220b00e6858f8e5335149056ab97bf0 files/digest-madwifi-ng-0.9.3 247 +MD5 08d87d4cb379b29c4e24063b03dc75a3 files/digest-madwifi-ng-0.9.3-r1 247 +RMD160 a3b16a034a59b6f8208c0e1e29653d0756de0b8a files/digest-madwifi-ng-0.9.3-r1 247 +SHA256 c35fa1fbdf62a5dc311f54e25a329e6fe220b00e6858f8e5335149056ab97bf0 files/digest-madwifi-ng-0.9.3-r1 247 diff --git a/net-wireless/madwifi-ng/files/digest-madwifi-ng-0.9.3 b/net-wireless/madwifi-ng/files/digest-madwifi-ng-0.9.3-r1 similarity index 100% rename from net-wireless/madwifi-ng/files/digest-madwifi-ng-0.9.3 rename to net-wireless/madwifi-ng/files/digest-madwifi-ng-0.9.3-r1 diff --git a/net-wireless/madwifi-ng/madwifi-ng-0.9.3.ebuild b/net-wireless/madwifi-ng/madwifi-ng-0.9.3-r1.ebuild similarity index 57% rename from net-wireless/madwifi-ng/madwifi-ng-0.9.3.ebuild rename to net-wireless/madwifi-ng/madwifi-ng-0.9.3-r1.ebuild index 88ddbd252f38..41b30759dca3 100644 --- a/net-wireless/madwifi-ng/madwifi-ng-0.9.3.ebuild +++ b/net-wireless/madwifi-ng/madwifi-ng-0.9.3-r1.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.ebuild,v 1.1 2007/03/20 01:40:22 steev Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/madwifi-ng-0.9.3-r1.ebuild,v 1.1 2007/03/21 00:22:15 steev Exp $ inherit linux-mod @@ -16,7 +16,6 @@ LICENSE="atheros-hal SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="amrr injection onoe" DEPEND="app-arch/sharutils" RDEPEND="!net-wireless/madwifi-old ~net-wireless/madwifi-ng-tools-${PV:0:5}" @@ -39,37 +38,19 @@ pkg_setup() { wlan_wep(net:${S}/net80211) wlan_xauth(net:${S}/net80211) wlan_scan_sta(net:${S}/net80211) - wlan_scan_ap(net:${S}/net80211)" - - BUILD_PARAMS="KERNELPATH=${KV_OUT_DIR}" - - if use amrr && use onoe; then - eerror - eerror "USE=\"amrr onoe\" is invalid, you can only specify one at a time." - eerror - die "USE=\"amrr onoe\" is invalid" - fi - - if use amrr; then - MODULE_NAMES="${MODULE_NAMES} ath_rate_amrr(net:${S}/ath_rate/amrr)" - BUILD_PARAMS="${BUILD_PARAMS} ATH_RATE=ath_rate/amrr" - elif use onoe; then - MODULE_NAMES="${MODULE_NAMES} ath_rate_onoe(net:${S}/ath_rate/onoe)" - BUILD_PARAMS="${BUILD_PARAMS} ATH_RATE=ath_rate/onoe" - else - MODULE_NAMES="${MODULE_NAMES} ath_rate_sample(net:${S}/ath_rate/sample)" - BUILD_PARAMS="${BUILD_PARAMS} ATH_RATE=ath_rate/sample" - fi - - MODULE_NAMES="${MODULE_NAMES} ath_pci(net:${S}/ath)" + 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)" } src_unpack() { unpack ${A} cd ${S} - epatch ${FILESDIR}/${PN}-0.9.3-uudecode-gcda-fix.patch - for dir in ath net80211 ath_rate/amrr ath_rate/onoe ath_rate/sample; do + epatch ${FILESDIR}/${PN}-${PV}-uudecode-gcda-fix.patch + 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 } @@ -90,18 +71,6 @@ src_install() { pkg_postinst() { local moddir="${ROOT}/lib/modules/${KV_FULL}/net/" - einfo "Removing old ath_rate modules" - if use amrr; then - [[ -f "${moddir}/ath_rate_onoe.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_onoe.${KV_OBJ}" - [[ -f "${moddir}/ath_rate_sample.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_sample.${KV_OBJ}" - elif use onoe; then - [[ -f "${moddir}/ath_rate_amrr.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_amrr.${KV_OBJ}" - [[ -f "${moddir}/ath_rate_sample.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_sample.${KV_OBJ}" - else - [[ -f "${moddir}/ath_rate_amrr.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_amrr.${KV_OBJ}" - [[ -f "${moddir}/ath_rate_onoe.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_onoe.${KV_OBJ}" - fi - linux-mod_pkg_postinst einfo @@ -111,6 +80,10 @@ pkg_postinst() { 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