Apply proper patches. Tested with 3.10.7-gentoo-r1.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x84AD142F

4 files changed, 29 insertions, 32 deletions

diff --git a/app-emulation/vmware-modules/ChangeLog b/app-emulation/vmware-modules/ChangeLog
index f99bf5b2e987..609422c62487 100644
--- a/app-emulation/vmware-modules/ChangeLog
+++ b/app-emulation/vmware-modules/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/vmware-modules
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.109 2013/10/22 21:21:05 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.110 2013/11/02 17:15:35 dilfridge Exp $
+
+  02 Nov 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+  files/279-vmblock.patch, vmware-modules-279.0.ebuild:
+  Apply proper patches. Tested with 3.10.7-gentoo-r1.
 
   22 Oct 2013; Andreas K. Huettel <dilfridge@gentoo.org>
   -files/238-2.6.39.patch, -files/238-makefile-kernel-dir.patch,
diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest
index 0ba03a47e27b..5d60ddd1a480 100644
--- a/app-emulation/vmware-modules/Manifest
+++ b/app-emulation/vmware-modules/Manifest
@@ -24,29 +24,27 @@ AUX 279-makefile-include.patch 2501 SHA256 208121855fe18ecb279ff40f2833463559363
 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-vmblock.patch 1217 SHA256 6c25464162853bbf4d149314d13a7de3212d20e53269c918ab65c0d02252fba6 SHA512 34b26256a36c483ac917f483e5f87cb1e6a72c21a9113944f7525156d80483970bbee7c68863b6c96f11f9be5689e457dacb92ef1cbca6cc39c4fc72b4e88a0e WHIRLPOOL 1ad37266559f13ac8bde700460340d16bf152b44a8e01827916612ac13013fa280eaf1c4fa0b76944959ac4d6b3dde709e0f823c2259690307a0266f86b71fba
+AUX 279-vmblock.patch 1041 SHA256 217d27619ac782711686cffee44fbc4bbb40eb0657f335357ad1b0d064f30a35 SHA512 e8e565b677110090cb5bdb7c18d3e97c31049d846b82ee0406aa27dbfa9af8afc39512f1314d49edd6108ec576f3cbc565921de8dfdaaefe2822029ef98c303c WHIRLPOOL 769d0cffcb186d6110de049db963e20e049ef11d92b872c1a6ecfe262acad6c17f456376d219ce01e22839ddcb6a21a2d3e995d797f4c962a0838318dc6f56f9
 AUX hardened.patch 5052 SHA256 191cf892bfb9a6288d110191de824bf6243bc6f48f1e62ab49f3582c7ade5af6 SHA512 52dcca8d9f689f0a0d0ca369c0c7ce0d177de3529d2d1325330eb5a9e940a55e8930bbbe7374793bdf29cbdefac9727e9eb21d00f81ad4f5eddba3a51597b7a5 WHIRLPOOL 539731bc36f3e292403f55d74c353deeb28baa312f726b36d2a6060adf3483dfa2ed011baf93eff941fa754ef62f4d6da86868c40550ee2292c4a711e061bde0
 EBUILD vmware-modules-264.5.ebuild 2296 SHA256 6cef014c0bec60e55ac83f18954680b89a35e031049b745ef864e1ffaac06bc6 SHA512 c63329e2ed5cd845f13935da9277dc3c9145f40832b1b7eb79fe5767fda241a0ceca004da080b164c3c25ed04975739ca9ed8ea4b9f941e33713e68a0032355d WHIRLPOOL ca5d4cc0523e6758a8013603812f6ca8ee03aaf480ae6a9c6123fb692c2900618d88cb1f0e6f94f4b167d66c8b4b3ee52867c4aa50ab9f2bc05649971fefae4d
 EBUILD vmware-modules-271.2.ebuild 2178 SHA256 1eea69a1154fd39be0ecfd60b0097be58265c7a3ca91949ea0c801380c91efa5 SHA512 58c108869ff3b73de5518ffec240e30398f261ca4c6b8a36172a36c494e9ca29a89ef272bddca6cdc38aa2cb3b8c59bdea79d4ad2c21ded6a1e592d3b23a662c WHIRLPOOL 1af685b6e45df9ccf18215b71653d3eb5991afa3830d358179c346a546f3ebfabae84307a1344b8cad64ccb3390b9f315926fd688a88bec89ed7c9c19445b910
