Use atheros-hal license for truedfx bug 146319

Package-Manager: portage-2.1.2-r9

diff --git a/net-wireless/madwifi-ng/ChangeLog b/net-wireless/madwifi-ng/ChangeLog
index 4cf41e223729036ea5eadaab5bb0945abde86be9..f0775bf382b0ca44f20d5a9d65be86f271c3f414 100644 (file)
--- 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/Manifest b/net-wireless/madwifi-ng/Manifest
index e8d7051b6c880fc0d86c1572d5ef6e30bcf0615f..5dec400a55ae69d1e36d69dce4ecf6a40147a73c 100644 (file)
--- a/net-wireless/madwifi-ng/Manifest
+++ b/net-wireless/madwifi-ng/Manifest
@@ -31,26 +31,18 @@ MD5 a0e4e3918e720015a4416efc14431c47 files/madwifi-ng-uudecode-gcda-fix.patch 32
 RMD160 c68566dc426c1ca15b3f858e2696735db8c3fb9e files/madwifi-ng-uudecode-gcda-fix.patch 328
 SHA256 f1a4293ba3235b312d9048cff1f79695c16dd19210e68d0fe07fa1819de21f9d files/madwifi-ng-uudecode-gcda-fix.patch 328
 DIST madwifi-0.9.2.1.tar.bz2 3476892 RMD160 ccbe1d7ae262286a147b37bda960d74284e4af3e SHA1 6606291b6facc299203158bfaa1bde09219459db SHA256 38f1c9980b473a52f11b63981d68326e3706c41f0ca4ba5da90d38bbd6870843
-DIST madwifi-0.9.2.tar.bz2 3476735 RMD160 e24ce96ab7ebcd12e71755c89882a90161a6a15a SHA1 6d6b9d2419e45a940d156b928401b5c688c40844 SHA256 b6edd998fa5e5927f9e42e0470f6f4e0bec1b8a41658eec5595ceea01c787153
-EBUILD madwifi-ng-0.9.2.1.ebuild 4284 RMD160 385eb6a8f20e65598025ac2c7d78b515b6049020 SHA1 3d841a7c908ebae0b013fa678a49ee16af16b18c SHA256 09dee1ffdd0cc5e8454d7a25080c112e25006a8eccca8eeed54cf7d0f4a027f0
-MD5 eec4accadbfd860b00ef5efb3c09c387 madwifi-ng-0.9.2.1.ebuild 4284
-RMD160 385eb6a8f20e65598025ac2c7d78b515b6049020 madwifi-ng-0.9.2.1.ebuild 4284
-SHA256 09dee1ffdd0cc5e8454d7a25080c112e25006a8eccca8eeed54cf7d0f4a027f0 madwifi-ng-0.9.2.1.ebuild 4284
-EBUILD madwifi-ng-0.9.2.ebuild 3979 RMD160 2cf8e74c6ffca193ab6276eb5e6bc3f794b2b09a SHA1 3b8378b22791ac5a529e8aca0727ccd79ef790c1 SHA256 e18668de4da9160799c33a94448f54a05dac134d61429b86576496c1e373e4d6
-MD5 82d58a8bcb92317ce472b3ef6cf4e717 madwifi-ng-0.9.2.ebuild 3979
-RMD160 2cf8e74c6ffca193ab6276eb5e6bc3f794b2b09a madwifi-ng-0.9.2.ebuild 3979
-SHA256 e18668de4da9160799c33a94448f54a05dac134d61429b86576496c1e373e4d6 madwifi-ng-0.9.2.ebuild 3979
-MISC ChangeLog 14054 RMD160 e99369ceb7bacf521847567915da2adc2e390b41 SHA1 9c20075a96b746b906812597467274825e9e38d1 SHA256 c7ff81247269d05aac3254c2c4e50b8d4a870019388dc27fd76b39216941ae5e
-MD5 4c97dc9130867d7e3f4a3a21895e589b ChangeLog 14054
-RMD160 e99369ceb7bacf521847567915da2adc2e390b41 ChangeLog 14054
-SHA256 c7ff81247269d05aac3254c2c4e50b8d4a870019388dc27fd76b39216941ae5e ChangeLog 14054
+EBUILD madwifi-ng-0.9.2.1.ebuild 4292 RMD160 9c2f2d8661ba28d72d7b1d251380ace7a70ca45a SHA1 a4daa4ca2341cf758ef2ec107e2f07f28ba66a91 SHA256 c4c97df7bcea36d108baba660a13b83f0ee36779371675d9aa0fdafaf0ec8d6c
+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
+MISC ChangeLog 14197 RMD160 0e61fa17fb77293dce57daabf804171ca4226339 SHA1 c77170b19a8ad1add1cc5438331a9e5341770913 SHA256 b8e61834fd4a52a3bb9e5c62a0da9d5db332c8b6b1ce3b27fc8d5dcb3d94e2fb
+MD5 ebb4d0281b98a53de2c9d63e324f3639 ChangeLog 14197
+RMD160 0e61fa17fb77293dce57daabf804171ca4226339 ChangeLog 14197
+SHA256 b8e61834fd4a52a3bb9e5c62a0da9d5db332c8b6b1ce3b27fc8d5dcb3d94e2fb ChangeLog 14197
 MISC metadata.xml 256 RMD160 af310503f82b971c1d6e8e1a5282d455f3427a3e SHA1 c7c8144660775d9edc93ea9cfb820944f7eb3109 SHA256 0bece0d60e3a88523cbaab4bfaafc904a11efd49099bc37388954a243a096f59
 MD5 1e76dba4899dcc307c5a880a729e20ee metadata.xml 256
 RMD160 af310503f82b971c1d6e8e1a5282d455f3427a3e metadata.xml 256
 SHA256 0bece0d60e3a88523cbaab4bfaafc904a11efd49099bc37388954a243a096f59 metadata.xml 256
-MD5 7e0926b81a64cb55b6c383e1fd1517d7 files/digest-madwifi-ng-0.9.2 247
-RMD160 b224312908c05b4a2456a0aab96559052e49b7be files/digest-madwifi-ng-0.9.2 247
-SHA256 21c57d899d4e2d74e3c820476f60b36c356764e54fe6f3be3acc69d663a0eb8d files/digest-madwifi-ng-0.9.2 247
 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

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 (file)
index 1df85ad..0000000
--- 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 2e2537fe57dd142548fe438ed9c3289a3bb572d4..d556af61bc28d0beedb2b0f50d914c2035e99ad5 100644 (file)
--- 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 (file)
index b757cd9..0000000
--- 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
-}