Workaround for our build system was commited into linux-mod.eclass, bug #237618. So it safe to remove it from madwifi-ng-0.9.4-r1. Also to avoid somewhat unnecessary round of stabilization patch for build failure on 2.6.27 moved into madwifi-ng-0.9.4. Now madwifi-ng-0.9.4-r1 and madwifi-ng-0.9.4 are equal, but don't remove any of them to avoid unnecessary rebuilds.

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.26-openvz.git-35f41f1 i686

4 files changed, 16 insertions, 11 deletions

diff --git a/net-wireless/madwifi-ng/ChangeLog b/net-wireless/madwifi-ng/ChangeLog
index 45908eba3eb6..53e4bf6b584b 100644
--- a/net-wireless/madwifi-ng/ChangeLog
+++ b/net-wireless/madwifi-ng/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-wireless/madwifi-ng
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/ChangeLog,v 1.63 2008/11/15 16:19:47 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/ChangeLog,v 1.64 2008/11/15 16:28:31 pva Exp $
+
+  15 Nov 2008; Peter Volkov <pva@gentoo.org> madwifi-ng-0.9.4.ebuild,
+  madwifi-ng-0.9.4-r1.ebuild:
+  Workaround for our build system was commited into linux-mod.eclass, bug
+  #237618. So it safe to remove it from madwifi-ng-0.9.4-r1. Also to avoid
+  somewhat unnecessary round of stabilization patch for build failure on
+  2.6.27 moved into madwifi-ng-0.9.4. Now madwifi-ng-0.9.4-r1 and
+  madwifi-ng-0.9.4 are equal, but don't remove any of them to avoid
+  unnecessary rebuilds.
 
   15 Nov 2008; Peter Volkov <pva@gentoo.org> madwifi-ng-0.9.3.1.ebuild,
   madwifi-ng-0.9.3.2.ebuild, madwifi-ng-0.9.3.3.ebuild,
diff --git a/net-wireless/madwifi-ng/Manifest b/net-wireless/madwifi-ng/Manifest
index 37f5744fb775..1090ad53eee0 100644
--- a/net-wireless/madwifi-ng/Manifest
+++ b/net-wireless/madwifi-ng/Manifest
@@ -10,7 +10,7 @@ DIST madwifi-0.9.4.tar.bz2 3485142 RMD160 a493addc2f566e07f29033b671fea1b7143a90
 EBUILD madwifi-ng-0.9.3.1.ebuild 2651 RMD160 5174766ea6574266b78ac8ac6b0bb9117975e4a1 SHA1 81ed42fb9feac3c17d60b01361335748bada47cc SHA256 aa9543b2dd5c15de944547550d3c0439f7c8b6bc8d7e3f5b24e73368906e7d99
 EBUILD madwifi-ng-0.9.3.2.ebuild 2582 RMD160 dd346833d3f9e9632c34914f4188f1c4154ca40c SHA1 c3d41e3344e414d9f67517a489288f7fac1c5d5d SHA256 9d3bbcd485a4f83ecb5fd3ac0952154acb8f2a11c31c574b469753794bad29c5
 EBUILD madwifi-ng-0.9.3.3.ebuild 2648 RMD160 532e75561cd39cc9a9ae7a8e1f4227576e2a2006 SHA1 67d3a07ff48ce784411a61043bff1d0c490d1c70 SHA256 b3e2bc6ae66249b260550765deed32d90b6fcabc2f105721012fe90b28d97111
