Use atheros-hal license for truedfx bug 146319

(Portage version: 2.1.2-r9)

4 files changed, 7 insertions, 136 deletions

diff --git a/net-wireless/madwifi-ng/ChangeLog b/net-wireless/madwifi-ng/ChangeLog
index 4cf41e223729..f0775bf382b0 100644
--- a/net-wireless/madwifi-ng/ChangeLog
+++ b/net-wireless/madwifi-ng/ChangeLog
@@ -1,6 +1,10 @@
 # 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.25 2007/02/10 06:38:59 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/ChangeLog,v 1.26 2007/02/20 12:12:40 genstef Exp $
+
+  20 Feb 2007; <genstef@gentoo.org> -madwifi-ng-0.9.2.ebuild,
+  madwifi-ng-0.9.2.1.ebuild:
+  Use atheros-hal license for truedfx bug 146319
 
   10 Feb 2007; Steev Klimaszewski <steev@gentoo.org>
   +files/madwifi-ng-0.9.2-allow-cipher-none.diff, madwifi-ng-0.9.2.1.ebuild:
diff --git a/net-wireless/madwifi-ng/files/digest-madwifi-ng-0.9.2 b/net-wireless/madwifi-ng/files/digest-madwifi-ng-0.9.2
deleted file mode 100644
index 1df85ad52a27..000000000000
--- a/net-wireless/madwifi-ng/files/digest-madwifi-ng-0.9.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a75baacbe07085ddc5cb28e1fb43edbb madwifi-0.9.2.tar.bz2 3476735
-RMD160 e24ce96ab7ebcd12e71755c89882a90161a6a15a madwifi-0.9.2.tar.bz2 3476735
-SHA256 b6edd998fa5e5927f9e42e0470f6f4e0bec1b8a41658eec5595ceea01c787153 madwifi-0.9.2.tar.bz2 3476735
diff --git a/net-wireless/madwifi-ng/madwifi-ng-0.9.2.1.ebuild b/net-wireless/madwifi-ng/madwifi-ng-0.9.2.1.ebuild
index 2e2537fe57dd..d556af61bc28 100644
--- a/net-wireless/madwifi-ng/madwifi-ng-0.9.2.1.ebuild
+++ b/net-wireless/madwifi-ng/madwifi-ng-0.9.2.1.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.2.1.ebuild,v 1.7 2007/02/10 06:38:59 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/madwifi-ng-0.9.2.1.ebuild,v 1.8 2007/02/20 12:12:40 genstef Exp $
 
 inherit linux-mod
 
@@ -11,7 +11,7 @@ DESCRIPTION="Next Generation driver for Atheros based IEEE 802.11a/b/g wireless
 HOMEPAGE="http://www.madwifi.org/"
 SRC_URI="mirror://sourceforge/madwifi/madwifi-${PV}.tar.bz2"
 
-LICENSE="as-is
+LICENSE="atheros-hal
 	|| ( BSD GPL-2 )"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
diff --git a/net-wireless/madwifi-ng/madwifi-ng-0.9.2.ebuild b/net-wireless/madwifi-ng/madwifi-ng-0.9.2.ebuild
deleted file mode 100644
index b757cd999153..000000000000
--- a/net-wireless/madwifi-ng/madwifi-ng-0.9.2.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2006 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.2.ebuild,v 1.8 2006/11/17 18:36:53 genstef 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="as-is
-	|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-IUSE="amrr onoe"
-DEPEND="app-arch/sharutils"
-RDEPEND="!net-wireless/madwifi-old
-		=net-wireless/madwifi-ng-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)
-				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}
-	epatch ${FILESDIR}/${P}-{ath_intr,config.h,crypto_cipher_encrypt_one}.diff
-	for dir in ath net80211 ath_rate/amrr ath_rate/onoe ath_rate/sample; do
-		convert_to_m ${S}/${dir}/Makefile
-	done
-}
-
-src_compile() {
-	epatch ${FILESDIR}/madwifi-ng-uudecode-gcda-fix.patch
-#	epatch ${FILESDIR}/madwifi-association-fix.patch
-
-	# 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
-}