Bump vmware-modules to any-any115, and apply fixes for wireless and 2.6.24.

(Portage version: 2.1.4)
 (Signed Manifest commit)

3 files changed, 79 insertions, 17 deletions

diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest
index 910e7a2adadd..29d575b21c37 100644
--- a/app-emulation/vmware-modules/Manifest
+++ b/app-emulation/vmware-modules/Manifest
@@ -1,3 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 1.0.0.17-update115-nasty-hack.patch 550 RMD160 851d4e52c09b93c084e13b659e8d6a6ead61c020 SHA1 614d0207291d40ecd211b345e587cb1081deccc0 SHA256 fc90a3ebc43419b1e01c4cb4ecea85698112b4818158ebaf9c50b2fc50d0e46c
+MD5 7c4ed43ce6fbe29aa58efb9f2c52393e files/1.0.0.17-update115-nasty-hack.patch 550
+RMD160 851d4e52c09b93c084e13b659e8d6a6ead61c020 files/1.0.0.17-update115-nasty-hack.patch 550
+SHA256 fc90a3ebc43419b1e01c4cb4ecea85698112b4818158ebaf9c50b2fc50d0e46c files/1.0.0.17-update115-nasty-hack.patch 550
 AUX patches/000_all_makefile-include-directory.patch 342 RMD160 ae8b7c2e628681fff153bfa10242e62df5ab2e10 SHA1 be4f203063e676dc022ce600e15479b6ea56b954 SHA256 2da16602ef3c4cb040ac80a9fed18660fadcae2e843f425da0872f50aa5356db
 MD5 d2a8db48485977f21067a20798219821 files/patches/000_all_makefile-include-directory.patch 342
 RMD160 ae8b7c2e628681fff153bfa10242e62df5ab2e10 files/patches/000_all_makefile-include-directory.patch 342
@@ -6,9 +13,17 @@ AUX patches/020_all_epoll-def-warnings.patch 435 RMD160 b9152d9af93862c99c72abc1
 MD5 58b71f6120139172fa6065ab7a2a691d files/patches/020_all_epoll-def-warnings.patch 435
 RMD160 b9152d9af93862c99c72abc1ef97639351d82141 files/patches/020_all_epoll-def-warnings.patch 435
 SHA256 2033f23fc8d696e1a9d20c6c446703166ea82a4e5e448494e6a52ef09bac7521 files/patches/020_all_epoll-def-warnings.patch 435
+AUX patches/vmmon/030_all_fix-linux-headers.patch 472 RMD160 164b926b0cf53c1a695e7d9ee3e52c5bc1305443 SHA1 b2e485bd21c4106cccc00293df20bce6917e62a4 SHA256 092254308afc9848fd5cc63fb691ee67103fe6413a20e01a568278153d5e876c
+MD5 6b8f9fda755c53a23f15ef3e47d8b946 files/patches/vmmon/030_all_fix-linux-headers.patch 472
+RMD160 164b926b0cf53c1a695e7d9ee3e52c5bc1305443 files/patches/vmmon/030_all_fix-linux-headers.patch 472
+SHA256 092254308afc9848fd5cc63fb691ee67103fe6413a20e01a568278153d5e876c files/patches/vmmon/030_all_fix-linux-headers.patch 472
+AUX patches/vmnet/021_all_wireless_fix.patch 668 RMD160 dbcd47fc4749b36417d028a5701b831035853d9e SHA1 a3e714383be2e0abbc434d5f3ef5253b72978c81 SHA256 231e4c15eb67753da10c01cfebecd851a01f6956263df69e4fb5a9a42957ff60
+MD5 78c1a003f4230871188b87744c1d899b files/patches/vmnet/021_all_wireless_fix.patch 668
+RMD160 dbcd47fc4749b36417d028a5701b831035853d9e files/patches/vmnet/021_all_wireless_fix.patch 668
+SHA256 231e4c15eb67753da10c01cfebecd851a01f6956263df69e4fb5a9a42957ff60 files/patches/vmnet/021_all_wireless_fix.patch 668
 DIST VMware-player-2.0.2-59824.i386.tar.gz 67762051 RMD160 bdf0375045aa2702f0c19cf755e019307316db2e SHA1 52a9018438746ac88e965ae081120da6f8e9fbf5 SHA256 2fcaca511c0344333d9f306bab09507573c17cc4d71807a545624953cc68e138
 DIST VMware-player-2.0.2-59824.x86_64.tar.gz 33049210 RMD160 1d4351d7cc8bec4d4fe492c46656807ac2220717 SHA1 a7aace822f5a730ec7d289d074c607832abd8c72 SHA256 b0fce2e1552070d492e04ab684aa32fecf587ec06e3ab802373d5e94e0e9f72b
