Bug 301320

Package-Manager: portage-2.1.7.17/cvs/Linux x86_64

6 files changed, 1198 insertions, 11 deletions

diff --git a/app-emulation/vmware-modules/ChangeLog b/app-emulation/vmware-modules/ChangeLog
index 9967ef9e1391..f77440513ebc 100644
--- a/app-emulation/vmware-modules/ChangeLog
+++ b/app-emulation/vmware-modules/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/vmware-modules
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.54 2010/02/13 18:52:24 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.55 2010/02/26 14:54:32 vadimk Exp $
+
+  26 Feb 2010; Vadim Kuznetsov <vadimk@gentoo.org>
+  +files/1.0.0.24-autoconf-generated.patch,
+  vmware-modules-1.0.0.24-r1.ebuild,
+  +files/1.0.0.25-autoconf-generated.patch,
+  vmware-modules-1.0.0.25-r1.ebuild:
+  Bug 301320
 
 *vmware-modules-1.0.0.25-r1 (13 Feb 2010)
 
diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest
index b22529a3b965..d7f2b36f6cb0 100644
--- a/app-emulation/vmware-modules/Manifest
+++ b/app-emulation/vmware-modules/Manifest
@@ -1,7 +1,9 @@
+AUX 1.0.0.24-autoconf-generated.patch 18142 RMD160 05064550c8f4308bf803298500deca0dec0585d0 SHA1 fb13499b017395d7bc4e18ca71f6c683f68e70de SHA256 9d7421c57ed8da0b172532d30db6e938b18a6f30e39c725a6fc515a7feddcd13
 AUX 1.0.0.24-kernel-2.6.29.patch 10343 RMD160 4c93cab9f129a279671aa82af989121b3bf1f191 SHA1 1fcd62b30ca2a15c82ffc82924eef3447a4a4e08 SHA256 7bda64e6c0fb2fd30f71b38fa0920169356913e17bb8802ffc1e57622a0dd79c
 AUX 1.0.0.24-kernel-2.6.30.patch 1062 RMD160 8c02543ffcd46db13f179a63c589315f103b6c22 SHA1 f4d8030f1197788d9e2263ab4e3e861652702cd3 SHA256 deef76da29aec2aff33a0fe816faa1c4b61cb27858cdd6c1af70f9eaf9cde158
 AUX 1.0.0.24-makefile-kernel-dir.patch 2129 RMD160 885b638c78cb0663d0d55682bafd453c6122fe17 SHA1 9a08768a9923d8259346f89ae78deae878b68df9 SHA256 fd583c13433bb3ddc64a21af6c472e3c6a2747990118a22881d2b48c16e5655f
 AUX 1.0.0.24-vmnet-2.6.31.patch 13974 RMD160 84af8197b341ccea2fdda39225f9259ccdbb4a2d SHA1 745c973cce7c220f2f5d6853d5ede61738fdd729 SHA256 b8391b3ecb7a15c1763b2eace1e747f73f8ace3c1125b5402b8662d7b29298b5
+AUX 1.0.0.25-autoconf-generated.patch 17674 RMD160 38343d24d8cdfd7e312f3e60cf87f7236da6df22 SHA1 6e427c26f1a1efafff4a1c8623ef9ada874540e5 SHA256 d35b879cb950373939d3cef32e56be87f5b216ece3fe12af5e04c2c7c146a394
 AUX 1.0.0.25-makefile-include.patch 3185 RMD160 a3aa2f7cb3a51c96be13080061543d9664d98096 SHA1 df61745eeb49f517a9b7fb882ec0baab772544dd SHA256 50b529606062794d90083a590e05966b3420f1f9c6648863bd0ff360c17d9b34
 AUX 1.0.0.25-makefile-kernel-dir.patch 2129 RMD160 885b638c78cb0663d0d55682bafd453c6122fe17 SHA1 9a08768a9923d8259346f89ae78deae878b68df9 SHA256 fd583c13433bb3ddc64a21af6c472e3c6a2747990118a22881d2b48c16e5655f
 AUX patches/000_all_makefile-include-directory.patch 342 RMD160 ae8b7c2e628681fff153bfa10242e62df5ab2e10 SHA1 be4f203063e676dc022ce600e15479b6ea56b954 SHA256 2da16602ef3c4cb040ac80a9fed18660fadcae2e843f425da0872f50aa5356db
@@ -21,8 +23,8 @@ DIST vmware-modules-1.0.0.25.amd64.tar.bz2 488816 RMD160 deb03d08b8cf1cad03967b3
 DIST vmware-modules-1.0.0.25.x86.tar.bz2 488848 RMD160 4511e6f7a389ed3affe7e058814597d4cfa2ca27 SHA1 155bccf1f27e6aecc765980443b6351e6ae15028 SHA256 ee794a0b714173a91bb523290a579306845f7af9696e5a274745d45c37f1f0e8
 EBUILD vmware-modules-1.0.0.15-r1.ebuild 311 RMD160 910dd70caac0af5c1bdb6d714b96f9c134cbdd8a SHA1 c56288915c67790e3b38207e14598923203b2c7c SHA256 dbce7d028f4fe0f042323a7e05754e311366ac33feb7361dab63af70017683f7
 EBUILD vmware-modules-1.0.0.15-r2.ebuild 445 RMD160 d16a678a0c9291289be89006b74782aeb0ba5a7a SHA1 c27bc611caae5e0b4afdc45ed5d62ee238a43b1e SHA256 f387e8c45b0b2fcee19b80a66dd3497981c54297fd9d21b7e01c60fb7e39a65d
