Version bump, bug #121783.

(Portage version: 2.0.54)

9 files changed, 212 insertions, 4 deletions

diff --git a/net-wireless/madwifi-driver/ChangeLog b/net-wireless/madwifi-driver/ChangeLog
index 594f11477c9c..76512be9dbdc 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.35 2006/02/01 16:37:22 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-driver/ChangeLog,v 1.36 2006/02/06 11:10:19 brix Exp $
+
+*madwifi-driver-0.1440.20060206 (06 Feb 2006)
+
+  06 Feb 2006; Henrik Brix Andersen <brix@gentoo.org>
+  +madwifi-driver-0.1440.20060206.ebuild:
+  Version bump, bug #121783.
 
   01 Feb 2006; Henrik Brix Andersen <brix@gentoo.org>
   -madwifi-driver-0.1_pre20051111.ebuild:
diff --git a/net-wireless/madwifi-driver/Manifest b/net-wireless/madwifi-driver/Manifest
index 9bb73290f22a..9590c9ad1db5 100644
--- a/net-wireless/madwifi-driver/Manifest
+++ b/net-wireless/madwifi-driver/Manifest
@@ -1,8 +1,10 @@
-MD5 bb09ed812b793d0e714654b4ab517a30 ChangeLog 7537
+MD5 9861e78b7d2b65d55f2fdc2ad94c06b2 ChangeLog 7710
 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 d4937e6f87128084a32ef792ddbccc6e files/digest-madwifi-driver-0.1_pre20050420-r1 85
 MD5 bffeadae7b2aa3e9f87fe8b5392531e9 madwifi-driver-0.1401.20060117.ebuild 3439
 MD5 f69ecb5b6e8c4663e2db816c795b968c madwifi-driver-0.1420.20060201.ebuild 3351
+MD5 4175d023dc89256f9bf5ad71c914a2d9 madwifi-driver-0.1440.20060206.ebuild 3272
 MD5 1b9a0408676d910cdc32a019e1861364 madwifi-driver-0.1_pre20050420-r1.ebuild 1966
 MD5 19fd766bac8e110b4620363a1ace26dd metadata.xml 159
diff --git a/net-wireless/madwifi-driver/files/digest-madwifi-driver-0.1440.20060206 b/net-wireless/madwifi-driver/files/digest-madwifi-driver-0.1440.20060206
new file mode 100644
index 000000000000..4d249e405f84
--- /dev/null
+++ b/net-wireless/madwifi-driver/files/digest-madwifi-driver-0.1440.20060206
@@ -0,0 +1 @@
+MD5 12ee6032818ee5ee5371da5c65f2d5ed madwifi-ng-r1440-20060206.tar.gz 3249614
diff --git a/net-wireless/madwifi-driver/madwifi-driver-0.1440.20060206.ebuild b/net-wireless/madwifi-driver/madwifi-driver-0.1440.20060206.ebuild
new file mode 100644
index 000000000000..d27d908f7269
--- /dev/null
+++ b/net-wireless/madwifi-driver/madwifi-driver-0.1440.20060206.ebuild
@@ -0,0 +1,112 @@
+# 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.1440.20060206.ebuild,v 1.1 2006/02/06 11:10:19 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"
+
+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
+}
diff --git a/net-wireless/madwifi-tools/ChangeLog b/net-wireless/madwifi-tools/ChangeLog
index 3582b7c8b633..e4512667d418 100644
--- a/net-wireless/madwifi-tools/ChangeLog
+++ b/net-wireless/madwifi-tools/ChangeLog
@@ -1,6 +1,13 @@
 # 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.16 2006/02/01 16:38:38 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-tools/ChangeLog,v 1.17 2006/02/06 11:09:12 brix Exp $
+
+*madwifi-tools-0.1440.20060206 (06 Feb 2006)
+
+  06 Feb 2006; Henrik Brix Andersen <brix@gentoo.org>
+  +files/madwifi-tools-0.1440.20060206-udev.rules,
+  +madwifi-tools-0.1440.20060206.ebuild:
+  Version bump, bug #121783.
 
   01 Feb 2006; Henrik Brix Andersen <brix@gentoo.org>
   -madwifi-tools-0.1_pre20051111.ebuild:
diff --git a/net-wireless/madwifi-tools/Manifest b/net-wireless/madwifi-tools/Manifest
index 0ab707065c4f..b7461ab1e482 100644
--- a/net-wireless/madwifi-tools/Manifest
+++ b/net-wireless/madwifi-tools/Manifest
@@ -1,10 +1,13 @@
-MD5 29137b1674d9c4640da8a02bde1d20ec ChangeLog 3157
+MD5 4d42b5131f5d6c39530745cd3e33e501 ChangeLog 3379
 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 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
+MD5 3b977ab622651738d159d4559e670e25 files/madwifi-tools-0.1440.20060206-udev.rules 355
 MD5 407e3d84d5a80b1f584e80606bf5aa94 madwifi-tools-0.1401.20060117.ebuild 1705
 MD5 aa059240813668c3c9b4cdca1016f1e6 madwifi-tools-0.1420.20060201.ebuild 1727
+MD5 19d77ef39eb75455447f4c9fe4fcf6d2 madwifi-tools-0.1440.20060206.ebuild 1604
 MD5 b51ffccefc25227db9e0af7033042b3d madwifi-tools-0.1_pre20050420.ebuild 883
 MD5 19fd766bac8e110b4620363a1ace26dd metadata.xml 159
diff --git a/net-wireless/madwifi-tools/files/digest-madwifi-tools-0.1440.20060206 b/net-wireless/madwifi-tools/files/digest-madwifi-tools-0.1440.20060206
new file mode 100644
index 000000000000..4d249e405f84
--- /dev/null
+++ b/net-wireless/madwifi-tools/files/digest-madwifi-tools-0.1440.20060206
@@ -0,0 +1 @@
+MD5 12ee6032818ee5ee5371da5c65f2d5ed madwifi-ng-r1440-20060206.tar.gz 3249614
diff --git a/net-wireless/madwifi-tools/files/madwifi-tools-0.1440.20060206-udev.rules b/net-wireless/madwifi-tools/files/madwifi-tools-0.1440.20060206-udev.rules
new file mode 100644
index 000000000000..e6d72b1874a9
--- /dev/null
+++ b/net-wireless/madwifi-tools/files/madwifi-tools-0.1440.20060206-udev.rules
@@ -0,0 +1,9 @@
+# Madwifi devices
+#
+# See wlanconfig(8) for more information
+#
+# Access Point configuration
+#KERNEL=="wifi[0-9]*", DRIVER=="ath_pci", ACTION=="add", RUN+="/sbin/wlanconfig ath create wlandev %k wlanmode ap"
+#
+# Normal station configuration
+KERNEL=="wifi[0-9]*", DRIVER=="ath_pci", ACTION=="add", RUN+="/sbin/wlanconfig ath create wlandev %k wlanmode sta"
diff --git a/net-wireless/madwifi-tools/madwifi-tools-0.1440.20060206.ebuild b/net-wireless/madwifi-tools/madwifi-tools-0.1440.20060206.ebuild
new file mode 100644
index 000000000000..5c4f32c01f6f
--- /dev/null
+++ b/net-wireless/madwifi-tools/madwifi-tools-0.1440.20060206.ebuild
@@ -0,0 +1,67 @@
+# 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.1440.20060206.ebuild,v 1.1 2006/02/06 11:09:12 brix Exp $
+
+inherit toolchain-funcs
+
+MY_P=madwifi-ng-r${PV:2:4}-${PV:7:8}
+S=${WORKDIR}/${MY_P}/tools
+
+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="udev"
+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}/athstats.c || die
+
+	sed -i \
+		-e "s:CC =.*:CC = $(tc-getCC):" \
+		-e "s:CFLAGS=:CFLAGS+=:" \
+		-e "s:LDFLAGS=:LDFLAGS+=:" \
+		${S}/Makefile || die
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" BINDIR=/usr/bin MANDIR=/usr/share/man install || die "make install failed"
+
+	dodir /sbin
+	mv "${D}"/usr/bin/wlanconfig "${D}"/sbin
+
+	if use udev; then
+		insinto /etc/udev/rules.d/
+		newins ${FILESDIR}/${P}-udev.rules 65-madwifi.rules || die
+	fi
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Interfaces (athX) needs to be added using wlanconfig(8) after"
+	einfo "loading the madwifi kernel module."
+	einfo
+	if use udev; then
+		einfo "Example udev rules for automatically taking care of this has been"
+		einfo "installed to:"
+		einfo
+		einfo "  /etc/udev/rules.d/65-madwifi.rules"
+		einfo
+		einfo "Modify these rules to match your configuration and either run 'udevstart'"
+		einfo "or reboot for the rules to take effect."
+		einfo
+	fi
+}