cleanup

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

6 files changed, 8 insertions, 435 deletions

diff --git a/app-emulation/vmware-modules/ChangeLog b/app-emulation/vmware-modules/ChangeLog
index a47be1fa6233..832e1765b179 100644
--- a/app-emulation/vmware-modules/ChangeLog
+++ b/app-emulation/vmware-modules/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/vmware-modules
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.51 2009/09/25 10:35:55 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.52 2009/10/30 18:43:11 vadimk Exp $
+
+  30 Oct 2009; Vadim Kuznetsov vadimk@gentoo.org
+  -files/1.0.0.23-makefile-kernel-dir.patch,
+  -vmware-modules-1.0.0.23.ebuild, -vmware-modules-1.0.0.23-r1.ebuild,
+  -files/1.0.0.23-r1-kernel-2.6.29.patch:
+  cleanup
 
   25 Sep 2009; Markus Meier <maekke@gentoo.org>
   vmware-modules-1.0.0.25.ebuild:
diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest
index f217baa23c4e..f0f095b9c329 100644
--- a/app-emulation/vmware-modules/Manifest
+++ b/app-emulation/vmware-modules/Manifest
@@ -1,8 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX 1.0.0.23-makefile-kernel-dir.patch 2129 RMD160 885b638c78cb0663d0d55682bafd453c6122fe17 SHA1 9a08768a9923d8259346f89ae78deae878b68df9 SHA256 fd583c13433bb3ddc64a21af6c472e3c6a2747990118a22881d2b48c16e5655f
-AUX 1.0.0.23-r1-kernel-2.6.29.patch 10451 RMD160 2f0094a87ae9530e6a5937f6b3dc3bdeeebe2370 SHA1 86d4f265ecb7921dae4a5cf6531c85f5c4dde82e SHA256 c1f0467f9326f39fbfe81027f26fac478eeb5136f0c06c102e4d3b029971d021
 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
@@ -19,27 +14,14 @@ AUX patches/vmnet/021_all_wireless_fix.patch 668 RMD160 dbcd47fc4749b36417d028a5
 AUX patches/vmnet/025_all_kernel-2.6.25.patch 939 RMD160 c7f9f0b9e7bf98b4b37db70926c1c463874e8458 SHA1 43f8f9a5a0b9a28223ad901afd5b45749447bdc4 SHA256 a3247b261376f7cde78724d5704c4ea2511d54644f9c2b776b41f19d261cba17
 AUX patches/vmnet/030_all_kernel-2.6.27.patch 2558 RMD160 9ba251de06852c33e4530628679bdf36ea8051bd SHA1 0078be861f34d4b8def9fcf38385e8c335cbc909 SHA256 b4bc5e5c1030bd5341ef60500dece1d0b6b1f4e553cb566c1ba5506ed6dbb03f
 DIST vmware-any-any-update115.tar.gz 493641 RMD160 56cabe56f70c01a22a7671e861cc5a2df19855c7 SHA1 ff9b6fdf6ca74495eb5f4822a1854fc91185377c SHA256 b1c14fa9514663b85c2efe8331407e71cce96e5a21a8b941fa570c960bbdcaa1