-EBUILD vmware-modules-279.0.ebuild 2237 SHA256 6558e769bb7b661db3a9d9d3a7460fea1edf46261459c0a4e0e7b9bab087f269 SHA512 92d13a3f6e45c12ebe7b483440009012f4570da1e8e012e9981bb6f1c237cf626414348474d08fa28563edce44fadc838fd2c15cb288b8f47904146c0dc72a9f WHIRLPOOL 1db2de061cb23b8af2246fbf6d7dc09413c2dd984496932a92619d51fb332c4bbbea668c3dc902397b2b448b8b205da58c4ada0a320b8fca71c8a02ceb84c64e
-MISC ChangeLog 24247 SHA256 c009bd1a8efe0ec89d4414ae68e65c2a69622a0069fc1afec5c405c4855e172a SHA512 4476191ae9d99941db4eebb8b8193a99a1f90c17e2aaf55e86c5a04ab9b4070b7df2ffae143c05203be6598902ca732404b705013935d6de3f921f417e595c2a WHIRLPOOL 4a728fa53f8e045c6ea1b7c5662f56359173acff16ba1871c70ed15eae3bb4c4e96867345e2b5ac32955020855d9ada8b20963fdbb4a6adb71ee57021b6d86bb
+EBUILD vmware-modules-279.0.ebuild 2167 SHA256 ef9b64ac979505570db68c319750bcec82034b1a68ad2853cb0f6888227bf7f2 SHA512 b2147b652c1939d18ce5944ed15635e1c918b22bd89ccb09c62cd9a96d5b44292bfa3b852cbc695daf701f2f3587612c779ef13edb2823b05a14bf059e578c73 WHIRLPOOL 6a6104bdc81e36307bbabf174666cace44266dc16bb6d0aac3dae221c5c3daec8ab827a5c10350f3bc5c808d0fca7bc6bd176a3a2085ffb1dcd55b8270ca4ca3
+MISC ChangeLog 24415 SHA256 627f4eb4c3f79efaf527e981104559ab8faeb15125a363cf7cc93d8ebc1ab5fa SHA512 9c4aafb585b3258bb692c79bfd8e7657c8a7a2266c08863f8e71103a9ce4dcc91fc36697b9c6b4f08123ca972fb14ce9ec87c13a85e955bf99e58af4075c55eb WHIRLPOOL 628ebdf2aa31fb7673ad686f9b65f9762560d8b4271aec420c0efd481bfbf0c9dea083fadb42762396f697f1e23e09c1750e00907f104b64e494df9f81b55d72
 MISC metadata.xml 318 SHA256 ac8fd80ce620f3ec98dfc0dac974408e862ac259c9e43830465598393faa95d0 SHA512 9f7b8c607064b29a2a80ab3af8e5a442a2af1cee3ef9f1929a525e8b3724cf7fef0a4de8d78f32b2bc30f1f734ecc204a3db06a0bcf1e09dbe3d6b8d49dba458 WHIRLPOOL de36c0b8febb345a20d876fceeaeab2bf6f2399620174028fe5bf956cdc871e6623981f8e42562668b34dbf0cf8c4fe35035f4696779f582f679614682c81c72
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSZuxRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOceT0P/0Ed/vKVrsaNwNAqo8MFa5mY
-zfc054JWpsh9eradflr1TrL6+nalbgvtCSK01qXoExijfgOdRuDlTwtIB50u/Y4L
-I+0xGd+eVy7sRKXze7pBQ1cFRynvCWyBQ5Go6hOUSJH0EIuJtuqHh+u2a7cnXyTh
-c9+pXLGI/nTT/Xo9F90Cyuc7CS6IAJ2Qm3ATPbI2JEFVd1v8nAYyOcaf8WeBMx1U
-+Ghjr0MdwZ93O65F4smBtKzRDo/VExMw1tl0CevtdW6/TRMtDmAicCF21b4S9mRq
-MsXMi7a+LMN8G3VGChv4p7G8xxghBcCrdYQ+YWCTyqpvA1gtXxDYiXYte9v9escg
-hlPknL2pMFzQLh1OBApxVKe9+kkvBfLGeXbBPfSGP9x+ADcs8z9a8n+k6T2lgtBs
-EfvCJwn2kwVcwn2GD0jm0m8BG4D+2XtsrXkj+AzejCroBEdjMDOSC0Ugfjnv8ptw
-fhl5yH/awqHAf1e2ZtwVZNI/ToQ3eyNYduqXIEbic+6bcGtPigm64TvTlTT5Lk8e
-eg3/aRAfalyJkvumnUR8Zrx1et2oBKTxfq6XdWhuNnLVZd/jclAMd799q+I5wIZ1
-mxvNBLZRihphGf6+tRnMVOK9sfIqTmt5tThdoCj9jNMchSKEMgBTK6ln7JMBsDy1
-kaDmADaeFU6/fpU+4plR
-=B90C
+iQIcBAEBCAAGBQJSdTOXAAoJEJS/30SErRQvYv8QAJSTyNoRah5tpba33L5ljH0G
+f2D3Qp6QoMCoEMpnJLJedEghHA3BQgwqLdqNsVtShSWo9biAPC5yj+dqfG+4/nc7
+jN/TIL7+9YdMxuTdIJTP4IeOZGNy/oKjWaMjXpHs6/LyG94WClLTdmm0811rRtgw
+9xVi3COqIIvUfWFIMnLRTmm7TsCoIKEKa9HgZX8lirPrri9e6BfhstcOPAz9owNS
+DEtXt8/8dO+xBzxPF9QkB0wL44azGQf6ZTZ+t637HdlM6ak65VPt6pWUAQ1nhlWn
+3XAkjq/2BTF2OHSfxZSYgye5ZBl89RcVNnLJuD5THuWxfpaHQp4LGYc6YaxxmeqZ
+nhgrmSRg/Jac6Id5AyHApcCW5E1giq9JYLKFn/KFeN2ZktCCpPFay7hHR9sjGnDx
+wVZe4TWhZwq1unau/FS1D1ofCBliiwuV02ZeYr5mhUElrVYQW4gdq0Xhaxy6Mc6/
+9jjobNGG9G/5HGiptq0ewxiQuRXxNt5RxZ6/2Lf5uMcdfYRo2pUMKMRDreM8lypG
+zyBn3CYuF1LyZ57o7+qMllTfjKFZykeSaIbPAlImzLPePY3QN4fPaCM9RLMenBZl
+FGu8lkJ2ixOUsNvosSd74VQPJmYljg/IjKPI/kq4x6QLbykLFCWdQYyV2kFXZ/jR
+gTit8lhws8BU2MO3BeZ0
+=ZD7a
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/vmware-modules/files/279-vmblock.patch b/app-emulation/vmware-modules/files/279-vmblock.patch
index e578441e1219..0daf60355618 100644
--- a/app-emulation/vmware-modules/files/279-vmblock.patch
+++ b/app-emulation/vmware-modules/files/279-vmblock.patch
@@ -1,16 +1,14 @@
-diff -ur vmblock-onlya/linux/control.c vmblock-only/linux/control.c
---- vmblock-only/linux/control.c        2013-02-26 10:17:29.000000000 +0200
-+++ vmblock-only/linux/control.c        2013-07-05 19:56:48.298553173 +0300
-@@ -208,17 +208,18 @@
+diff -ruN work.orig/vmblock-only/linux/control.c work/vmblock-only/linux/control.c
+--- work.orig/vmblock-only/linux/control.c	2013-11-02 18:05:39.960226399 +0100
++++ work/vmblock-only/linux/control.c	2013-11-02 18:09:11.760231432 +0100
+@@ -208,17 +208,14 @@
     VMBlockSetProcEntryOwner(controlProcMountpoint);
  
     /* Create /proc/fs/vmblock/dev */
 -   controlProcEntry = create_proc_entry(VMBLOCK_CONTROL_DEVNAME,
-+   /*controlProcEntry = create_proc_entry(VMBLOCK_CONTROL_DEVNAME,
-                                         VMBLOCK_CONTROL_MODE,
+-                                        VMBLOCK_CONTROL_MODE,
 -                                        controlProcDirEntry);
 -   if (!controlProcEntry) {
-+                                        controlProcDirEntry);*/
 +   controlProcEntry = proc_create(VMBLOCK_CONTROL_DEVNAME, VMBLOCK_CONTROL_MODE, controlProcDirEntry, &ControlFileOps);
 +   if (controlProcEntry == NULL) {
        Warning("SetupProcDevice: could not create " VMBLOCK_DEVICE "\n");
@@ -20,8 +18,6 @@ diff -ur vmblock-onlya/linux/control.c vmblock-only/linux/control.c
     }
  
 -   controlProcEntry->proc_fops = &ControlFileOps;
-+   /* controlProcEntry->proc_fops = &ControlFileOps; */
     return 0;
- } 
-
+ }
  
diff --git a/app-emulation/vmware-modules/vmware-modules-279.0.ebuild b/app-emulation/vmware-modules/vmware-modules-279.0.ebuild
index e967df4a9aa3..f567b5fbb55c 100644
--- a/app-emulation/vmware-modules/vmware-modules-279.0.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-279.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-279.0.ebuild,v 1.1 2013/10/19 11:42:47 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-279.0.ebuild,v 1.2 2013/11/02 17:15:35 dilfridge Exp $
 
 EAPI=5
 
@@ -65,8 +65,7 @@ src_prepare() {
 	use pax_kernel && epatch "${FILESDIR}/hardened.patch"
 	epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
 	kernel_is ge 3 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-putname.patch"
-	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10.0.patch"
-	kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-vmblock.patch"
+	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-vmblock.patch"
 
 	# Allow user patches so they can support RC kernels and whatever else
 	epatch_user