updated the cvs snapshot of madwifi-driver. The WPA branch was merged back into HEAD

5 files changed, 25 insertions, 10 deletions

diff --git a/net-wireless/madwifi-driver/ChangeLog b/net-wireless/madwifi-driver/ChangeLog
index f9379c9ac8bc..9b16a2d64fca 100644
--- a/net-wireless/madwifi-driver/ChangeLog
+++ b/net-wireless/madwifi-driver/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/madwifi-driver
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-driver/ChangeLog,v 1.13 2004/08/29 04:41:33 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-driver/ChangeLog,v 1.14 2004/09/06 18:46:51 solar Exp $
+
+*madwifi-driver-0.1_pre20040906 (06 Sep 2004)
+
+  06 Sep 2004; <solar@gentoo.org> -madwifi-driver-0.1_pre20040824.ebuild,
+  +madwifi-driver-0.1_pre20040906.ebuild:
+  updated the cvs snapshot of madwifi-driver. The WPA branch was merged back
+  into HEAD
 
 *madwifi-driver-0.1_pre20040824-r1 (29 Aug 2004)
 
diff --git a/net-wireless/madwifi-driver/Manifest b/net-wireless/madwifi-driver/Manifest
index 075188e35c9d..1dc001613e0c 100644
--- a/net-wireless/madwifi-driver/Manifest
+++ b/net-wireless/madwifi-driver/Manifest
@@ -2,9 +2,9 @@ MD5 03ec542fdd146f944e1cb042b2737b2b madwifi-driver-0.1_pre20040514.ebuild 1285
 MD5 e8cc8b03dd0e6004dcaa2ae40a865352 madwifi-driver-0.1_pre20040212.ebuild 1544
 MD5 bc0f5d0eb065e14e1c707944dd81ce38 madwifi-driver-0.1_pre20031213-r1.ebuild 1547
 MD5 82869dab698ac726864aa4b614be0e12 madwifi-driver-0.1_pre20040726.ebuild 1442
-MD5 99a34514859be45c9fa8ebf25bd65ecc madwifi-driver-0.1_pre20040824.ebuild 1716
+MD5 23dec5ce9b8a040b87297be886126a36 madwifi-driver-0.1_pre20040906.ebuild 1907
 MD5 21d600ab4701f18262587bdd50415aa5 madwifi-driver-0.1_pre20040108.ebuild 1544
-MD5 aa7b62648a4098f6f220408d721a8be9 ChangeLog 2737
+MD5 21bcf1783101584be574e11a9ec88557 ChangeLog 2990
 MD5 19fd766bac8e110b4620363a1ace26dd metadata.xml 159
 MD5 f232721a5c111d2fec3a8697f67bd886 madwifi-driver-0.1_pre20040824-r1.ebuild 2015
 MD5 e00b943f3c94116d21cae2f156eddb3f files/digest-madwifi-driver-0.1_pre20031213-r1 83
@@ -12,7 +12,7 @@ MD5 87a16f54594ebda97e3ef6a9f64d798b files/digest-madwifi-driver-0.1_pre20040108
 MD5 b328239759561fb84caa9430f6d172ef files/digest-madwifi-driver-0.1_pre20040212 83
 MD5 e1ac8645264cff91daf51eb00fe88298 files/digest-madwifi-driver-0.1_pre20040514 84
 MD5 acd6d2fa40bd7e96da1df6529c506a81 files/digest-madwifi-driver-0.1_pre20040726 84
-MD5 fd47ace81248afcc8e4a192715a9bfe2 files/digest-madwifi-driver-0.1_pre20040824 84
+MD5 527d277dc2fea62fb5a3ae7f54c98e33 files/digest-madwifi-driver-0.1_pre20040906 174
 MD5 807179e31533b4895664bff1421f4381 files/madwifi-multi-ssid-support.patch 3343
 MD5 d9ea69973349d71e055b16a64039f1b7 files/madwifi-driver-2.6.8-20040814-proc_dointvec.patch 1749
 MD5 444756b2062924ee7e0e631e956d46e9 files/madwifi-driver-0.1-arp-packets-33958.patch 704