-EBUILD madwifi-ng-0.9.4-r1.ebuild 3455 RMD160 739e02d46ebb73e2650f8fd1964de43227486f8b SHA1 01569382551c177c6b75f0b995a7e206e152deea SHA256 1af7d78334868e131b9ae4d2c17954582f87cdade6eec59d4a381d2ff142784c
-EBUILD madwifi-ng-0.9.4.ebuild 3165 RMD160 13561a3e9a0904772db9a647a0cb1bc986ef4706 SHA1 fac5cd57a13763c6289fcc07036e9d7db2057b3c SHA256 fde0f3947839762868caa1ce2ffd45919ad71428b85bb6bfd21a708478e24ca2
-MISC ChangeLog 20885 RMD160 0300b0a15134bd0d3a133607c5e8dbf939086776 SHA1 3de41b3ce9b8a9b1765952358c56791457f029b8 SHA256 b3d8a3e1821c9749c51d87360a2642fcdd0edcba233ed9c8e67e9cd27bdbe80c
+EBUILD madwifi-ng-0.9.4-r1.ebuild 3240 RMD160 38f81c61cbcecdcb8281cc3d338c033c00496eeb SHA1 53655158ef250defc2e7a9b1ecc50280d20f12ea SHA256 0f0da82c11b0d8d3160e7db0935b023a647d6e159fc38076e35c5bda0cdb0656
+EBUILD madwifi-ng-0.9.4.ebuild 3234 RMD160 0e47ca5833d2613bb1f4c9f849841ef8654e2e39 SHA1 63788113220811029d146037a89e61a8e32d15e1 SHA256 0b6d38f091f654005de238820ab30574898551e6948d43173c2b97935fa17c5b
+MISC ChangeLog 21366 RMD160 a9a41d9a1385fe64f6c34435ffea6369d349281c SHA1 ca4ce11f5987f33b8dd40f4b267eaa7d7a9f62b9 SHA256 f0a51e08cec65950ace58ec0ab43202bb953dfbaeb2989c4feb2c5ecc92c55f1
 MISC metadata.xml 474 RMD160 f4c1656da66f1c8d67b3ba7f5d796c42a28a1ea0 SHA1 0405e39b7aa5373d1e2ee8b47f015f009947738e SHA256 72b875566747e831cbd7faff930a0c3ca7d48d28b5ec0662b36b57e37d91c54f
diff --git a/net-wireless/madwifi-ng/madwifi-ng-0.9.4-r1.ebuild b/net-wireless/madwifi-ng/madwifi-ng-0.9.4-r1.ebuild
index 5f70f473d4d2..6fc7566bec45 100644
--- a/net-wireless/madwifi-ng/madwifi-ng-0.9.4-r1.ebuild
+++ b/net-wireless/madwifi-ng/madwifi-ng-0.9.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.4-r1.ebuild,v 1.3 2008/11/15 16:19:47 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/madwifi-ng-0.9.4-r1.ebuild,v 1.4 2008/11/15 16:28:31 pva Exp $
 
 inherit linux-mod
 
@@ -61,11 +61,6 @@ src_unpack() {
 	done
 	epatch "${FILESDIR}/madwifi-dfs-ieee80211-skb-update.patch"
 	kernel_is ge 2 6 27 && epatch "${FILESDIR}/${P}-2.6.27-r3811.patch"
-	# Workaround our build system, bug #232099 (bug #237618 describes details)
-	touch Module.symvers
-	for ms in ath net80211 ath_hal ath_rate/{amrr,minstrel,onoe,sample}; do
-		ln -s "${S}/Module.symvers" "${ms}"
-	done
 }
 
 src_install() {
diff --git a/net-wireless/madwifi-ng/madwifi-ng-0.9.4.ebuild b/net-wireless/madwifi-ng/madwifi-ng-0.9.4.ebuild
index 6dca90e4a286..a03266f2c9b0 100644
--- a/net-wireless/madwifi-ng/madwifi-ng-0.9.4.ebuild
+++ b/net-wireless/madwifi-ng/madwifi-ng-0.9.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.4.ebuild,v 1.8 2008/11/15 16:19:47 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/madwifi-ng-0.9.4.ebuild,v 1.9 2008/11/15 16:28:31 pva Exp $
 
 inherit linux-mod
 
@@ -60,6 +60,7 @@ src_unpack() {
 		convert_to_m "${S}"/${dir}/Makefile
 	done
 	epatch "${FILESDIR}"/madwifi-dfs-ieee80211-skb-update.patch
+	kernel_is ge 2 6 27 && epatch "${FILESDIR}/${P}-2.6.27-r3811.patch"
 }
 
 src_install() {