-DIST vmware-any-any-update114.tar.gz 470728 RMD160 06beab6c71a73a94da7e95cfd846117e299a22c1 SHA1 47323b23955a9eddda396ac1970c0a0cfbd02dea SHA256 eff8a5240a2928ef14e5ec81494ea1f531c4b7ea6f9b869659e8f7ea3272fdd5
+DIST vmware-any-any-update115.tar.gz 493641 RMD160 56cabe56f70c01a22a7671e861cc5a2df19855c7 SHA1 ff9b6fdf6ca74495eb5f4822a1854fc91185377c SHA256 b1c14fa9514663b85c2efe8331407e71cce96e5a21a8b941fa570c960bbdcaa1
 EBUILD vmware-modules-1.0.0.11-r1.ebuild 310 RMD160 7748b52659054c3b5b29181cbb35083eee30158a SHA1 7f20b5bb8808761897ccc8c395f6ee3e9d10065e SHA256 e897d58dd5b68ede4c58f02d2702dcdd0b85b16726bd8b4ec04e28a73ada8b7f
 MD5 20e6449837fa96d4d4b21fa5a356fb72 vmware-modules-1.0.0.11-r1.ebuild 310
 RMD160 7748b52659054c3b5b29181cbb35083eee30158a vmware-modules-1.0.0.11-r1.ebuild 310
@@ -25,30 +40,44 @@ EBUILD vmware-modules-1.0.0.16-r1.ebuild 350 RMD160 1be5daf6e1bbf0a83dace59330e3
 MD5 3b1bba3e7941a463ac4542d07296e6fb vmware-modules-1.0.0.16-r1.ebuild 350
 RMD160 1be5daf6e1bbf0a83dace59330e327d628624cde vmware-modules-1.0.0.16-r1.ebuild 350
 SHA256 191e9998c8351111566e9e2dc68ac5e20f6dd48b6ad1998eb60403b7334158bc vmware-modules-1.0.0.16-r1.ebuild 350
+EBUILD vmware-modules-1.0.0.17-r1.ebuild 459 RMD160 2ef0f8d190cec299cccf440e7cc53aea95000f1d SHA1 86d85a23f0574a33da06309e8d470b89ceff5fac SHA256 0701e46f0b3cf2fb1bbc20d3b3eb8a6be680889ed3bcc8c06aa8e905a9be74fb
+MD5 ade7a767760d23ba3cd089b9101043ad vmware-modules-1.0.0.17-r1.ebuild 459
+RMD160 2ef0f8d190cec299cccf440e7cc53aea95000f1d vmware-modules-1.0.0.17-r1.ebuild 459
+SHA256 0701e46f0b3cf2fb1bbc20d3b3eb8a6be680889ed3bcc8c06aa8e905a9be74fb vmware-modules-1.0.0.17-r1.ebuild 459
 EBUILD vmware-modules-1.0.0.17.ebuild 631 RMD160 ff0c15ea2f767f35d7ffa7a611f931ced71eff47 SHA1 dcd2851c5e6c591772dd7fa75ac4ce2f857d69df SHA256 d4514fc8c500f87342fa9cd971400919c3b727d71581ab9d6c85e9859036f8ae
 MD5 1686bbc6dfaa539397161dd4815adfcf vmware-modules-1.0.0.17.ebuild 631
 RMD160 ff0c15ea2f767f35d7ffa7a611f931ced71eff47 vmware-modules-1.0.0.17.ebuild 631
 SHA256 d4514fc8c500f87342fa9cd971400919c3b727d71581ab9d6c85e9859036f8ae vmware-modules-1.0.0.17.ebuild 631
