correcting the patches for VMware 10

Package-Manager: portage-2.2.8-r2

6 files changed, 35 insertions, 252 deletions

diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest
deleted file mode 100644
index 30288f3..0000000
--- a/app-emulation/vmware-modules/Manifest
+++ /dev/null
@@ -1,44 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX 271-3.10.0.patch 23418 SHA256 346d1ca7705dd5f791e0d69cdbb346ebd31f2f4f11f3989c23d1a89e11e1b91b SHA512 878678f951b05137deb1656ccd7fd3185887f02649f2a223ef60ccecdedc7aeda6ca08ddd108e379734b5e04ef11d326b20e45c069c53cc52b7a6869b8db6410 WHIRLPOOL 196515870addefcd6857dd3e44a04b8a6c0da39185e7cea7826f1498f5a4c17997ebe43aada7f22a1c3fa94302576ced2a7ed36e2452de00711256c83f7fa41e
-AUX 271-apic.patch 302 SHA256 60e7df881281fedcabe9ea4427b324b5e1142a1a2b6ab5236ac0843bd1051048 SHA512 003240043e5875d8c6425c146e708eb3c3d8be7fa48a2ac42b3071f00dafdbd51f7796d6f884298b135adccaf8a3eac32fd82b34a436a724da125dac5f6261d7 WHIRLPOOL 4707d0ddd532d5ec27ee2ba3d0fb25c1972bbc9f958b4b89f2f5cceffdf955ba88cd1be0cde046aa5fa688d52faeab5ccf3f03bbccb3e9b088abc37ad579e8e0
-AUX 271-filldir.patch 2485 SHA256 539e8940b47cb7a5f39ab2ba6f18ceb290a2627c81bd6daead6e5850aec02a63 SHA512 e5f85031f459a79a0f64b15224ae8c1ef23892ef159a37955b9c2a2b13ab6e892325a5aeedd4fd2969da3b187cedcaea8fc41540638d02cf56dce2d3e9194937 WHIRLPOOL a455300e72624e4f9c8d3dc79fa5c3ab1b288e79a04483503006a61d44bc83bf14faf0bfa753f82a70dbd23f870b2f6bfe1b06d23792eb1522a7265799ce03eb
-AUX 271-makefile-include.patch 2501 SHA256 208121855fe18ecb279ff40f2833463559363461c2170d32c17040211a01f169 SHA512 c498c025c7eb025f6554cee683242dd73e4a284e4b28c95b75339f4f4a912a156acc1845881fbd78bf399c2092af7413f5d6c4782cd066527ea275518b411c1d WHIRLPOOL e03a6d7139ab7b309e0ca1527cb8b52a8f84f5f5d997a510305d2a6ccdd39f33b18c7276df8ac78d92d2a17a66236f582baaa5e374069d3912090544908a0338
-AUX 271-makefile-kernel-dir.patch 2153 SHA256 d76b1028d21b804836e36478d243cd7914435a34f3fe014058e0a9cc7a020653 SHA512 f18339dc8ac4c864b0c2fb234ad2db8f4638a5cd28e8fd11b5593c82107925b41b42e0d0acac52232a373780d79a3e397f70886534cdf889055e86cfda718f62 WHIRLPOOL 70c869bf4efab6843856addd0c5f5a295ed2fe38f9fc2a8ab2ca55523cd39cb92018d6bd0dac75658fa0f5260962c98f0bbd001593f3f11c2d204c693061c5b6
-AUX 271-netdevice.patch 833 SHA256 8f17ce379abda45a8f94e1dcd6e43367273f97f76edd41f9941beb3b1730a751 SHA512 b4ec7c1694968a1843f10e8bfe0dbfdc99bd3b5fc1391456d91a3648b848b82df681a0748d967afa19e728c4d19b79b6a3cb9fd3e15a52a5cab048a6ac9b06a9 WHIRLPOOL b0cabe2ec1b8ca52d427c02593d6057c98d4ed00c578d006de65460138c37a5be76a7938d85f5a35eb6f49ee5e34065ce62b60a51b0ccf021639a59b27aeac8a
-AUX 271-putname.patch 394 SHA256 b8103d3c72c24696e974e49dcdcdf2d5a2b2c2fdd5f6ca050842b840e906ba77 SHA512 86a0a0ec3ff225940190056e85d498fd7eb260bcc52882fea8921398f572bc46f56c3f2941d3f3d1587a07bc72c8885cbddacf632d2b5fed7d8c9d284399d6d8 WHIRLPOOL e1e8afcafe00131fd6d90b61e5d911da69d7c26b7fd19be085eb5cfd23c2ab19784ae5ddf18928f9cc4a178d87c6d51e8de27dfab8507e2d57fc18868fde9f45
-AUX 271-vfsfollowlink.patch 1219 SHA256 b195f6492a172f682d55fb506ba02c473fd924bb47dc0d1359dd5de163b4da22 SHA512 b675f68175be0b7003d2f80c54dce05a064f8d5bd8744d40571d3d1e0153c01f909e37e0403e53f23a6d61383a9b054c40a2a9ffa95dd765eeffb0c7e739ff1d WHIRLPOOL 3e108ee29c2050029c6079f652e2670529a9f6b220524db214c7dadba3dcaef8fa1ab261f0e10ffa7506456d9f3cccc954bf6a82960e78ebd120c1eb2aac68e8
-AUX 271-vmmon.patch 1581 SHA256 a4e89766232d0fc0456bb026978dedca17fcc62e247c8d65ae747b537e62fd13 SHA512 10aca60b959647c058fa69f851892a0245acad971028876da8d0a0e6002d0e8f6f2677fd0d9b140ee8a1a68cf2cfa3f8937a992f8b0e7e163aa6bcc17b75c979 WHIRLPOOL 28d1a34e89c7a995dbde48d87d8942c6f58e61f4a24189a1463c148c843fdf16cea7df497993eb6fb8d8de228f07ae8a44233bb63e42b54ab1f762e7e24889ba
-AUX 279-apic.patch 302 SHA256 60e7df881281fedcabe9ea4427b324b5e1142a1a2b6ab5236ac0843bd1051048 SHA512 003240043e5875d8c6425c146e708eb3c3d8be7fa48a2ac42b3071f00dafdbd51f7796d6f884298b135adccaf8a3eac32fd82b34a436a724da125dac5f6261d7 WHIRLPOOL 4707d0ddd532d5ec27ee2ba3d0fb25c1972bbc9f958b4b89f2f5cceffdf955ba88cd1be0cde046aa5fa688d52faeab5ccf3f03bbccb3e9b088abc37ad579e8e0
-AUX 279-filldir.patch 2485 SHA256 539e8940b47cb7a5f39ab2ba6f18ceb290a2627c81bd6daead6e5850aec02a63 SHA512 e5f85031f459a79a0f64b15224ae8c1ef23892ef159a37955b9c2a2b13ab6e892325a5aeedd4fd2969da3b187cedcaea8fc41540638d02cf56dce2d3e9194937 WHIRLPOOL a455300e72624e4f9c8d3dc79fa5c3ab1b288e79a04483503006a61d44bc83bf14faf0bfa753f82a70dbd23f870b2f6bfe1b06d23792eb1522a7265799ce03eb
-AUX 279-hardened.patch 3334 SHA256 198c182b626aeeb0c6e6558e6982b6d9cd2f11bf03515f72972842f5c773e52c SHA512 eb6829742c44677c6d475894a2a996a87feb1c2ab9afda6a045333fc5befb1c2551ea17ec33e665542d322fb43195b6cfcd576665a73cfc82d66a98579521cf3 WHIRLPOOL d8fde574d68978a4850f06469e5a6dfe21acd0a68b744f3f37ffeb98d5f8786eedeb9fb435e1b141044a23fb142ae44879ee09a45229f2be1c84ef744c15cb7a
-AUX 279-makefile-include.patch 2501 SHA256 208121855fe18ecb279ff40f2833463559363461c2170d32c17040211a01f169 SHA512 c498c025c7eb025f6554cee683242dd73e4a284e4b28c95b75339f4f4a912a156acc1845881fbd78bf399c2092af7413f5d6c4782cd066527ea275518b411c1d WHIRLPOOL e03a6d7139ab7b309e0ca1527cb8b52a8f84f5f5d997a510305d2a6ccdd39f33b18c7276df8ac78d92d2a17a66236f582baaa5e374069d3912090544908a0338
-AUX 279-makefile-kernel-dir.patch 2153 SHA256 d76b1028d21b804836e36478d243cd7914435a34f3fe014058e0a9cc7a020653 SHA512 f18339dc8ac4c864b0c2fb234ad2db8f4638a5cd28e8fd11b5593c82107925b41b42e0d0acac52232a373780d79a3e397f70886534cdf889055e86cfda718f62 WHIRLPOOL 70c869bf4efab6843856addd0c5f5a295ed2fe38f9fc2a8ab2ca55523cd39cb92018d6bd0dac75658fa0f5260962c98f0bbd001593f3f11c2d204c693061c5b6
-AUX 279-netdevice.patch 833 SHA256 8f17ce379abda45a8f94e1dcd6e43367273f97f76edd41f9941beb3b1730a751 SHA512 b4ec7c1694968a1843f10e8bfe0dbfdc99bd3b5fc1391456d91a3648b848b82df681a0748d967afa19e728c4d19b79b6a3cb9fd3e15a52a5cab048a6ac9b06a9 WHIRLPOOL b0cabe2ec1b8ca52d427c02593d6057c98d4ed00c578d006de65460138c37a5be76a7938d85f5a35eb6f49ee5e34065ce62b60a51b0ccf021639a59b27aeac8a
-AUX 279-putname.patch 394 SHA256 b8103d3c72c24696e974e49dcdcdf2d5a2b2c2fdd5f6ca050842b840e906ba77 SHA512 86a0a0ec3ff225940190056e85d498fd7eb260bcc52882fea8921398f572bc46f56c3f2941d3f3d1587a07bc72c8885cbddacf632d2b5fed7d8c9d284399d6d8 WHIRLPOOL e1e8afcafe00131fd6d90b61e5d911da69d7c26b7fd19be085eb5cfd23c2ab19784ae5ddf18928f9cc4a178d87c6d51e8de27dfab8507e2d57fc18868fde9f45
-AUX 279-vfsfollowlink.patch 1219 SHA256 b195f6492a172f682d55fb506ba02c473fd924bb47dc0d1359dd5de163b4da22 SHA512 b675f68175be0b7003d2f80c54dce05a064f8d5bd8744d40571d3d1e0153c01f909e37e0403e53f23a6d61383a9b054c40a2a9ffa95dd765eeffb0c7e739ff1d WHIRLPOOL 3e108ee29c2050029c6079f652e2670529a9f6b220524db214c7dadba3dcaef8fa1ab261f0e10ffa7506456d9f3cccc954bf6a82960e78ebd120c1eb2aac68e8
-AUX 279-vmblock.patch 1041 SHA256 217d27619ac782711686cffee44fbc4bbb40eb0657f335357ad1b0d064f30a35 SHA512 e8e565b677110090cb5bdb7c18d3e97c31049d846b82ee0406aa27dbfa9af8afc39512f1314d49edd6108ec576f3cbc565921de8dfdaaefe2822029ef98c303c WHIRLPOOL 769d0cffcb186d6110de049db963e20e049ef11d92b872c1a6ecfe262acad6c17f456376d219ce01e22839ddcb6a21a2d3e995d797f4c962a0838318dc6f56f9
-AUX hardened.patch 5052 SHA256 191cf892bfb9a6288d110191de824bf6243bc6f48f1e62ab49f3582c7ade5af6 SHA512 52dcca8d9f689f0a0d0ca369c0c7ce0d177de3529d2d1325330eb5a9e940a55e8930bbbe7374793bdf29cbdefac9727e9eb21d00f81ad4f5eddba3a51597b7a5 WHIRLPOOL 539731bc36f3e292403f55d74c353deeb28baa312f726b36d2a6060adf3483dfa2ed011baf93eff941fa754ef62f4d6da86868c40550ee2292c4a711e061bde0
-EBUILD vmware-modules-271.3.ebuild 2326 SHA256 9d50fba55474113a5b185f3d0661065fff281eac1dae363d30972622af27a5b2 SHA512 44942c12745836b951ff9c1d0b52c920849ec624a9058a8e645b530d0eef3327bef1018a4a8569f65c6f7a62d8fc4c904c4b22b52fa303d7ac18bfd6c242daef WHIRLPOOL 0809eb2c3e18f3eceefb6db1b198093202ad41e3720955db79cf998f00793c0e6b489e779b1fa1264fcff6f5d6d0a5de6c2c5ef9b98aa32cf2f9f8d551193594
-EBUILD vmware-modules-279.1-r1.ebuild 2830 SHA256 7a39118cc3c5ecdf4f45fc101d64a73a4f5f1747484337276e0bcb2f47537d5d SHA512 a42130e592f38696df8d8f02eb40b230ddaad5833cc95c19535cdf7417016d4b8d4870f88c0bc65f8b430c0498d8c771412439d3f6bbcfd21147f6858eb4c0f7 WHIRLPOOL 39b0e5e39cc3534b4bb1f1295b26c03fc4436458bd7d21cae94e83e57ea3ce822777eef00319ebae935f87ba6529ebf4cae8a91cb6ccf2a4b389bda320afcc61
-EBUILD vmware-modules-279.2.ebuild 2827 SHA256 407d97fb75dcde69bfb495722c2fea0e052ac19d294bf88f3b4acd767c342cb1 SHA512 20bad58f294c1ee1487958024d0ebd6628df9f2d30577d9e2a5373a28de1514527ab9e1cac0c305511966348613baa20c044a8e4a08e0830bc6cdd7dcff9d58f WHIRLPOOL 8fdb2e052b079e286476f5c3af7d2d13f295a37fcab861f5734161fa61a9e86dd9c73489511cc55c75cccf0a92d6da8407e9ea5299637b05b809ff2c1ea89b09
-MISC ChangeLog 27008 SHA256 c801550eb2d8a030b56e1f9ae168696f2341cdcc3e5db9b36d3abd8b03e391e7 SHA512 4cd7584abf3f5fef8d8a5c0a83c6b598c3371de1cdecc8fb7e5d08f4716b5e8d25aa012884faa028023a94d425940cc9da6241b1d50416db810e53fdde7cd33a WHIRLPOOL 32b5696cf9b0a6113b896b4b1b0c03d9ad67510180dcfee7a4871bd1f8e6c7f17b6fbbf25fb8313dc35ff980504feb3127e83c8fe3b17a0fe06951f377afb6f4
-MISC metadata.xml 626 SHA256 df85fe94586e898742dda5a30bf95be1c66bded72b9b679b4bda9fb3113bb94a SHA512 5c16977fa1e95f123891324b24d20161bfbfa5f4a38371374290e635bba33cbbc933761f44b826503c37e4bb2295c4026356eddc6aef091c07dc17f773f538ec WHIRLPOOL f83d377fa941fbcfe25dfc83ad276f55782c1e9bdff6dc7ae147be667d7129ae55dae6c19c18544dc27123977d3aa6273f185b4cced70ab841e87a04a4fcae82
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQIcBAEBCAAGBQJTldLFAAoJEJS/30SErRQvX/QP/1QXtZe7dG8bgRIsgCgs8K4/
-TAqTH35dATsIZG66u36ygom06kXAWGvko1qX05FJUP7yd+fy/7cGKXerfqOk6A9z
-kehwXwSELjDJQx9f3+1D52rzDnoXiNkIN1lGHypIPwAzY/MsehWhZ+9CiHvQNDRt
-3yW+jrg/GK8AxcfbozDwSSiY8ndtceizY5h13/R845Bmgyndp6+UBAr0+9MzQfOr
-Tk5hyRsuwTKY+pXqPsLpB2V8T4UhdA7khkNs4Lmz9+jYbP7QA4PJiCZCFOZoMfPV
-SS+VzGQoJbvRXfM0QXCJrHTXfqlYfFa9YSWnsDwmVm1d58WnWMS23wiVLYYiuR+c
-V/BQAPv3vUcK2xsW/TGgmWnE+9VRR5VhFVPYxdT0XUo1qpietr06bd0fDciB2JzE
-vY4wMobMy1JDnWZ1fVRbziAN1jqwHGIYbU8zNxsrymSpDjXFvpbNEXGT4lKqp/V8
-mfI+9exrqYEu9aS5WHJyvxaAVrveBC396oEaiyBOEeHrnU1xbWbTfQuTb4KnZpP6
-J57IBw3deK1DXtMF/zC5yp8yvUoZnEHiqt+h86D54fScizT46yxMgyiBF2lr7wm4
-PF88RiLUR1G6eyfDp80YK440/KLxNd0FxRlEYtBcOQ1OPl4Wre7IZ0mBpNMhDUGR
-2uPO8UukgNVka2/7Dt/i
-=sxBP
------END PGP SIGNATURE-----
diff --git a/app-emulation/vmware-modules/files/279-3.10-02-unused-typedef.patch b/app-emulation/vmware-modules/files/279-3.10-02-unused-typedef.patch
deleted file mode 100644
index d030110..0000000
--- a/app-emulation/vmware-modules/files/279-3.10-02-unused-typedef.patch
+++ /dev/null
@@ -1,112 +0,0 @@
---- vmblock-only/shared/vm_assert.h	2014-10-07 22:43:39.519402467 -0400
-+++ vmblock-only/shared/vm_assert.h	2014-10-07 22:48:01.346409957 -0400
-@@ -317,7 +317,7 @@ EXTERN void WarningThrottled(uint32 *cou
- #define ASSERT_ON_COMPILE(e) \
-    do { \
-       enum { AssertOnCompileMisused = ((e) ? 1 : -1) }; \
--      typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
-+      __attribute__((unused)) typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
-    } while (0)
- 
- 
---- vmci-only/shared/vm_assert.h	2014-10-07 22:43:39.519402467 -0400
-+++ vmci-only/shared/vm_assert.h	2014-10-07 22:47:51.829409685 -0400
-@@ -317,7 +317,7 @@ EXTERN void WarningThrottled(uint32 *cou
- #define ASSERT_ON_COMPILE(e) \
-    do { \
-       enum { AssertOnCompileMisused = ((e) ? 1 : -1) }; \
--      typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
-+      __attribute__((unused)) typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
-    } while (0)
- 
- 
---- vmmon-only/include/vm_assert.h	2014-10-07 22:43:39.520402467 -0400
-+++ vmmon-only/include/vm_assert.h	2014-10-07 22:47:39.246409325 -0400
-@@ -317,7 +317,7 @@ EXTERN void WarningThrottled(uint32 *cou
- #define ASSERT_ON_COMPILE(e) \
-    do { \
-       enum { AssertOnCompileMisused = ((e) ? 1 : -1) }; \
--      typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
-+      __attribute__((unused)) typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
-    } while (0)
- 
- 
---- vmnet-only/vm_assert.h	2014-10-07 22:43:39.520402467 -0400
-+++ vmnet-only/vm_assert.h	2014-10-07 22:47:55.804409799 -0400
-@@ -317,7 +317,7 @@ EXTERN void WarningThrottled(uint32 *cou
- #define ASSERT_ON_COMPILE(e) \
-    do { \
-       enum { AssertOnCompileMisused = ((e) ? 1 : -1) }; \
--      typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
-+      __attribute__((unused)) typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
-    } while (0)
- 
- 
---- vsock-only/shared/vm_assert.h	2014-10-07 22:47:11.595408534 -0400
-+++ vsock-only/shared/vm_assert.h	2014-10-07 22:45:55.715406363 -0400
-@@ -317,7 +317,7 @@ EXTERN void WarningThrottled(uint32 *cou
- #define ASSERT_ON_COMPILE(e) \
-    do { \
-       enum { AssertOnCompileMisused = ((e) ? 1 : -1) }; \
--      typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
-+      __attribute__((unused)) typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
-    } while (0)
- 
- 
---- vsock-only/shared/vm_atomic.h	2013-11-05 23:33:27.000000000 -0500
-+++ vsock-only/shared/vm_atomic.h	2014-10-07 22:53:06.024418673 -0400
-@@ -2394,7 +2394,7 @@ Atomic_TestBit64(Atomic_uint64 *var, //
-                                       && 8 * sizeof (out) == size             \
-                                       && 8 * sizeof (cast) == size            \
-                                          ? 1 : -1 };                          \
--      typedef char AssertOnCompileFailed[AssertOnCompileMisused];             \
-+      __attribute__((unused)) typedef char AssertOnCompileFailed[AssertOnCompileMisused];             \
-    }                                                                          \
-                                                                               \
-                                                                               \
---- vmci-only/shared/vm_atomic.h	2013-11-05 23:33:27.000000000 -0500
-+++ vmci-only/shared/vm_atomic.h	2014-10-07 22:53:24.873419213 -0400
-@@ -2394,7 +2394,7 @@ Atomic_TestBit64(Atomic_uint64 *var, //
-                                       && 8 * sizeof (out) == size             \
-                                       && 8 * sizeof (cast) == size            \
-                                          ? 1 : -1 };                          \
--      typedef char AssertOnCompileFailed[AssertOnCompileMisused];             \
-+      __attribute__((unused)) typedef char AssertOnCompileFailed[AssertOnCompileMisused];             \
-    }                                                                          \
-                                                                               \
-                                                                               \
-
---- vmblock-only/shared/vm_atomic.h	2013-11-05 23:33:27.000000000 -0500
-+++ vmblock-only/shared/vm_atomic.h	2014-10-07 22:53:31.073419390 -0400
-@@ -2394,7 +2394,7 @@ Atomic_TestBit64(Atomic_uint64 *var, //
-                                       && 8 * sizeof (out) == size             \
-                                       && 8 * sizeof (cast) == size            \
-                                          ? 1 : -1 };                          \
--      typedef char AssertOnCompileFailed[AssertOnCompileMisused];             \
-+      __attribute__((unused)) typedef char AssertOnCompileFailed[AssertOnCompileMisused];             \
-    }                                                                          \
-                                                                               \
-
---- vmnet-only/vm_atomic.h	2013-11-06 00:40:52.000000000 -0500
-+++ vmnet-only/vm_atomic.h	2014-10-07 23:04:50.637438831 -0400
-@@ -2394,7 +2394,7 @@ Atomic_TestBit64(Atomic_uint64 *var, //
-                                       && 8 * sizeof (out) == size             \
-                                       && 8 * sizeof (cast) == size            \
-                                          ? 1 : -1 };                          \
--      typedef char AssertOnCompileFailed[AssertOnCompileMisused];             \
-+      __attribute__((unused)) typedef char AssertOnCompileFailed[AssertOnCompileMisused];             \
-    }                                                                          \
-                                                                               \
-                                                                               \
-																			   
---- vmmon-only/include/vm_atomic.h   2013-11-06 00:40:52.000000000 -0500
-+++ vmmon-only/include/vm_atomic.h   2014-10-07 23:04:50.637438831 -0400
-@@ -2394,7 +2394,7 @@ Atomic_TestBit64(Atomic_uint64 *var, //
-                                       && 8 * sizeof (out) == size             \
-                                       && 8 * sizeof (cast) == size            \
-                                          ? 1 : -1 };                          \
--      typedef char AssertOnCompileFailed[AssertOnCompileMisused];             \
-+      __attribute__((unused)) typedef char AssertOnCompileFailed[AssertOnCompileMisused];             \
-    }                                                                          \
-                                                                               \
-                                                                               \
diff --git a/app-emulation/vmware-modules/files/279-3.10-03-deprecated.patch b/app-emulation/vmware-modules/files/279-3.10-03-deprecated.patch
index 3a9f785..0cd1a16 100644
--- a/app-emulation/vmware-modules/files/279-3.10-03-deprecated.patch
+++ b/app-emulation/vmware-modules/files/279-3.10-03-deprecated.patch
@@ -1,83 +1,83 @@
 diff -rupN vmblock-only/shared/vm_assert.h vmblock-only.new/shared/vm_assert.h