-DIST vmware-modules-1.0.0.23-r1.amd64.tar.bz2 486989 RMD160 12f197294b4df7bf15935ef9d44d7c809a5d88aa SHA1 51436cfd97311eb5d1430b390d2d98a27bf47494 SHA256 b062c7505e0251ce5352c40d081a62989e6fa5f6441b737bbeb6c4471867686e
-DIST vmware-modules-1.0.0.23-r1.x86.tar.bz2 487101 RMD160 f69475312cbaeb0afccc46e8465dfbed7bee49d2 SHA1 f2b23a2adcfc8fde3cd26f1a75e504c82010bb10 SHA256 5fb5eb11d26e86a62018a57e6afe975f32ce9a7b0ec1069ed1f756e034337b6b
-DIST vmware-modules-1.0.0.23.amd64.tar.bz2 489196 RMD160 5ef5d18ec22129cd4563d14ed8b213fdd3ad86ec SHA1 64a2fb7b1195d3ee773b9e49fe8dc9b5d7ffc43a SHA256 7d8028b9da2ad1694a6e71f1f6b1f63a9a03e78249f4cacdfccd1ea508e07d2a
-DIST vmware-modules-1.0.0.23.x86.tar.bz2 486085 RMD160 d039206f0ed3fcd93f7acf3bc24c340b8641057a SHA1 5a4e9ed931f6592c8332239e424afdd80b1b46e5 SHA256 5780292e519da9e1512bf78b1e0e6c21e44f4e10f214dcc0caf83af482dedf68
 DIST vmware-modules-1.0.0.24.amd64.tar.bz2 486925 RMD160 64e81b90f9e838100bdc4e901021a86433efeed8 SHA1 bbbf3974afcb77fa0a670ac7821382a725cc6e4e SHA256 d010d0797bc303d2e3a69efc17dca56d3e3de5c43028c780334c57c69606ab94
 DIST vmware-modules-1.0.0.24.x86.tar.bz2 487178 RMD160 9dd4aa6ecabe1ff1621e0a7a9c573479ab92df3c SHA1 e861a6c2d33193a57226a9be562e9e7a1926e45f SHA256 0021b2eefdfb2de3d352d70f84f1e9ec3d375e1073c5f960435208cf3ee2409e
 DIST vmware-modules-1.0.0.25.amd64.tar.bz2 488816 RMD160 deb03d08b8cf1cad03967b3e1b0e98fc2649fd90 SHA1 00adbde24d72455837b5b81db49bc6a6390973d8 SHA256 f4c0baf981151ad3dbdbae104952983d44d83121048ecd7b88b8b34368dd05b7
 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.23-r1.ebuild 817 RMD160 e126704918b1c106185e7743006c8178a156620c SHA1 8aa89f0e4a772fa59e05b7a158817ccf84aba54d SHA256 c846170c19b8525ebcdbd01a3c0d9e0bad2ff02b8129475814c65c3f8403d711
-EBUILD vmware-modules-1.0.0.23.ebuild 724 RMD160 35c62995060e0c709dbd690ef63c48a431dfae8a SHA1 6ea6e450fd540c772f5c7227056848f8513939c2 SHA256 a132d0c74e914ff65e0cef0bdbe54e4e9e05e59ad7d1dc72e404d568bd0e31f4
 EBUILD vmware-modules-1.0.0.24-r1.ebuild 1900 RMD160 4ecd9e1cbdf1540e595ffbd77af671cf5143b35b SHA1 65f1a25a5b3fd9ae83ca42f70b27e4de9719eceb SHA256 a60807b87c55cc00b2e8cd14dcf31d2a1c20f5a696fe5b70d4d404022f0f1b75
 EBUILD vmware-modules-1.0.0.24.ebuild 1869 RMD160 365eaf6f73a6bc3a9fb89104124fd31760dd3c2f SHA1 f36147072ac47de26f64153b834fcf553bfaf1f8 SHA256 5f7c3ac912d9d1c95c49d946c5f16639967a1e4ebaeae5ef5d0c5910cd89ab2f
 EBUILD vmware-modules-1.0.0.25.ebuild 1793 RMD160 5b36d8f0a01f6fb3e2a7a460653c1cb6396a70d2 SHA1 22e822a696351e3d8ed85012f1e6303a129b4e5a SHA256 db4ec242ebeef6debeb116c2d6aac46a341bf8131719cfa3171ee02459f4207b