-MISC ChangeLog 6133 RMD160 6ab62443b7a78437d7b8be43b5609c2e64632430 SHA1 a8b3744911318d772d3ddf207b70385b5a22ec27 SHA256 0837dfec11d82b8338fc99d7586d341ebc5b7cc63537d54edc4b0470ed466686
-MD5 349cfab5a949f05f6a1707839d78d6e6 ChangeLog 6133
-RMD160 6ab62443b7a78437d7b8be43b5609c2e64632430 ChangeLog 6133
-SHA256 0837dfec11d82b8338fc99d7586d341ebc5b7cc63537d54edc4b0470ed466686 ChangeLog 6133
+MISC ChangeLog 6491 RMD160 4b4c0a9e4190234ba13e0a95a1bf53bed87aae27 SHA1 a0a852b9f6c0b3233188dcf20cbd2280c49decc0 SHA256 1406e7a597d9232043ece25896664f29f21ea02aa7edca0581c8e702da538ca5
+MD5 796425a50f9011732d2a0f71b75b208f ChangeLog 6491
+RMD160 4b4c0a9e4190234ba13e0a95a1bf53bed87aae27 ChangeLog 6491
+SHA256 1406e7a597d9232043ece25896664f29f21ea02aa7edca0581c8e702da538ca5 ChangeLog 6491
 MISC metadata.xml 159 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 SHA1 f46b02a39bcd0165558de67ff4256cfc812418a3 SHA256 8581ae1c90a48f50fa0542c7fb28cb8984baaf12f50fa18f33e467081effb215
 MD5 7cc95faad4185e8ed375248bc73a17fc metadata.xml 159
 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 metadata.xml 159
 SHA256 8581ae1c90a48f50fa0542c7fb28cb8984baaf12f50fa18f33e467081effb215 metadata.xml 159
-MD5 3a929e7e8ee570f4927de622981face1 files/digest-vmware-modules-1.0.0.11-r1 274
-RMD160 3802727bf21775d73666444c14ab987fabe9775e files/digest-vmware-modules-1.0.0.11-r1 274
-SHA256 512ff77000e6217eafdd934eb8699c63ed78ea4b7a96a1db1d812cc820878db7 files/digest-vmware-modules-1.0.0.11-r1 274
-MD5 3a929e7e8ee570f4927de622981face1 files/digest-vmware-modules-1.0.0.13-r1 274
-RMD160 3802727bf21775d73666444c14ab987fabe9775e files/digest-vmware-modules-1.0.0.13-r1 274
-SHA256 512ff77000e6217eafdd934eb8699c63ed78ea4b7a96a1db1d812cc820878db7 files/digest-vmware-modules-1.0.0.13-r1 274
-MD5 3a929e7e8ee570f4927de622981face1 files/digest-vmware-modules-1.0.0.15-r1 274
-RMD160 3802727bf21775d73666444c14ab987fabe9775e files/digest-vmware-modules-1.0.0.15-r1 274
-SHA256 512ff77000e6217eafdd934eb8699c63ed78ea4b7a96a1db1d812cc820878db7 files/digest-vmware-modules-1.0.0.15-r1 274
-MD5 3a929e7e8ee570f4927de622981face1 files/digest-vmware-modules-1.0.0.16-r1 274
-RMD160 3802727bf21775d73666444c14ab987fabe9775e files/digest-vmware-modules-1.0.0.16-r1 274
-SHA256 512ff77000e6217eafdd934eb8699c63ed78ea4b7a96a1db1d812cc820878db7 files/digest-vmware-modules-1.0.0.16-r1 274
+MD5 d979249daa6d71238d110abbd1e34906 files/digest-vmware-modules-1.0.0.11-r1 274
+RMD160 fb9ac6a7bc67ee5898f64aeb418040f8d1d8c7f2 files/digest-vmware-modules-1.0.0.11-r1 274
+SHA256 0fe924125386e5ce1b0253b2c61e04f41ed653b9bf70fa3536fc4428ca0bb16c files/digest-vmware-modules-1.0.0.11-r1 274
+MD5 d979249daa6d71238d110abbd1e34906 files/digest-vmware-modules-1.0.0.13-r1 274
+RMD160 fb9ac6a7bc67ee5898f64aeb418040f8d1d8c7f2 files/digest-vmware-modules-1.0.0.13-r1 274
+SHA256 0fe924125386e5ce1b0253b2c61e04f41ed653b9bf70fa3536fc4428ca0bb16c files/digest-vmware-modules-1.0.0.13-r1 274
+MD5 d979249daa6d71238d110abbd1e34906 files/digest-vmware-modules-1.0.0.15-r1 274
+RMD160 fb9ac6a7bc67ee5898f64aeb418040f8d1d8c7f2 files/digest-vmware-modules-1.0.0.15-r1 274
+SHA256 0fe924125386e5ce1b0253b2c61e04f41ed653b9bf70fa3536fc4428ca0bb16c files/digest-vmware-modules-1.0.0.15-r1 274
+MD5 d979249daa6d71238d110abbd1e34906 files/digest-vmware-modules-1.0.0.16-r1 274
+RMD160 fb9ac6a7bc67ee5898f64aeb418040f8d1d8c7f2 files/digest-vmware-modules-1.0.0.16-r1 274
+SHA256 0fe924125386e5ce1b0253b2c61e04f41ed653b9bf70fa3536fc4428ca0bb16c files/digest-vmware-modules-1.0.0.16-r1 274
 MD5 7d94407c410b455e7d9478842bea1645 files/digest-vmware-modules-1.0.0.17 602
 RMD160 69b566301ac646cf8d0d04a4cf87c3e9e34fa7c5 files/digest-vmware-modules-1.0.0.17 602
 SHA256 eb6ffc7f02ee381e269af65129504e5be6d677a978a9275771a35aa6705ac926 files/digest-vmware-modules-1.0.0.17 602