-EBUILD vmware-modules-1.0.0.24-r1.ebuild 1943 RMD160 56bcb03db986f8fa58c97acb4b15af2736c26073 SHA1 30acb5c3efdf7b0e517e3bc052786d782dff809a SHA256 c861825ccf2bc3cdee8abb4bafa43df146a7a639ca02c347f10157acbc13e060
-EBUILD vmware-modules-1.0.0.25-r1.ebuild 2020 RMD160 b7f5a5af55aee4276ad0219d298f932bd209127b SHA1 4a2453a2bed7ad4524449596b3e2fc6db1b8b1d7 SHA256 4c4e0b16b78a7af0c7af49ede0e8d899e390f483c129a7d95b58a47d8f25ca33
+EBUILD vmware-modules-1.0.0.24-r1.ebuild 1996 RMD160 fa3489c03b4969c8dc13ef1abbbc0f5f2f51abbd SHA1 e9aafc9139cfaa99710a9bbe3932c282e986de7b SHA256 ae120390719de2d88368ca6721edfa7b06e638dfa2f68d03a8e733a1962caffc
+EBUILD vmware-modules-1.0.0.25-r1.ebuild 1892 RMD160 3f278d97838aef8a9c9d386bbf4b39daf29b5af4 SHA1 a50ef9d741c4e67215010146e3b2b0691fc09b8c SHA256 43aea0c0fc63e20ebe2af19d2ff7d002fd47d770598a2b8a20f995254e703ad7
 EBUILD vmware-modules-1.0.0.25.ebuild 1836 RMD160 2db7cf340cc42c7e2d10942d4805279f00c301e4 SHA1 33ec3c9815d90b21d816e7caa5925d92a2a746d5 SHA256 bfa9342bc2c3ca654e35ab3e441880d001b70f45c22e72a7f5129dbf99609847
-MISC ChangeLog 12258 RMD160 10d08602ecfbea534648455d84a2a3a86a02a3a6 SHA1 1a5418c1aa80de92f78b327e3d5a9bd0ccbf899b SHA256 e85d3b39029e51d337fda725d48dd46dbbcb8f6400970ec1edabf869ce2ac70e
+MISC ChangeLog 12484 RMD160 8a1174760c7d434670b4aa05b7ba3237341ccaaa SHA1 4e4b44875172b2033f43940156874496cbc82bd2 SHA256 e8a261e2fc12f790df7b9d766c270e4844dd6e6b52ac0fff7d730538a6fa7152
 MISC metadata.xml 288 RMD160 da2ee1499dd87693b63592a337d8352494cb9652 SHA1 e1b50a587afb7878e21828a957a6838e7d08e4e8 SHA256 100017b3059be218965923798780ab195dafaa893f98088592fb5b299e686c37