diff --git a/net-wireless/madwifi-driver/files/digest-madwifi-driver-0.1_pre20040824 b/net-wireless/madwifi-driver/files/digest-madwifi-driver-0.1_pre20040824
deleted file mode 100644
index a22b2a8c7cd5..000000000000
--- a/net-wireless/madwifi-driver/files/digest-madwifi-driver-0.1_pre20040824
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fb4c2a2564d12dd26f9dd0297537eecc madwifi-driver-0.1_pre20040824.tar.bz2 1733884
diff --git a/net-wireless/madwifi-driver/files/digest-madwifi-driver-0.1_pre20040906 b/net-wireless/madwifi-driver/files/digest-madwifi-driver-0.1_pre20040906
new file mode 100644
index 000000000000..629ec6db7346
--- /dev/null
+++ b/net-wireless/madwifi-driver/files/digest-madwifi-driver-0.1_pre20040906
@@ -0,0 +1,2 @@
+MD5 6c5f62812f30b962e054782b9cec7b9c madwifi-driver-0.1_pre20040906.tar.bz2 1797060
+MD5 92dabb486c920c0e82ad1b3ed08404c1 madwifi-driver-0.1_pre20040906-gentoo.patch.bz2 2530
diff --git a/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20040824.ebuild b/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20040906.ebuild
index 7862276f3d9e..e98f2255ba73 100644
--- a/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20040824.ebuild
+++ b/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20040906.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.1_pre20040824.ebuild,v 1.1 2004/08/24 18:42:51 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20040906.ebuild,v 1.1 2004/09/06 18:46:51 solar Exp $
 
 # All work on madwifi is pretty much done under the WPA branch. At some
 # point in the near future it should be merged back into HEAD. 
@@ -13,7 +13,7 @@ HOMEPAGE="http://madwifi.sourceforge.net/"
 
 # Point to any required sources; these will be automatically downloaded by
 # Portage.
-SRC_URI="mirror://gentoo/$P.tar.bz2"
+SRC_URI="mirror://gentoo/$P.tar.bz2 mirror://gentoo/${PN}-${PV}-gentoo.patch.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -27,7 +27,11 @@ S=${WORKDIR}
 pkg_setup() {
 	if [[ "${KV}" > "2.5" ]] ; then
 		cd ${ROOT}/usr/src/linux
-		./scripts/modpost ./vmlinux
+		if [[ "${KV}" > "2.6.8" ]] ; then
+			./scripts/mod/modpost ./vmlinux
+		else
+			./scripts/modpost ./vmlinux
+		fi
 	fi
 }
 
@@ -35,6 +39,9 @@ src_unpack() {
 	check_KV
 	unpack ${A}
 	cd ${S}
+
+	epatch ${DISTDIR}/${PN}-${PV}-gentoo.patch.bz2
+
 	if kernel-mod_is_2_6_kernel && [ ${KV_PATCH} -gt 5 ]; then
 		for dir in ath ath_hal net80211; do
 			sed -i -e "s:SUBDIRS=:M=:" ${S}/${dir}/Makefile
@@ -53,12 +60,12 @@ src_install() {
 	make KERNELPATH="${ROOT}/usr/src/linux" KERNELRELEASE="${KV}" \
 		DESTDIR="${D}" install || die
 
-	dodoc README
+	dodoc README COPYRIGHT
 }
 
 pkg_postinst() {
 
-	test -r "${ROOT}/usr/src/linux/System.map" && \
+	[ -r "${ROOT}/usr/src/linux/System.map" ] && \
 		depmod -ae -F "${ROOT}/usr/src/linux/System.map" -b "${ROOT}" -r ${KV}
 
 	einfo ""