---- vmblock-only/shared/vm_assert.h	2014-10-09 21:50:54.221159088 -0400
-+++ vmblock-only.new/shared/vm_assert.h	2014-10-09 21:53:04.612166156 -0400
-@@ -237,11 +237,13 @@ EXTERN void WarningThrottled(uint32 *cou
+--- vmblock-only/shared/vm_assert.h	2014-04-14 17:41:41.000000000 -0400
++++ vmblock-only.new/shared/vm_assert.h	2014-10-11 17:37:23.010352172 -0400
+@@ -251,11 +251,13 @@ void WarningThrottled(uint32 *count, con
  #define LOG_ONCE(_s) DO_ONCE(Log _s)
  
  #ifdef VMX86_DEVEL
 +   #undef DEPRECATED
-    #define DEPRECATED(_fix) DO_ONCE(                                        \
-                                Warning("%s:%d: %s is DEPRECATED; %s\n",     \
-                                           __FILE__, __LINE__, __FUNCTION__, \
-                                           _fix))
+    #define DEPRECATED(_fix) DO_ONCE(                                     \
+                                Warning("%s:%d: %s is DEPRECATED. %s\n",  \
+                                        __FILE__, __LINE__, __FUNCTION__, \
+                                        _fix))
  #else
 +   #undef DEPRECATED
     #define DEPRECATED(_fix) do {} while (0)
  #endif
  
 diff -rupN vmci-only/shared/vm_assert.h vmci-only.new/shared/vm_assert.h