diff --git a/app-emulation/vmware-modules/files/1.0.0.24-autoconf-generated.patch b/app-emulation/vmware-modules/files/1.0.0.24-autoconf-generated.patch
new file mode 100644
index 000000000000..031fe46de92c
--- /dev/null
+++ b/app-emulation/vmware-modules/files/1.0.0.24-autoconf-generated.patch
@@ -0,0 +1,598 @@
+--- vmblock-only/autoconf/cachecreate.c	2009-03-27 06:34:29.000000000 +0100
++++ vmblock-only/autoconf/cachecreate.c.new	2010-02-05 23:29:47.077574422 +0100
+@@ -16,8 +16,12 @@
+  *
+  *********************************************************/
+ 
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ /*
+  * All kernels before 2.6.22 take 6 arguments.  All kernels since
+--- vmblock-only/autoconf/cachector.c	2009-03-27 06:34:29.000000000 +0100
++++ vmblock-only/autoconf/cachector.c.new	2010-02-05 23:32:39.086240477 +0100
+@@ -16,8 +16,12 @@
+  *
+  *********************************************************/
+ 
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ /*
+  * Between 2.6.23 and 2.6.24-rc1 ctor prototype was changed from
+--- vmblock-only/autoconf/cachector1.c	2009-03-27 06:34:29.000000000 +0100
++++ vmblock-only/autoconf/cachector1.c.new	2010-02-05 23:33:57.863050887 +0100
+@@ -16,8 +16,12 @@
+  *
+  *********************************************************/
+ 
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ /*
+  * Between 2.6.27-rc1 and 2.6.27-rc2 ctor prototype was changed from
+--- vmblock-only/autoconf/epoll.c	2009-03-27 06:34:29.000000000 +0100
++++ vmblock-only/autoconf/epoll.c.new	2010-02-05 23:34:03.782195888 +0100
+@@ -22,8 +22,12 @@
+  * never had it, but some distros backported epoll patch.
+  */
+ 
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
+ #include <linux/poll.h>
+--- vmblock-only/autoconf/filldir1.c	2009-03-27 06:34:29.000000000 +0100
++++ vmblock-only/autoconf/filldir1.c.new	2010-02-05 23:34:09.582480900 +0100
+@@ -16,8 +16,12 @@
+  *
+  *********************************************************/
+ 
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
+ #include <linux/fs.h>
+--- vmblock-only/autoconf/geninclude.c	2009-03-27 06:34:29.000000000 +0100
++++ vmblock-only/autoconf/geninclude.c.new	2010-02-05 23:34:16.775702411 +0100
+@@ -16,7 +16,12 @@
+  *
+  *********************************************************/
+ 
++#include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
+ #include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #ifdef CONFIG_X86_VOYAGER
+ APATH/mach-voyager
+--- vmblock-only/autoconf/getsb1.c	2009-03-27 06:34:29.000000000 +0100
++++ vmblock-only/autoconf/getsb1.c.new	2010-02-05 23:34:21.727106345 +0100
+@@ -16,8 +16,12 @@
+  *
+  *********************************************************/
+ 
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
+ 
+--- vmblock-only/autoconf/setnice.c	2009-03-27 06:34:29.000000000 +0100
++++ vmblock-only/autoconf/setnice.c.new	2010-02-05 23:34:27.326719885 +0100
+@@ -20,8 +20,12 @@
+  * set_user_nice appeared in 2.4.21.  But some distros
+  * backported it to older kernels.
+  */
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 21)
+ #include <linux/sched.h>
+--- vmblock-only/autoconf/statfs1.c	2009-03-27 06:34:29.000000000 +0100
++++ vmblock-only/autoconf/statfs1.c.new	2010-02-05 23:34:34.998496715 +0100
+@@ -16,8 +16,12 @@
+  *
+  *********************************************************/
+ 
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
+ #include <linux/fs.h>
+--- vmblock-only/include/driver-config.h.old	2010-02-03 00:12:31.439000354 +0100
++++ vmblock-only/include/driver-config.h	2010-02-03 00:13:29.608823892 +0100
+@@ -32,7 +32,12 @@
+ #define INCLUDE_ALLOW_VMNIXMOD
+ #include "includeCheck.h"
+
++#include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
+ #include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ #include "compat_version.h"
+ 
+ /*
+--- vmci-only/autoconf/epoll.c	2009-03-27 06:34:31.000000000 +0100
++++ vmci-only/autoconf/epoll.c.new	2010-02-05 23:38:31.793973380 +0100
+@@ -22,8 +22,12 @@
+  * never had it, but some distros backported epoll patch.
+  */
+ 
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
+ #include <linux/poll.h>
+--- vmci-only/autoconf/geninclude.c	2009-03-27 06:34:31.000000000 +0100
++++ vmci-only/autoconf/geninclude.c.new	2010-02-05 23:38:45.704327021 +0100
+@@ -16,7 +16,12 @@
+  *
+  *********************************************************/
+ 
++#include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
+ #include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #ifdef CONFIG_X86_VOYAGER
+ APATH/mach-voyager
+--- vmci-only/include/driver-config.h.old	2010-02-03 00:12:31.439000354 +0100
++++ vmci-only/include/driver-config.h	2010-02-03 00:13:29.608823892 +0100
+@@ -32,7 +32,12 @@
+ #define INCLUDE_ALLOW_VMNIXMOD
+ #include "includeCheck.h"
+ 
++#include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
+ #include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ #include "compat_version.h"
+ 
+ /*
+--- vmmon-only/autoconf/epoll.c	2010-02-05 23:39:45.361576611 +0100
++++ vmmon-only/autoconf/epoll.c.new	2010-02-05 23:40:41.241245910 +0100
+@@ -22,8 +22,12 @@
+  * never had it, but some distros backported epoll patch.
+  */
+ 
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
+ #include <linux/poll.h>
+--- vmmon-only/autoconf/geninclude.c	2010-02-05 23:39:45.362577852 +0100
++++ vmmon-only/autoconf/geninclude.c.new	2010-02-05 23:40:50.833402279 +0100
+@@ -16,7 +16,12 @@
+  *
+  *********************************************************/
+ 
++#include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
+ #include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #ifdef CONFIG_X86_VOYAGER
+ APATH/mach-voyager
+--- vmmon-only/autoconf/nopage1.c	2010-02-05 23:39:45.363577625 +0100
++++ vmmon-only/autoconf/nopage1.c.new	2010-02-05 23:40:58.674161808 +0100
+@@ -21,8 +21,12 @@
+  * it uses new prototype.  For 2.6.1 (and its -rc) and older do
+  * compile test.
+  */
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 2)
+ #include <linux/mm.h>
+--- vmmon-only/autoconf/setnice.c	2010-02-05 23:39:45.363577625 +0100
++++ vmmon-only/autoconf/setnice.c.new	2010-02-05 23:41:12.017985901 +0100
+@@ -20,8 +20,12 @@
+  * set_user_nice appeared in 2.4.21.  But some distros
+  * backported it to older kernels.
+  */
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 21)
+ #include <linux/sched.h>
+--- vmmon-only/autoconf/smpcall.c	2010-02-05 23:39:45.364577754 +0100
++++ vmmon-only/autoconf/smpcall.c.new	2010-02-05 23:40:25.057954672 +0100
+@@ -21,8 +21,12 @@
+  * Change happened between 2.6.26 and 2.6.27-rc1.
+  */
+ 
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
+ #   error This compile test intentionally fails.
+--- vmmon-only/include/driver-config.h.old	2010-02-03 00:12:31.439000354 +0100
++++ vmmon-only/include/driver-config.h	2010-02-03 00:13:29.608823892 +0100
+@@ -32,7 +32,12 @@
+ #define INCLUDE_ALLOW_VMNIXMOD
+ #include "includeCheck.h"
+ 
++#include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
+ #include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ #include "compat_version.h"
+ 
+ /*
+--- vmnet-only/epoll.c	2009-03-27 06:34:28.000000000 +0100
++++ vmnet-only/epoll.c.new	2010-02-05 23:43:43.642940246 +0100
+@@ -22,8 +22,12 @@
+  * never had it, but some distros backported epoll patch.
+  */
+ 
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
+ #include <linux/poll.h>
+--- vmnet-only/geninclude.c	2009-03-27 06:34:28.000000000 +0100
++++ vmnet-only/geninclude.c.new	2010-02-05 23:43:52.931081128 +0100
+@@ -16,7 +16,12 @@
+  *
+  *********************************************************/
+ 
++#include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
+ #include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #ifdef CONFIG_X86_VOYAGER
+ APATH/mach-voyager
+--- vmnet-only/netdev_has_dev_net.c	2009-03-27 06:34:28.000000000 +0100
++++ vmnet-only/netdev_has_dev_net.c.new	2010-02-05 23:44:11.315557541 +0100
+@@ -21,8 +21,12 @@
+  * It appeared between 2.6.25 and 2.6.26-rc1.
+  */
+ 
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25)
+ #   error This compile test intentionally fails.
+--- vmnet-only/netdev_has_net.c	2009-03-27 06:34:28.000000000 +0100
++++ vmnet-only/netdev_has_net.c.new	2010-02-05 23:44:29.348948588 +0100
+@@ -27,8 +27,12 @@
+  * as hopefully in few weeks all 2.6.24-rc1 users will be gone.
+  */
+ 
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23)
+ #   error This compile test intentionally fails.
+--- vmnet-only/nfhook_uses_skb.c	2009-03-27 06:34:28.000000000 +0100
++++ vmnet-only/nfhook_uses_skb.c.new	2010-02-05 23:44:35.228702615 +0100
+@@ -23,8 +23,12 @@
+  * 2.6.24-rc1.
+  */
+ 
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23)
+ #   error This compile test intentionally fails.
+--- vmnet-only/setnice.c	2009-03-27 06:34:28.000000000 +0100
++++ vmnet-only/setnice.c.new	2010-02-05 23:44:45.613286546 +0100
+@@ -20,8 +20,12 @@
+  * set_user_nice appeared in 2.4.21.  But some distros
+  * backported it to older kernels.
+  */
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 21)
+ #include <linux/sched.h>
+--- vmnet-only/sk_alloc.c	2009-03-27 06:34:28.000000000 +0100
++++ vmnet-only/sk_alloc.c.new	2010-02-05 23:44:59.796490045 +0100
+@@ -21,8 +21,12 @@
+  * This API change was introduced between 2.6.12-rc1 and 2.6.12-rc2.
+  */
+ 
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 13)
+ #include <net/sock.h>
+--- vmnet-only/skblin.c	2009-03-27 06:34:28.000000000 +0100
++++ vmnet-only/skblin.c.new	2010-02-05 23:45:17.276123591 +0100
+@@ -20,8 +20,12 @@
+  * Detect whether skb_linearize takes one or two arguments.
+  */
+ 
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 17)
+ /*
+--- vmnet-only/socket.c	2009-03-27 06:34:28.000000000 +0100
++++ vmnet-only/socket.c.new	2010-02-05 23:45:30.149065913 +0100
+@@ -21,8 +21,12 @@
+  * It got renamed from wmem_alloc sometime during 2.5.x.
+  */
+ 
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
+ #include <net/sock.h>
+--- vmnet-only/driver-config.h.old	2010-02-03 00:12:31.439000354 +0100
++++ vmnet-only/driver-config.h	2010-02-03 00:13:29.608823892 +0100
+@@ -32,7 +32,12 @@
+ #define INCLUDE_ALLOW_VMNIXMOD
+ #include "includeCheck.h"
+ 
++#include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
+ #include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ #include "compat_version.h"
+ 
+ /*
+--- vsock-only/autoconf/cachecreate.c	2009-03-27 06:34:32.000000000 +0100
++++ vsock-only/autoconf/cachecreate.c.new	2010-02-05 23:46:29.157369452 +0100
+@@ -16,8 +16,12 @@
+  *
+  *********************************************************/
+ 
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ /*
+  * All kernels before 2.6.22 take 6 arguments.  All kernels since
+--- vsock-only/autoconf/epoll.c	2009-03-27 06:34:32.000000000 +0100
++++ vsock-only/autoconf/epoll.c.new	2010-02-05 23:46:39.884406108 +0100
+@@ -22,8 +22,12 @@
+  * never had it, but some distros backported epoll patch.
+  */
+ 
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
+ #include <linux/poll.h>
+--- vsock-only/autoconf/filldir1.c	2009-03-27 06:34:32.000000000 +0100
++++ vsock-only/autoconf/filldir1.c.new	2010-02-05 23:46:52.692243523 +0100
+@@ -16,8 +16,12 @@
+  *
+  *********************************************************/
+ 
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
+ #include <linux/fs.h>
+--- vsock-only/autoconf/geninclude.c	2009-03-27 06:34:32.000000000 +0100
++++ vsock-only/autoconf/geninclude.c.new	2010-02-05 23:46:58.292953391 +0100
+@@ -16,7 +16,12 @@
+  *
+  *********************************************************/
+ 
++#include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
+ #include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #ifdef CONFIG_X86_VOYAGER
+ APATH/mach-voyager
+--- vsock-only/autoconf/getsb1.c	2009-03-27 06:34:32.000000000 +0100
++++ vsock-only/autoconf/getsb1.c.new	2010-02-05 23:47:07.516892747 +0100
+@@ -16,8 +16,12 @@
+  *
+  *********************************************************/
+ 
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
+ 
+--- vsock-only/autoconf/setnice.c	2009-03-27 06:34:32.000000000 +0100
++++ vsock-only/autoconf/setnice.c.new	2010-02-05 23:47:16.829514462 +0100
+@@ -20,8 +20,12 @@
+  * set_user_nice appeared in 2.4.21.  But some distros
+  * backported it to older kernels.
+  */
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 21)
+ #include <linux/sched.h>
+--- vsock-only/autoconf/sk_filter.c	2009-03-27 06:34:32.000000000 +0100
++++ vsock-only/autoconf/sk_filter.c.new	2010-02-05 23:47:28.501825992 +0100
+@@ -23,8 +23,12 @@
+  * This test will fail to build on kernels with the new interface.
+  */
+ 
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ /*
+  * We'd restrict this test to 2.4.21 and earlier kernels, but Mandrake's
+--- vsock-only/autoconf/statfs1.c	2009-03-27 06:34:32.000000000 +0100
++++ vsock-only/autoconf/statfs1.c.new	2010-02-05 23:47:41.174472911 +0100
+@@ -16,8 +16,12 @@
+  *
+  *********************************************************/
+ 
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
+ #include <linux/fs.h>
+--- vsock-only/include/driver-config.h.old	2010-02-03 00:12:31.439000354 +0100
++++ vsock-only/include/driver-config.h	2010-02-03 00:13:29.608823892 +0100
+@@ -32,7 +32,12 @@
+ #define INCLUDE_ALLOW_VMNIXMOD
+ #include "includeCheck.h"
+ 
++#include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
+ #include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ #include "compat_version.h"
+ 
+ /*
diff --git a/app-emulation/vmware-modules/files/1.0.0.25-autoconf-generated.patch b/app-emulation/vmware-modules/files/1.0.0.25-autoconf-generated.patch
new file mode 100644
index 000000000000..151edadac17a
--- /dev/null
+++ b/app-emulation/vmware-modules/files/1.0.0.25-autoconf-generated.patch
@@ -0,0 +1,582 @@
+--- vmblock-only/autoconf/cachecreate.c	2009-03-27 06:34:29.000000000 +0100
++++ vmblock-only/autoconf/cachecreate.c.new	2010-02-05 23:29:47.077574422 +0100
+@@ -16,8 +16,12 @@
+  *
+  *********************************************************/
+ 
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ /*
+  * All kernels before 2.6.22 take 6 arguments.  All kernels since
+--- vmblock-only/autoconf/cachector.c	2009-03-27 06:34:29.000000000 +0100
++++ vmblock-only/autoconf/cachector.c.new	2010-02-05 23:32:39.086240477 +0100
+@@ -16,8 +16,12 @@
+  *
+  *********************************************************/
+ 
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ /*
+  * Between 2.6.23 and 2.6.24-rc1 ctor prototype was changed from
+--- vmblock-only/autoconf/cachector1.c	2009-03-27 06:34:29.000000000 +0100
++++ vmblock-only/autoconf/cachector1.c.new	2010-02-05 23:33:57.863050887 +0100
+@@ -16,8 +16,12 @@
+  *
+  *********************************************************/
+ 
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ /*
+  * Between 2.6.27-rc1 and 2.6.27-rc2 ctor prototype was changed from
+--- vmblock-only/autoconf/epoll.c	2009-03-27 06:34:29.000000000 +0100
++++ vmblock-only/autoconf/epoll.c.new	2010-02-05 23:34:03.782195888 +0100
+@@ -22,8 +22,12 @@
+  * never had it, but some distros backported epoll patch.
+  */
+ 
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
+ #include <linux/poll.h>
+--- vmblock-only/autoconf/filldir1.c	2009-03-27 06:34:29.000000000 +0100
++++ vmblock-only/autoconf/filldir1.c.new	2010-02-05 23:34:09.582480900 +0100
+@@ -16,8 +16,12 @@
+  *
+  *********************************************************/
+ 
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
+ #include <linux/fs.h>
+--- vmblock-only/autoconf/geninclude.c	2009-03-27 06:34:29.000000000 +0100
++++ vmblock-only/autoconf/geninclude.c.new	2010-02-05 23:34:16.775702411 +0100
+@@ -16,7 +16,12 @@
+  *
+  *********************************************************/
+ 
++#include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
+ #include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #ifdef CONFIG_X86_VOYAGER
+ APATH/mach-voyager
+--- vmblock-only/autoconf/getsb1.c	2009-03-27 06:34:29.000000000 +0100
++++ vmblock-only/autoconf/getsb1.c.new	2010-02-05 23:34:21.727106345 +0100
+@@ -16,8 +16,12 @@
+  *
+  *********************************************************/
+ 
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
+ 
+--- vmblock-only/autoconf/setnice.c	2009-03-27 06:34:29.000000000 +0100
++++ vmblock-only/autoconf/setnice.c.new	2010-02-05 23:34:27.326719885 +0100
+@@ -20,8 +20,12 @@
+  * set_user_nice appeared in 2.4.21.  But some distros
+  * backported it to older kernels.
+  */
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 21)
+ #include <linux/sched.h>
+--- vmblock-only/autoconf/statfs1.c	2009-03-27 06:34:29.000000000 +0100
++++ vmblock-only/autoconf/statfs1.c.new	2010-02-05 23:34:34.998496715 +0100
+@@ -16,8 +16,12 @@
+  *
+  *********************************************************/
+ 
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
+ #include <linux/fs.h>
+--- vmblock-only/include/driver-config.h.old	2010-02-03 00:12:31.439000354 +0100
++++ vmblock-only/include/driver-config.h	2010-02-03 00:13:29.608823892 +0100
+@@ -32,7 +32,12 @@
+ #define INCLUDE_ALLOW_VMNIXMOD
+ #include "includeCheck.h"
+
++#include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
+ #include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ #include "compat_version.h"
+ 
+ /*
+--- vmci-only/autoconf/epoll.c	2009-03-27 06:34:31.000000000 +0100
++++ vmci-only/autoconf/epoll.c.new	2010-02-05 23:38:31.793973380 +0100
+@@ -22,8 +22,12 @@
+  * never had it, but some distros backported epoll patch.
+  */
+ 
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
+ #include <linux/poll.h>
+--- vmci-only/autoconf/geninclude.c	2009-03-27 06:34:31.000000000 +0100
++++ vmci-only/autoconf/geninclude.c.new	2010-02-05 23:38:45.704327021 +0100
+@@ -16,7 +16,12 @@
+  *
+  *********************************************************/
+ 
++#include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
+ #include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #ifdef CONFIG_X86_VOYAGER
+ APATH/mach-voyager
+--- vmci-only/include/driver-config.h.old	2010-02-03 00:12:31.439000354 +0100
++++ vmci-only/include/driver-config.h	2010-02-03 00:13:29.608823892 +0100
+@@ -32,7 +32,12 @@
+ #define INCLUDE_ALLOW_VMNIXMOD
+ #include "includeCheck.h"
+ 
++#include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
+ #include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ #include "compat_version.h"
+ 
+ /*
+--- vmmon-only/autoconf/epoll.c	2010-02-05 23:39:45.361576611 +0100
++++ vmmon-only/autoconf/epoll.c.new	2010-02-05 23:40:41.241245910 +0100
+@@ -22,8 +22,12 @@
+  * never had it, but some distros backported epoll patch.
+  */
+ 
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
+ #include <linux/poll.h>
+--- vmmon-only/autoconf/geninclude.c	2010-02-05 23:39:45.362577852 +0100
++++ vmmon-only/autoconf/geninclude.c.new	2010-02-05 23:40:50.833402279 +0100
+@@ -16,7 +16,12 @@
+  *
+  *********************************************************/
+ 
++#include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
+ #include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #ifdef CONFIG_X86_VOYAGER
+ APATH/mach-voyager
+--- vmmon-only/autoconf/nopage1.c	2010-02-05 23:39:45.363577625 +0100
++++ vmmon-only/autoconf/nopage1.c.new	2010-02-05 23:40:58.674161808 +0100
+@@ -21,8 +21,12 @@
+  * it uses new prototype.  For 2.6.1 (and its -rc) and older do
+  * compile test.
+  */
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 2)
+ #include <linux/mm.h>
+--- vmmon-only/autoconf/setnice.c	2010-02-05 23:39:45.363577625 +0100
++++ vmmon-only/autoconf/setnice.c.new	2010-02-05 23:41:12.017985901 +0100
+@@ -20,8 +20,12 @@
+  * set_user_nice appeared in 2.4.21.  But some distros
+  * backported it to older kernels.
+  */
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 21)
+ #include <linux/sched.h>
+--- vmmon-only/autoconf/smpcall.c	2010-02-05 23:39:45.364577754 +0100
++++ vmmon-only/autoconf/smpcall.c.new	2010-02-05 23:40:25.057954672 +0100
+@@ -21,8 +21,12 @@
+  * Change happened between 2.6.26 and 2.6.27-rc1.
+  */
+ 
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
+ #   error This compile test intentionally fails.
+--- vmmon-only/include/driver-config.h.old	2010-02-03 00:12:31.439000354 +0100
++++ vmmon-only/include/driver-config.h	2010-02-03 00:13:29.608823892 +0100
+@@ -32,7 +32,12 @@
+ #define INCLUDE_ALLOW_VMNIXMOD
+ #include "includeCheck.h"
+ 
++#include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
+ #include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ #include "compat_version.h"
+ 
+ /*
+--- vmnet-only/epoll.c	2009-03-27 06:34:28.000000000 +0100
++++ vmnet-only/epoll.c.new	2010-02-05 23:43:43.642940246 +0100
+@@ -22,8 +22,12 @@
+  * never had it, but some distros backported epoll patch.
+  */
+ 
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
+ #include <linux/poll.h>
+--- vmnet-only/geninclude.c	2009-03-27 06:34:28.000000000 +0100
++++ vmnet-only/geninclude.c.new	2010-02-05 23:43:52.931081128 +0100
+@@ -16,7 +16,12 @@
+  *
+  *********************************************************/
+ 
++#include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
+ #include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #ifdef CONFIG_X86_VOYAGER
+ APATH/mach-voyager
+--- vmnet-only/netdev_has_dev_net.c	2009-03-27 06:34:28.000000000 +0100
++++ vmnet-only/netdev_has_dev_net.c.new	2010-02-05 23:44:11.315557541 +0100
+@@ -21,8 +21,12 @@
+  * It appeared between 2.6.25 and 2.6.26-rc1.
+  */
+ 
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25)
+ #   error This compile test intentionally fails.
+--- vmnet-only/netdev_has_net.c	2009-03-27 06:34:28.000000000 +0100
++++ vmnet-only/netdev_has_net.c.new	2010-02-05 23:44:29.348948588 +0100
+@@ -27,8 +27,12 @@
+  * as hopefully in few weeks all 2.6.24-rc1 users will be gone.
+  */
+ 
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23)
+ #   error This compile test intentionally fails.
+--- vmnet-only/nfhook_uses_skb.c	2009-03-27 06:34:28.000000000 +0100
++++ vmnet-only/nfhook_uses_skb.c.new	2010-02-05 23:44:35.228702615 +0100
+@@ -23,8 +23,12 @@
+  * 2.6.24-rc1.
+  */
+ 
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23)
+ #   error This compile test intentionally fails.
+--- vmnet-only/setnice.c	2009-03-27 06:34:28.000000000 +0100
++++ vmnet-only/setnice.c.new	2010-02-05 23:44:45.613286546 +0100
+@@ -20,8 +20,12 @@
+  * set_user_nice appeared in 2.4.21.  But some distros
+  * backported it to older kernels.
+  */
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 21)
+ #include <linux/sched.h>
+--- vmnet-only/sk_alloc.c	2009-03-27 06:34:28.000000000 +0100
++++ vmnet-only/sk_alloc.c.new	2010-02-05 23:44:59.796490045 +0100
+@@ -21,8 +21,12 @@
+  * This API change was introduced between 2.6.12-rc1 and 2.6.12-rc2.
+  */
+ 
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 13)
+ #include <net/sock.h>
+--- vmnet-only/skblin.c	2009-03-27 06:34:28.000000000 +0100
++++ vmnet-only/skblin.c.new	2010-02-05 23:45:17.276123591 +0100
+@@ -20,8 +20,12 @@
+  * Detect whether skb_linearize takes one or two arguments.
+  */
+ 
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 17)
+ /*
+--- vmnet-only/driver-config.h.old	2010-02-03 00:12:31.439000354 +0100
++++ vmnet-only/driver-config.h	2010-02-03 00:13:29.608823892 +0100
+@@ -32,7 +32,12 @@
+ #define INCLUDE_ALLOW_VMNIXMOD
+ #include "includeCheck.h"
+ 
++#include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
+ #include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ #include "compat_version.h"
+ 
+ /*
+--- vsock-only/autoconf/cachecreate.c	2009-03-27 06:34:32.000000000 +0100
++++ vsock-only/autoconf/cachecreate.c.new	2010-02-05 23:46:29.157369452 +0100
+@@ -16,8 +16,12 @@
+  *
+  *********************************************************/
+ 
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ /*
+  * All kernels before 2.6.22 take 6 arguments.  All kernels since
+--- vsock-only/autoconf/epoll.c	2009-03-27 06:34:32.000000000 +0100
++++ vsock-only/autoconf/epoll.c.new	2010-02-05 23:46:39.884406108 +0100
+@@ -22,8 +22,12 @@
+  * never had it, but some distros backported epoll patch.
+  */
+ 
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
+ #include <linux/poll.h>
+--- vsock-only/autoconf/filldir1.c	2009-03-27 06:34:32.000000000 +0100
++++ vsock-only/autoconf/filldir1.c.new	2010-02-05 23:46:52.692243523 +0100
+@@ -16,8 +16,12 @@
+  *
+  *********************************************************/
+ 
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
+ #include <linux/fs.h>
+--- vsock-only/autoconf/geninclude.c	2009-03-27 06:34:32.000000000 +0100
++++ vsock-only/autoconf/geninclude.c.new	2010-02-05 23:46:58.292953391 +0100
+@@ -16,7 +16,12 @@
+  *
+  *********************************************************/
+ 
++#include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
+ #include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #ifdef CONFIG_X86_VOYAGER
+ APATH/mach-voyager
+--- vsock-only/autoconf/getsb1.c	2009-03-27 06:34:32.000000000 +0100
++++ vsock-only/autoconf/getsb1.c.new	2010-02-05 23:47:07.516892747 +0100
+@@ -16,8 +16,12 @@
+  *
+  *********************************************************/
+ 
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
+ 
+--- vsock-only/autoconf/setnice.c	2009-03-27 06:34:32.000000000 +0100
++++ vsock-only/autoconf/setnice.c.new	2010-02-05 23:47:16.829514462 +0100
+@@ -20,8 +20,12 @@
+  * set_user_nice appeared in 2.4.21.  But some distros
+  * backported it to older kernels.
+  */
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 21)
+ #include <linux/sched.h>
+--- vsock-only/autoconf/sk_filter.c	2009-03-27 06:34:32.000000000 +0100
++++ vsock-only/autoconf/sk_filter.c.new	2010-02-05 23:47:28.501825992 +0100
+@@ -23,8 +23,12 @@
+  * This test will fail to build on kernels with the new interface.
+  */
+ 
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ /*
+  * We'd restrict this test to 2.4.21 and earlier kernels, but Mandrake's
+--- vsock-only/autoconf/statfs1.c	2009-03-27 06:34:32.000000000 +0100
++++ vsock-only/autoconf/statfs1.c.new	2010-02-05 23:47:41.174472911 +0100
+@@ -16,8 +16,12 @@
+  *
+  *********************************************************/
+ 
+-#include <linux/autoconf.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
++#include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
+ #include <linux/fs.h>
+--- vsock-only/include/driver-config.h.old	2010-02-03 00:12:31.439000354 +0100
++++ vsock-only/include/driver-config.h	2010-02-03 00:13:29.608823892 +0100
+@@ -32,7 +32,12 @@
+ #define INCLUDE_ALLOW_VMNIXMOD
+ #include "includeCheck.h"
+ 
++#include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
+ #include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
++#endif
+ #include "compat_version.h"
+ 
+ /*
diff --git a/app-emulation/vmware-modules/vmware-modules-1.0.0.24-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-1.0.0.24-r1.ebuild
index af62e31863ed..4a2895b8169d 100644
--- a/app-emulation/vmware-modules/vmware-modules-1.0.0.24-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-1.0.0.24-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.24-r1.ebuild,v 1.2 2010/01/02 20:07:47 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.24-r1.ebuild,v 1.3 2010/02/26 14:54:32 vadimk Exp $
 
 EAPI="2"
 
@@ -61,6 +61,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PV}-kernel-2.6.30.patch"
 	epatch "${FILESDIR}/${PV}-vmnet-2.6.31.patch"
 	epatch "${FILESDIR}/sched_h-2.6.32.patch"
+	epatch "${FILESDIR}/${PV}-autoconf-generated.patch"
 }
 
 src_install() {
diff --git a/app-emulation/vmware-modules/vmware-modules-1.0.0.25-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-1.0.0.25-r1.ebuild
index 26dfb0fdfac4..dbfab6d5b83e 100644
--- a/app-emulation/vmware-modules/vmware-modules-1.0.0.25-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-1.0.0.25-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.25-r1.ebuild,v 1.1 2010/02/13 18:52:24 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.25-r1.ebuild,v 1.2 2010/02/26 14:54:32 vadimk Exp $
 
 EAPI="2"
 
@@ -20,7 +20,7 @@ SRC_URI="x86? (
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=""
@@ -59,10 +59,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PV}-makefile-kernel-dir.patch"
 	epatch "${FILESDIR}/${PV}-makefile-include.patch"
 	epatch "${FILESDIR}/sched_h-2.6.32.patch"
-	if kernel_is -ge 2 6 33 ; then
-		# evil patch for new kernels - header moved
-		grep -lR linux/autoconf.h *  | xargs sed -i -e 's:<linux/autoconf.h>:<generated/autoconf.h>:'
-	fi
+	epatch "${FILESDIR}/${PV}-autoconf-generated.patch"
 }
 
 src_install() {