-MISC ChangeLog 11658 RMD160 41e99bfad9ee92acbc3e8f92b81fb0b74c9c97f1 SHA1 b82393a0d6d41adf4b15ae08914cf797450fd435 SHA256 316f8997c6f0085c8cb2d0fac78c6282fae02501e39cf25631dea292d7d2630c
+MISC ChangeLog 11876 RMD160 f2d50c194311dacef9578ac5b13049b9ca9f3183 SHA1 0351aa861b1345d9153cfcc030c71f2ff8e3949a SHA256 a4c9823c15cedc5294979238ed73e7dcdbd3adbf473ab970fca2a54d027a10b1
 MISC metadata.xml 288 RMD160 da2ee1499dd87693b63592a337d8352494cb9652 SHA1 e1b50a587afb7878e21828a957a6838e7d08e4e8 SHA256 100017b3059be218965923798780ab195dafaa893f98088592fb5b299e686c37
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkq8nTkACgkQkKaRLQcq0GLKBACfWZBGw/UMofeGvQEka3+0hmKG
-7tMAnRtONF3Uhotv519iOUVSvmYDeQl7
-=GVBi
------END PGP SIGNATURE-----
diff --git a/app-emulation/vmware-modules/files/1.0.0.23-makefile-kernel-dir.patch b/app-emulation/vmware-modules/files/1.0.0.23-makefile-kernel-dir.patch
deleted file mode 100644
index 8df4d8694e34..000000000000
--- a/app-emulation/vmware-modules/files/1.0.0.23-makefile-kernel-dir.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff --git a/vmblock-only/Makefile b/vmblock-only/Makefile
-index 0a9ffd6..4aa09e8 100644
---- a/vmblock-only/Makefile
-+++ b/vmblock-only/Makefile
-@@ -29,9 +29,9 @@ SRCROOT = .
- VM_UNAME = $(shell uname -r)
- 
- # Header directory for the running kernel
--HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
-+HEADER_DIR = $(KERNEL_DIR) 
- 
--BUILD_DIR = $(HEADER_DIR)/..
-+BUILD_DIR = $(KBUILD_OUTPUT)
- 
- DRIVER := vmblock
- PRODUCT := @PRODUCT@
-diff --git a/vmci-only/Makefile b/vmci-only/Makefile
-index 0a6c9c6..6cd0b6d 100644
---- a/vmci-only/Makefile
-+++ b/vmci-only/Makefile
-@@ -29,9 +29,9 @@ SRCROOT = .
- VM_UNAME = $(shell uname -r)
- 
- # Header directory for the running kernel
--HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
-+HEADER_DIR = $(KERNEL_DIR)
- 
--BUILD_DIR = $(HEADER_DIR)/..
-+BUILD_DIR = $(KBUILD_OUTPUT)
- 
- DRIVER := vmci
- PRODUCT := @PRODUCT@
-diff --git a/vmmon-only/Makefile b/vmmon-only/Makefile
-index d26e58c..f8a40f4 100644
---- a/vmmon-only/Makefile
-+++ b/vmmon-only/Makefile
-@@ -29,9 +29,9 @@ SRCROOT = .
- VM_UNAME = $(shell uname -r)
- 
- # Header directory for the running kernel
--HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
-+HEADER_DIR = $(KERNEL_DIR)
- 
--BUILD_DIR = $(HEADER_DIR)/..
-+BUILD_DIR = $(KBUILD_OUTPUT)
- 
- DRIVER := vmmon
- PRODUCT := @PRODUCT@
-diff --git a/vmnet-only/Makefile b/vmnet-only/Makefile
-index 4cabc30..568271a 100644
---- a/vmnet-only/Makefile
-+++ b/vmnet-only/Makefile
-@@ -29,9 +29,9 @@ SRCROOT = .
- VM_UNAME = $(shell uname -r)
- 
- # Header directory for the running kernel
--HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
-+HEADER_DIR = $(KERNEL_DIR)
- 
--BUILD_DIR = $(HEADER_DIR)/..
-+BUILD_DIR = $(KBUILD_OUTPUT)
- 
- DRIVER := vmnet
- PRODUCT := @PRODUCT@
-diff --git a/vsock-only/Makefile b/vsock-only/Makefile
-index a69bc22..8a74856 100644
---- a/vsock-only/Makefile
-+++ b/vsock-only/Makefile
-@@ -29,9 +29,9 @@ SRCROOT = .
- VM_UNAME = $(shell uname -r)
- 
- # Header directory for the running kernel
--HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
-+HEADER_DIR = $(KERNEL_DIR)
- 
--BUILD_DIR = $(HEADER_DIR)/..
-+BUILD_DIR = $(KBUILD_OUTPUT)
- 
- DRIVER := vsock
- PRODUCT := ws
diff --git a/app-emulation/vmware-modules/files/1.0.0.23-r1-kernel-2.6.29.patch b/app-emulation/vmware-modules/files/1.0.0.23-r1-kernel-2.6.29.patch
deleted file mode 100644
index a4ad6e9ae5f6..000000000000
--- a/app-emulation/vmware-modules/files/1.0.0.23-r1-kernel-2.6.29.patch
+++ /dev/null
@@ -1,288 +0,0 @@
-diff -ur vmware-modules-1.0.0.23-r1.0/work/vmblock-only/Makefile.kernel vmware-modules-1.0.0.23-r1/work/vmblock-only/Makefile.kernel
---- vmware-modules-1.0.0.23-r1.0/work/vmblock-only/Makefile.kernel	2009-03-27 08:05:21.000000000 +0300
-+++ vmware-modules-1.0.0.23-r1/work/vmblock-only/Makefile.kernel	2009-04-07 16:14:55.000000000 +0400
-@@ -19,7 +19,7 @@
- 
- INCLUDE := -I$(SRCROOT)/include
- 
--EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
-+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
- 
- EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/setnice.c, -DVMW_HAVE_SET_USER_NICE, )
- EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/epoll.c,   -DVMW_HAVE_EPOLL, )
-diff -ur vmware-modules-1.0.0.23-r1.0/work/vmci-only/Makefile.kernel vmware-modules-1.0.0.23-r1/work/vmci-only/Makefile.kernel
---- vmware-modules-1.0.0.23-r1.0/work/vmci-only/Makefile.kernel	2009-03-27 08:05:22.000000000 +0300
-+++ vmware-modules-1.0.0.23-r1/work/vmci-only/Makefile.kernel	2009-04-07 16:14:55.000000000 +0400
-@@ -21,7 +21,7 @@
- 
- INCLUDE := -I$(SRCROOT)/include -I$(SRCROOT)/common -I$(SRCROOT)/linux
- 
--EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
-+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
- 
- EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/epoll.c,   -DVMW_HAVE_EPOLL, )
- 
-diff -ur vmware-modules-1.0.0.23-r1.0/work/vmmon-only/linux/driver.c vmware-modules-1.0.0.23-r1/work/vmmon-only/linux/driver.c
---- vmware-modules-1.0.0.23-r1.0/work/vmmon-only/linux/driver.c	2009-03-27 08:05:19.000000000 +0300
-+++ vmware-modules-1.0.0.23-r1/work/vmmon-only/linux/driver.c	2009-04-07 16:15:11.000000000 +0400
-@@ -1984,10 +1984,10 @@
-    }
- 
-    case IOCTL_VMX86_ALLOW_CORE_DUMP:
--      if (current->euid == current->uid &&
--	  current->fsuid == current->uid &&
--          current->egid == current->gid &&
--	  current->fsgid == current->gid) {
-+      if (current_euid() == current_uid() &&
-+	  current_fsuid() == current_uid() &&
-+          current_egid() == current_gid() &&
-+	  current_fsgid() == current_gid()) {
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 23) || defined(MMF_DUMPABLE)
-          /* Dump core, readable by user. */
-          set_bit(MMF_DUMPABLE, &current->mm->flags);
-diff -ur vmware-modules-1.0.0.23-r1.0/work/vmmon-only/linux/hostif.c vmware-modules-1.0.0.23-r1/work/vmmon-only/linux/hostif.c
---- vmware-modules-1.0.0.23-r1.0/work/vmmon-only/linux/hostif.c	2009-03-27 08:05:18.000000000 +0300
-+++ vmware-modules-1.0.0.23-r1/work/vmmon-only/linux/hostif.c	2009-04-07 16:19:05.000000000 +0400
-@@ -3424,6 +3424,82 @@
- }
- 
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) 
-+static inline
-+void compat_cap_raise(int cap)
-+{
-+   cap_raise(current->cap_effective, cap);
-+}
-+#else
-+static
-+void compat_cap_raise(int cap)
-+{
-+   struct cred *new_cred;
-+  
-+   new_cred = prepare_creds();
-+   if (new_cred != NULL)
-+   {
-+      cap_raise(new_cred->cap_effective, cap);
-+      commit_creds(new_cred);
-+   }
-+   else
-+   {
-+      Log("compat_cap_raise(%d) prepare_creds(): Out of memory\n", cap);
-+   }
-+}
-+#endif
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
-+static inline
-+void compat_cap_lower(int cap)
-+{
-+   cap_lower(current->cap_effective, cap);
-+}
-+#else
-+static
-+void compat_cap_lower(int cap)
-+{
-+   struct cred *new_cred;
-+  
-+   new_cred = prepare_creds();
-+   if (new_cred != NULL)
-+   {
-+      cap_lower(new_cred->cap_effective, cap);
-+      commit_creds(new_cred);
-+   }
-+   else
-+   {
-+      Log("compat_cap_lower(%d) prepare_creds(): Out of memory\n", cap);
-+   }
-+}
-+#endif
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
-+static inline
-+void compat_set_fsuid(int fsuid)
-+{
-+   current->fsuid = fsuid;
-+}
-+#else
-+static
-+void compat_set_fsuid(int fsuid)
-+{
-+   struct cred *new_cred;
-+  
-+   new_cred = prepare_creds();
-+   if (new_cred != NULL)
-+   {
-+      new_cred->fsuid = fsuid;
-+      commit_creds(new_cred);
-+   }
-+   else
-+   {
-+      Log("compat_set_fsuid(%d) prepare_creds(): Out of memory\n", fsuid);
-+   }
-+}
-+#endif
-+
-+
- /*
-  *----------------------------------------------------------------------
-  *
-@@ -3456,7 +3532,7 @@
-    oldFS = get_fs();
-    set_fs(KERNEL_DS);
-    compat_allow_signal(SIGKILL);
--   cap_raise(current->cap_effective, CAP_SYS_RESOURCE);
-+   compat_cap_raise(CAP_SYS_RESOURCE);
-    compat_set_user_nice(current, linuxState.fastClockPriority);
- 
-    while (linuxState.fastClockRate > HZ + HZ/16) {
-@@ -3580,19 +3656,19 @@
-          Bool cap;
-          long pid;
- 
--         fsuid = current->fsuid;
--         current->fsuid = 0;
-+         fsuid = current_fsuid();
-+         compat_set_fsuid(0);
-          filp = filp_open("/dev/rtc", O_RDONLY, 0);
--         current->fsuid = fsuid;
-+         compat_set_fsuid(fsuid);
-          if (IS_ERR(filp)) {
-             Warning("/dev/rtc open failed: %d\n", (int)(VA)filp);
-             return -(int)(VA)filp;
-          }
--         cap = cap_raised(current->cap_effective, CAP_SYS_RESOURCE);
--         cap_raise(current->cap_effective, CAP_SYS_RESOURCE);
-+         cap = cap_raised(current_cap(), CAP_SYS_RESOURCE);
-+         compat_cap_raise(CAP_SYS_RESOURCE);
-          res = HostIFDoIoctl(filp, RTC_PIE_ON, 0);
-          if (!cap) {
--            cap_lower(current->cap_effective, CAP_SYS_RESOURCE);            
-+            compat_cap_lower(CAP_SYS_RESOURCE);
-          }
-          if (res < 0) {
-             Warning("/dev/rtc enable interrupt failed: %d\n", res);
-diff -ur vmware-modules-1.0.0.23-r1.0/work/vmmon-only/Makefile.kernel vmware-modules-1.0.0.23-r1/work/vmmon-only/Makefile.kernel
---- vmware-modules-1.0.0.23-r1.0/work/vmmon-only/Makefile.kernel	2009-03-27 08:05:19.000000000 +0300
-+++ vmware-modules-1.0.0.23-r1/work/vmmon-only/Makefile.kernel	2009-04-07 16:15:21.000000000 +0400
-@@ -22,7 +22,7 @@
- INCLUDE := -I$(SRCROOT)/include -I$(SRCROOT)/common -I$(SRCROOT)/linux \
- 	   -I$(SRCROOT)/vmcore
- 
--EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
-+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
- 
- EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/nopage1.c, -DVMW_NOPAGE_261, )
- EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/skas1.c,   -DVMW_SKAS_MMAP, )
-diff -ur vmware-modules-1.0.0.23-r1.0/work/vmnet-only/Makefile.kernel vmware-modules-1.0.0.23-r1/work/vmnet-only/Makefile.kernel
---- vmware-modules-1.0.0.23-r1.0/work/vmnet-only/Makefile.kernel	2009-03-27 08:05:20.000000000 +0300
-+++ vmware-modules-1.0.0.23-r1/work/vmnet-only/Makefile.kernel	2009-04-07 16:15:21.000000000 +0400
-@@ -19,7 +19,7 @@
- 
- INCLUDE := -I$(SRCROOT)
- 
--EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
-+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
- EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/epoll.c,   -DVMW_HAVE_EPOLL, )
- EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/socket.c,  -DVMW_HAVE_SK_WMEM_ALLOC, )
- EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/sk_alloc.c,-DVMW_HAVE_SK_ALLOC_WITH_PROTO, )
-diff -ur vmware-modules-1.0.0.23-r1.0/work/vmnet-only/netif.c vmware-modules-1.0.0.23-r1/work/vmnet-only/netif.c
---- vmware-modules-1.0.0.23-r1.0/work/vmnet-only/netif.c	2009-03-27 08:05:20.000000000 +0300
-+++ vmware-modules-1.0.0.23-r1/work/vmnet-only/netif.c	2009-04-07 16:15:21.000000000 +0400
-@@ -55,6 +55,30 @@
-    struct net_device_stats stats;
- } VNetNetIF;
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
-+/*
-+    Prior to KERNEL_VERSION(2, 6, 29) "struct net_device" had "void
-+    *priv" field which was used as pointer to "VNetNetIF".
-+*/
-+
-+#define VNetNetIF_netdev_priv_size	0
-+
-+#define VNetNetIF_netdev_netIf(dev)	(*(VNetNetIF**)&((dev)->priv))
-+
-+#else
-+/*
-+    Since KERNEL_VERSION(2, 6, 29) pointer to "VNetNetIF" is stored in 
-+    explicitly allocated private area.
-+*/
-+typedef struct {
-+   VNetNetIF *netIf;
-+} VNetNetIF_netdev_priv;
-+
-+#define VNetNetIF_netdev_priv_size	sizeof(VNetNetIF_netdev_priv)
-+
-+#define VNetNetIF_netdev_netIf(dev)	(((VNetNetIF_netdev_priv *)compat_netdev_priv(dev))->netIf)
-+
-+#endif
- 
- static void VNetNetIfFree(VNetJack *this);
- static void VNetNetIfReceive(VNetJack *this, struct sk_buff *skb);
-@@ -318,13 +342,13 @@
-    memcpy(netIf->devName, devName, sizeof netIf->devName);
-    NULL_TERMINATE_STRING(netIf->devName);
- 
--   dev = compat_alloc_netdev(0, netIf->devName, VNetNetIfSetup);
-+   dev = compat_alloc_netdev(VNetNetIF_netdev_priv_size, netIf->devName, VNetNetIfSetup);
-    if (!dev) {
-       retval = -ENOMEM;
-       goto out;
-    }
- 
--   dev->priv = netIf;
-+   VNetNetIF_netdev_netIf(dev) = netIf;
-    netIf->dev = dev;
-    
-    memcpy(dev->dev_addr, netIf->port.paddr, sizeof netIf->port.paddr);
-@@ -566,7 +590,7 @@
- VNetNetifStartXmit(struct sk_buff    *skb, // IN:
-                    struct net_device *dev) // IN:
- {
--   VNetNetIF *netIf = (VNetNetIF*)dev->priv;
-+   VNetNetIF *netIf = VNetNetIF_netdev_netIf(dev);
- 
-    if(skb == NULL) {
-       return 0;
-@@ -618,7 +642,7 @@
- VNetNetifSetMAC(struct net_device *dev, // IN:
-                 void *p)                // IN:
- {
--   VNetNetIF *netIf = (VNetNetIF*)dev->priv;
-+   VNetNetIF *netIf = VNetNetIF_netdev_netIf(dev);
-    struct sockaddr const *addr = p;
-    if (!VMX86_IS_STATIC_MAC(addr->sa_data)) {
-       return -EINVAL;
-@@ -675,7 +699,7 @@
- struct net_device_stats *
- VNetNetifGetStats(struct net_device *dev) // IN:
- {
--   VNetNetIF *netIf = (VNetNetIF*)dev->priv;
-+   VNetNetIF *netIf = VNetNetIF_netdev_netIf(dev);
-    return &(netIf->stats);
- }
- 
-diff -ur vmware-modules-1.0.0.23-r1.0/work/vsock-only/linux/util.c vmware-modules-1.0.0.23-r1/work/vsock-only/linux/util.c
---- vmware-modules-1.0.0.23-r1.0/work/vsock-only/linux/util.c	2009-03-27 08:05:23.000000000 +0300
-+++ vmware-modules-1.0.0.23-r1/work/vsock-only/linux/util.c	2009-04-07 16:15:21.000000000 +0400
-@@ -154,7 +154,7 @@
-       goto error;
-    }
- 
--   Log(buf);
-+   Log("%s", buf);
- 
-    return;
- 
-diff -ur vmware-modules-1.0.0.23-r1.0/work/vsock-only/Makefile.kernel vmware-modules-1.0.0.23-r1/work/vsock-only/Makefile.kernel
---- vmware-modules-1.0.0.23-r1.0/work/vsock-only/Makefile.kernel	2009-03-27 08:05:23.000000000 +0300
-+++ vmware-modules-1.0.0.23-r1/work/vsock-only/Makefile.kernel	2009-04-07 16:15:21.000000000 +0400
-@@ -25,7 +25,7 @@
- INCLUDE += -I$(SRCROOT)/linux
- INCLUDE += -I$(SRCROOT)/common
- 
--EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
-+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
- EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/epoll.c,   -DVMW_HAVE_EPOLL, )
- EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/setnice.c, -DVMW_HAVE_SET_USER_NICE, )
- 
diff --git a/app-emulation/vmware-modules/vmware-modules-1.0.0.23-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-1.0.0.23-r1.ebuild
deleted file mode 100644
index 9eeb66971ba0..000000000000
--- a/app-emulation/vmware-modules/vmware-modules-1.0.0.23-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2009 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.23-r1.ebuild,v 1.1 2009/05/16 07:33:20 ikelos Exp $
-
-KEYWORDS="~amd64 ~x86"
-VMWARE_VER="VME_V65" # THIS VALUE IS JUST A PLACE HOLDER
-
-PATCH_VER="1"
-
-inherit eutils vmware-mod
-
-LICENSE="GPL-2"
-IUSE=""
-
-VMWARE_MODULE_LIST="vmmon vmnet vmblock vmci vsock"
-SRC_URI="x86? ( http://dev.gentoo.org/~ikelos/devoverlay-distfiles/${PN}-${PVR}.x86.tar.bz2 )
-		 amd64? ( http://dev.gentoo.org/~ikelos/devoverlay-distfiles/${PN}-${PVR}.amd64.tar.bz2 )"
-VMWARE_MOD_DIR="${PN}-${PVR}"
-
-src_unpack() {
-	vmware-mod_src_unpack
-	cd "${S}"
-	epatch "${FILESDIR}/${PVR}-kernel-2.6.29.patch"
-	epatch "${FILESDIR}/${PV}-makefile-kernel-dir.patch"
-}
diff --git a/app-emulation/vmware-modules/vmware-modules-1.0.0.23.ebuild b/app-emulation/vmware-modules/vmware-modules-1.0.0.23.ebuild
deleted file mode 100644
index fc452d7f4072..000000000000
--- a/app-emulation/vmware-modules/vmware-modules-1.0.0.23.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2009 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.23.ebuild,v 1.2 2009/01/12 21:42:37 maekke Exp $
-
-KEYWORDS="amd64 x86"
-VMWARE_VER="VME_V65" # THIS VALUE IS JUST A PLACE HOLDER
-
-inherit eutils vmware-mod
-
-LICENSE="GPL-2"
-IUSE=""
-
-VMWARE_MODULE_LIST="vmmon vmnet vmblock vmci vsock"
-SRC_URI="x86? ( http://dev.gentoo.org/~ikelos/devoverlay-distfiles/${P}.x86.tar.bz2 )
-		 amd64? ( http://dev.gentoo.org/~ikelos/devoverlay-distfiles/${P}.amd64.tar.bz2 )"
-VMWARE_MOD_DIR="${P}"
-
-src_unpack() {
-	vmware-mod_src_unpack
-	cd "${S}"
-	epatch "${FILESDIR}/${PV}-makefile-kernel-dir.patch"
-}