+MD5 d979249daa6d71238d110abbd1e34906 files/digest-vmware-modules-1.0.0.17-r1 274
+RMD160 fb9ac6a7bc67ee5898f64aeb418040f8d1d8c7f2 files/digest-vmware-modules-1.0.0.17-r1 274
+SHA256 0fe924125386e5ce1b0253b2c61e04f41ed653b9bf70fa3536fc4428ca0bb16c files/digest-vmware-modules-1.0.0.17-r1 274
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHmotbu7rWomwgFXoRAsl0AJ9vlTjqtVL839gaKFaVfhx3L27YgwCeL3Pn
+30EpMvivVkJRTPEc1iE9Kxc=
+=QHrR
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/vmware-modules/files/patches/vmmon/030_all_fix-linux-headers.patch b/app-emulation/vmware-modules/files/patches/vmmon/030_all_fix-linux-headers.patch
new file mode 100644
index 000000000000..19c97d7e5b71
--- /dev/null
+++ b/app-emulation/vmware-modules/files/patches/vmmon/030_all_fix-linux-headers.patch
@@ -0,0 +1,12 @@
+diff -uNr vmmon-only.old/include/vcpuset.h vmmon-only/include/vcpuset.h
+--- vmmon-only.old/include/vcpuset.h    2007-07-22 12:21:17.000000000 +0100
++++ vmmon-only/include/vcpuset.h    2007-12-01 15:52:11.000000000 +0000
+@@ -71,7 +71,7 @@
+ #define ffs(x) ffs_x86_64(x)
+ 
+ #elif defined MODULE
+-   #include "asm/bitops.h"
++   #include "linux/bitops.h"
+ #elif defined __APPLE__ && defined KERNEL
+    /* 
+     * XXXMACOS An ugly hack to resolve redefinition of PAGE_ defines 
diff --git a/app-emulation/vmware-modules/files/patches/vmnet/021_all_wireless_fix.patch b/app-emulation/vmware-modules/files/patches/vmnet/021_all_wireless_fix.patch
new file mode 100644
index 000000000000..a550e89e99b1
--- /dev/null
+++ b/app-emulation/vmware-modules/files/patches/vmnet/021_all_wireless_fix.patch
@@ -0,0 +1,21 @@
+diff -uNr vmnet-only.old/bridge.c vmnet-only/bridge.c
+--- vmnet-only.old/bridge.c	2008-01-06 21:25:04.000000000 +0000
++++ vmnet-only/bridge.c	2008-01-06 21:27:42.000000000 +0000
+@@ -32,7 +32,7 @@
+ #include <linux/tcp.h>
+ #include <net/tcp.h>
+ 
+-#ifdef CONFIG_NET_RADIO
++#if defined CONFIG_NET_RADIO || defined CONFIG_WLAN_80211
+ #   include <linux/wireless.h>
+ #endif
+ #include "vmnetInt.h"
+@@ -764,7 +764,7 @@
+ {
+ #ifdef CONFIG_WIRELESS_EXT
+    return dev->wireless_handlers != NULL;
+-#elif !defined(CONFIG_NET_RADIO)
++#elif !defined CONFIG_NET_RADIO && !defined CONFIG_WLAN_80211
+    return FALSE;
+ #elif WIRELESS_EXT > 19
+    return dev->wireless_handlers != NULL;