---- vmci-only/shared/vm_assert.h	2014-10-09 21:50:54.222159088 -0400
-+++ vmci-only.new/shared/vm_assert.h	2014-10-09 21:52:52.348165492 -0400
-@@ -237,11 +237,13 @@ EXTERN void WarningThrottled(uint32 *cou
+--- vmci-only/shared/vm_assert.h	2014-04-14 17:41:41.000000000 -0400
++++ vmci-only.new/shared/vm_assert.h	2014-10-11 17:37:08.936352130 -0400
+@@ -251,11 +251,13 @@ void WarningThrottled(uint32 *count, con
  #define LOG_ONCE(_s) DO_ONCE(Log _s)
  
  #ifdef VMX86_DEVEL
 +   #undef DEPRECATED
-    #define DEPRECATED(_fix) DO_ONCE(                                        \
-                                Warning("%s:%d: %s is DEPRECATED; %s\n",     \
-                                           __FILE__, __LINE__, __FUNCTION__, \
-                                           _fix))
+    #define DEPRECATED(_fix) DO_ONCE(                                     \
+                                Warning("%s:%d: %s is DEPRECATED. %s\n",  \
+                                        __FILE__, __LINE__, __FUNCTION__, \
+                                        _fix))
  #else
 +   #undef DEPRECATED
     #define DEPRECATED(_fix) do {} while (0)
  #endif
  
 diff -rupN vmmon-only/include/vm_assert.h vmmon-only.new/include/vm_assert.h
