New snapshot, bug #125933.

Package-Manager: portage-2.0.54

8 files changed, 203 insertions, 4 deletions

diff --git a/net-wireless/madwifi-driver/ChangeLog b/net-wireless/madwifi-driver/ChangeLog
index 02867db7e4cd..28a087955782 100644
--- a/net-wireless/madwifi-driver/ChangeLog
+++ b/net-wireless/madwifi-driver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/madwifi-driver
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-driver/ChangeLog,v 1.39 2006/03/05 19:05:37 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-driver/ChangeLog,v 1.40 2006/03/12 15:16:24 brix Exp $
+
+*madwifi-driver-0.1473.20060312 (12 Mar 2006)
+
+  12 Mar 2006; Henrik Brix Andersen <brix@gentoo.org>
+  +madwifi-driver-0.1473.20060312.ebuild:
+  New snapshot, bug #125933.
 
   05 Mar 2006; Henrik Brix Andersen <brix@gentoo.org>
   madwifi-driver-0.1443.20060207.ebuild:
diff --git a/net-wireless/madwifi-driver/Manifest b/net-wireless/madwifi-driver/Manifest
index 1ba1aec3708d..1f7ec51b243d 100644
--- a/net-wireless/madwifi-driver/Manifest
+++ b/net-wireless/madwifi-driver/Manifest
@@ -1,12 +1,14 @@
-MD5 cf6d145fb27d1cfa055490f795a31dec ChangeLog 8425
+MD5 1793b13b92fd4527f6227c7cd8fd4caa ChangeLog 8598
 MD5 6225a58b69ebeb67ff97ab4026b21e58 files/digest-madwifi-driver-0.1401.20060117 78
 MD5 04ecb172d5d25d2995578d1772e2c239 files/digest-madwifi-driver-0.1420.20060201 78
 MD5 94fa700e7f5c8ec3598c00b31c724525 files/digest-madwifi-driver-0.1440.20060206 78
 MD5 7e62e96505ecb836f9f74c54d448af59 files/digest-madwifi-driver-0.1443.20060207 78
+MD5 a505c0375ea7fdfc85976a0fc0866c6c files/digest-madwifi-driver-0.1473.20060312 78
 MD5 d4937e6f87128084a32ef792ddbccc6e files/digest-madwifi-driver-0.1_pre20050420-r1 85
 MD5 ef400d5ceff9fc0e01b7e954141eaa16 madwifi-driver-0.1401.20060117.ebuild 3573
 MD5 1cb640c162f9c888f69b298cd5d8ff4e madwifi-driver-0.1420.20060201.ebuild 3489
 MD5 519343b1064ac6a55d9144a7f3a6d972 madwifi-driver-0.1440.20060206.ebuild 3535
 MD5 ab61a3297db538fd616126e6e1518625 madwifi-driver-0.1443.20060207.ebuild 3791
+MD5 8f6a2325911a8363bba472c7da485bc4 madwifi-driver-0.1473.20060312.ebuild 3667
 MD5 56d9adf042a2c893845f3927075e0292 madwifi-driver-0.1_pre20050420-r1.ebuild 2090
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
diff --git a/net-wireless/madwifi-driver/files/digest-madwifi-driver-0.1473.20060312 b/net-wireless/madwifi-driver/files/digest-madwifi-driver-0.1473.20060312
new file mode 100644
index 000000000000..110a69d918b6
--- /dev/null
+++ b/net-wireless/madwifi-driver/files/digest-madwifi-driver-0.1473.20060312
@@ -0,0 +1 @@
+MD5 f4f057f4b416adc4f517c9bfc209a986 madwifi-ng-r1473-20060312.tar.gz 3107599
diff --git a/net-wireless/madwifi-driver/madwifi-driver-0.1473.20060312.ebuild b/net-wireless/madwifi-driver/madwifi-driver-0.1473.20060312.ebuild
new file mode 100644
index 000000000000..9943da98a1cf
--- /dev/null
+++ b/net-wireless/madwifi-driver/madwifi-driver-0.1473.20060312.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-driver/madwifi-driver-0.1473.20060312.ebuild,v 1.1 2006/03/12 15:16:24 brix Exp $
+
+inherit linux-mod
+
+MY_P=madwifi-ng-r${PV:2:4}-${PV:7:8}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Driver for Atheros based IEEE 802.11a/b/g wireless LAN cards"
+HOMEPAGE="http://www.madwifi.org/"
+SRC_URI="http://snapshots.madwifi.org/madwifi-ng/${MY_P}.tar.gz"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="amrr onoe"
+DEPEND="app-arch/sharutils"
+RDEPEND=">=net-wireless/madwifi-tools-${PV}"
+
+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)"
+
+	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)"
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	for dir in ath ath_hal net80211 ath_rate/amrr ath_rate/onoe ath_rate/sample; do
+		convert_to_m ${S}/${dir}/Makefile
+	done
+}
+
+src_compile() {
+	# assists in debugging
+	emake KERNELPATH=${KV_OUT_DIR} info || die "emake info failed"
+
+	# needed by the modules
+	emake svnversion.h
+
+	linux-mod_src_compile
+}
+
+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/"
+
+	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
+	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 "If you use net-wireless/wpa_supplicant or net-wireless/hostapd with madwifi"
+	einfo "you should remerge them now."
+	einfo
+}
diff --git a/net-wireless/madwifi-tools/ChangeLog b/net-wireless/madwifi-tools/ChangeLog
index 58c494baaf9f..0a6b76ec46e1 100644
--- a/net-wireless/madwifi-tools/ChangeLog
+++ b/net-wireless/madwifi-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/madwifi-tools
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-tools/ChangeLog,v 1.19 2006/03/05 19:04:16 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-tools/ChangeLog,v 1.20 2006/03/12 15:14:22 brix Exp $
+
+*madwifi-tools-0.1473.20060312 (12 Mar 2006)
+
+  12 Mar 2006; Henrik Brix Andersen <brix@gentoo.org>
+  +madwifi-tools-0.1473.20060312.ebuild:
+  New snapshot, bug #125933.
 
   05 Mar 2006; Henrik Brix Andersen <brix@gentoo.org>
   madwifi-tools-0.1443.20060207.ebuild:
diff --git a/net-wireless/madwifi-tools/Manifest b/net-wireless/madwifi-tools/Manifest
index 72b36c107360..ff64ce8d977d 100644
--- a/net-wireless/madwifi-tools/Manifest
+++ b/net-wireless/madwifi-tools/Manifest
@@ -1,8 +1,9 @@
-MD5 647b642e93e6011e3ada29ea2c0a584e ChangeLog 3699
+MD5 1adecc15661f7422c17dca539edf4ccf ChangeLog 3870
 MD5 6225a58b69ebeb67ff97ab4026b21e58 files/digest-madwifi-tools-0.1401.20060117 78
 MD5 04ecb172d5d25d2995578d1772e2c239 files/digest-madwifi-tools-0.1420.20060201 78
 MD5 94fa700e7f5c8ec3598c00b31c724525 files/digest-madwifi-tools-0.1440.20060206 78
 MD5 7e62e96505ecb836f9f74c54d448af59 files/digest-madwifi-tools-0.1443.20060207 78
+MD5 a505c0375ea7fdfc85976a0fc0866c6c files/digest-madwifi-tools-0.1473.20060312 78
 MD5 d4937e6f87128084a32ef792ddbccc6e files/digest-madwifi-tools-0.1_pre20050420 85
 MD5 3b977ab622651738d159d4559e670e25 files/madwifi-tools-0.1401.20060117-udev.rules 355
 MD5 3b977ab622651738d159d4559e670e25 files/madwifi-tools-0.1420.20060201-udev.rules 355
@@ -11,5 +12,6 @@ MD5 407e3d84d5a80b1f584e80606bf5aa94 madwifi-tools-0.1401.20060117.ebuild 1705
 MD5 aa059240813668c3c9b4cdca1016f1e6 madwifi-tools-0.1420.20060201.ebuild 1727
 MD5 49621589ae8110a5228b1f3a1f5ecd7b madwifi-tools-0.1440.20060206.ebuild 1727
 MD5 40a5df20571805f0ae602ee07becd458 madwifi-tools-0.1443.20060207.ebuild 1523
+MD5 0012726f5ecab001c562c2b9ec14df31 madwifi-tools-0.1473.20060312.ebuild 1401
 MD5 b51ffccefc25227db9e0af7033042b3d madwifi-tools-0.1_pre20050420.ebuild 883
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
diff --git a/net-wireless/madwifi-tools/files/digest-madwifi-tools-0.1473.20060312 b/net-wireless/madwifi-tools/files/digest-madwifi-tools-0.1473.20060312
new file mode 100644
index 000000000000..110a69d918b6
--- /dev/null
+++ b/net-wireless/madwifi-tools/files/digest-madwifi-tools-0.1473.20060312
@@ -0,0 +1 @@
+MD5 f4f057f4b416adc4f517c9bfc209a986 madwifi-ng-r1473-20060312.tar.gz 3107599
diff --git a/net-wireless/madwifi-tools/madwifi-tools-0.1473.20060312.ebuild b/net-wireless/madwifi-tools/madwifi-tools-0.1473.20060312.ebuild
new file mode 100644
index 000000000000..c540f9743132
--- /dev/null
+++ b/net-wireless/madwifi-tools/madwifi-tools-0.1473.20060312.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-tools/madwifi-tools-0.1473.20060312.ebuild,v 1.1 2006/03/12 15:14:23 brix Exp $
+
+inherit toolchain-funcs
+
+MY_P=madwifi-ng-r${PV:2:4}-${PV:7:8}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Tools for configuration of Atheros based IEEE 802.11a/b/g wireless LAN cards"
+HOMEPAGE="http://www.madwifi.org/"
+SRC_URI="http://snapshots.madwifi.org/madwifi-ng/${MY_P}.tar.gz"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE=""
+DEPEND="virtual/libc"
+
+src_unpack() {
+	unpack ${A}
+
+	# format string fix from solar
+	sed -i \
+		-e 's:err(1, ifr.ifr_name);:err(1, "%s", ifr.ifr_name);:g' \
+		${S}/tools/athstats.c || die
+
+	sed -i \
+		-e "s:CC =.*:CC = $(tc-getCC):" \
+		-e "s:CFLAGS=:CFLAGS+=:" \
+		-e "s:LDFLAGS=:LDFLAGS+=:" \
+		${S}/tools/Makefile || die
+}
+
+src_compile() {
+	emake tools || die "emake tools failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" BINDIR=/usr/bin MANDIR=/usr/share/man STRIP=echo \
+		install-tools || die "make install-tools failed"
+
+	dodir /sbin
+	mv "${D}"/usr/bin/wlanconfig "${D}"/sbin
+}
+
+pkg_postinst() {
+	if [ -e "${ROOT}"/etc/udev/rules.d/65-madwifi.rules ]; then
+		ewarn
+		ewarn "The udev rules for creating interfaces (athX) are no longer needed."
+		ewarn
+		ewarn "You should manually remove the /etc/udev/rules.d/65-madwifi.rules file"
+		ewarn "and either run 'udevstart' or reboot for the changes to take effect."
+		ewarn
+	fi
+}