---- vmmon-only/include/vm_assert.h	2014-10-09 21:50:54.222159088 -0400
-+++ vmmon-only.new/include/vm_assert.h	2014-10-09 21:52:36.877164653 -0400
-@@ -237,11 +237,13 @@ EXTERN void WarningThrottled(uint32 *cou
+--- vmmon-only/include/vm_assert.h	2014-04-14 20:06:20.000000000 -0400
++++ vmmon-only.new/include/vm_assert.h	2014-10-11 17:36:45.289352058 -0400
+@@ -251,11 +251,13 @@ void WarningThrottled(uint32 *count, con
  #define LOG_ONCE(_s) DO_ONCE(Log _s)
  
  #ifdef VMX86_DEVEL
 +   #undef DEPRECATED
-    #define DEPRECATED(_fix) DO_ONCE(                                        \
-                                Warning("%s:%d: %s is DEPRECATED; %s\n",     \
-                                           __FILE__, __LINE__, __FUNCTION__, \
-                                           _fix))
+    #define DEPRECATED(_fix) DO_ONCE(                                     \
+                                Warning("%s:%d: %s is DEPRECATED. %s\n",  \
+                                        __FILE__, __LINE__, __FUNCTION__, \
+                                        _fix))
  #else
 +   #undef DEPRECATED
     #define DEPRECATED(_fix) do {} while (0)
  #endif
  
 diff -rupN vmnet-only/vm_assert.h vmnet-only.new/vm_assert.h
---- vmnet-only/vm_assert.h	2014-10-09 21:50:54.222159088 -0400
-+++ vmnet-only.new/vm_assert.h	2014-10-09 21:52:57.736165784 -0400
-@@ -237,11 +237,13 @@ EXTERN void WarningThrottled(uint32 *cou
+--- vmnet-only/vm_assert.h	2014-04-14 20:06:21.000000000 -0400
++++ vmnet-only.new/vm_assert.h	2014-10-11 17:37:14.364352146 -0400
+@@ -251,11 +251,13 @@ void WarningThrottled(uint32 *count, con
  #define LOG_ONCE(_s) DO_ONCE(Log _s)
  
  #ifdef VMX86_DEVEL
 +   #undef DEPRECATED
-    #define DEPRECATED(_fix) DO_ONCE(                                        \
-                                Warning("%s:%d: %s is DEPRECATED; %s\n",     \
-                                           __FILE__, __LINE__, __FUNCTION__, \
-                                           _fix))
+    #define DEPRECATED(_fix) DO_ONCE(                                     \
+                                Warning("%s:%d: %s is DEPRECATED. %s\n",  \
+                                        __FILE__, __LINE__, __FUNCTION__, \
+                                        _fix))
  #else
 +   #undef DEPRECATED
     #define DEPRECATED(_fix) do {} while (0)
  #endif
  
 diff -rupN vsock-only/shared/vm_assert.h vsock-only.new/shared/vm_assert.h
---- vsock-only/shared/vm_assert.h	2014-10-09 21:50:54.222159088 -0400
-+++ vsock-only.new/shared/vm_assert.h	2014-10-09 21:52:45.352165112 -0400
-@@ -237,11 +237,13 @@ EXTERN void WarningThrottled(uint32 *cou
+--- vsock-only/shared/vm_assert.h	2014-04-14 17:41:41.000000000 -0400
++++ vsock-only.new/shared/vm_assert.h	2014-10-11 17:37:02.778352111 -0400
+@@ -251,11 +251,13 @@ void WarningThrottled(uint32 *count, con
  #define LOG_ONCE(_s) DO_ONCE(Log _s)
  
  #ifdef VMX86_DEVEL
 +   #undef DEPRECATED
-    #define DEPRECATED(_fix) DO_ONCE(                                        \
-                                Warning("%s:%d: %s is DEPRECATED; %s\n",     \
-                                           __FILE__, __LINE__, __FUNCTION__, \
-                                           _fix))
+    #define DEPRECATED(_fix) DO_ONCE(                                     \
+                                Warning("%s:%d: %s is DEPRECATED. %s\n",  \
+                                        __FILE__, __LINE__, __FUNCTION__, \
+                                        _fix))
  #else
 +   #undef DEPRECATED
     #define DEPRECATED(_fix) do {} while (0)
diff --git a/app-emulation/vmware-modules/files/279-3.10-05-hub.patch b/app-emulation/vmware-modules/files/279-3.10-05-hub.patch
deleted file mode 100644
index 50ab341..0000000
--- a/app-emulation/vmware-modules/files/279-3.10-05-hub.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -rupN vmnet-only/hub.c vmnet-only.new/hub.c
---- vmnet-only/hub.c	2013-11-06 00:40:52.000000000 -0500
-+++ vmnet-only.new/hub.c	2014-10-07 18:45:34.403918680 -0400
-@@ -129,7 +129,7 @@ VNetHubFindHubByID(uint8 idNum[VNET_PVN_
- {
-    VNetHub *currHub = vnetHub;
-    while (currHub && (currHub->hubType != HUB_TYPE_PVN ||
--		      memcmp(idNum, currHub->id.pvnID, sizeof idNum))) {
-+		      memcmp(idNum, currHub->id.pvnID, VNET_PVN_ID_LEN))) {
-       currHub = currHub->next;
-    }
-    return currHub;
-@@ -312,7 +312,7 @@ VNetHubAlloc(Bool allocPvn, // IN: TRUE
- 
-       if (allocPvn) {
- 	 hub->hubType = HUB_TYPE_PVN;
--	 memcpy(hub->id.pvnID, id, sizeof id);
-+	 memcpy(hub->id.pvnID, id, VNET_PVN_ID_LEN);
- 	 ++pvnInstance;
-       } else {
- 	 hub->hubType = HUB_TYPE_VNET;
diff --git a/app-emulation/vmware-modules/files/279-3.13-00-vmnet.patch b/app-emulation/vmware-modules/files/279-3.13-00-vmnet.patch
deleted file mode 100644
index 4e9d7e9..0000000
--- a/app-emulation/vmware-modules/files/279-3.13-00-vmnet.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- work/vmnet-only/filter.c   2013-08-27 20:29:04.000000000 +0100
-+++ patched/vmnet-only/filter.c   2014-01-26 01:09:05.184893854 +0000
-@@ -27,6 +27,7 @@
- #include "compat_module.h"
- #include <linux/mutex.h>
- #include <linux/netdevice.h>
-+#include <linux/version.h>
- #if COMPAT_LINUX_VERSION_CHECK_LT(3, 2, 0)
- #   include <linux/module.h>
- #else
-@@ -203,7 +204,11 @@
- #endif
-
- static unsigned int
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
- VNetFilterHookFn(unsigned int hooknum,                 // IN:
-+#else
-+VNetFilterHookFn(const struct nf_hook_ops *ops,        // IN:
-+#endif
- #ifdef VMW_NFHOOK_USES_SKB
-                  struct sk_buff *skb,                  // IN:
- #else
-@@ -252,7 +257,12 @@
-
-    /* When the host transmits, hooknum is VMW_NF_INET_POST_ROUTING. */
-    /* When the host receives, hooknum is VMW_NF_INET_LOCAL_IN. */
--   transmit = (hooknum == VMW_NF_INET_POST_ROUTING);
-+
-+   #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
-+      transmit = (hooknum == VMW_NF_INET_POST_ROUTING);
-+   #else
-+      transmit = (ops->hooknum == VMW_NF_INET_POST_ROUTING);
-+   #endif
-
-    packetHeader = compat_skb_network_header(skb);
-    ip = (struct iphdr*)packetHeader;
diff --git a/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild
index d6cc8ea..96b318b 100644
--- a/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild
@@ -82,16 +82,12 @@ src_prepare() {
 	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-vmblock.patch"
 	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-00-userns.patch"
 	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-01-getname.patch"
-	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-02-unused-typedef.patch"
 	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-03-deprecated.patch"
 	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-04-dentry.patch"
 	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-05-inode.patch"
 
-	# fixes a memcpy/memcmp bug in the hub code
-	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-05-hub.patch"
 	
 	kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-filldir.patch"
-	kernel_is ge 3 13 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.13-00-vmnet.patch"
 	kernel_is ge 3 15 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.15-00-readlink.patch"
 	kernel_is ge 3 15 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.15-01-vsock.patch"
 	kernel_is ge 3 17 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.17-00-netdev.patch"