summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Hüttel <dilfridge@gentoo.org>2013-10-22 21:21:09 +0000
committerAndreas Hüttel <dilfridge@gentoo.org>2013-10-22 21:21:09 +0000
commit2a694969adddab15f96319db8e15ed98ee44d80c (patch)
treeada316d7557bc763bf0cdb0cc02c45fb2f7a2b6a /app-emulation
parentRevision bump backporting the fix for kde bug 278082 (diff)
downloadhistorical-2a694969adddab15f96319db8e15ed98ee44d80c.tar.gz
historical-2a694969adddab15f96319db8e15ed98ee44d80c.tar.bz2
historical-2a694969adddab15f96319db8e15ed98ee44d80c.zip
Drop old
Package-Manager: portage-2.2.7/cvs/Linux x86_64 Manifest-Sign-Key: 0xEBE6A336BE19039C!
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/vmware-modules/ChangeLog10
-rw-r--r--app-emulation/vmware-modules/Manifest40
-rw-r--r--app-emulation/vmware-modules/files/238-2.6.39.patch243
-rw-r--r--app-emulation/vmware-modules/files/238-3.2.0.patch103
-rw-r--r--app-emulation/vmware-modules/files/238-d-make-root.patch14
-rw-r--r--app-emulation/vmware-modules/files/238-jobserver.patch75
-rw-r--r--app-emulation/vmware-modules/files/238-makefile-include.patch65
-rw-r--r--app-emulation/vmware-modules/files/238-makefile-kernel-dir.patch80
-rw-r--r--app-emulation/vmware-modules/files/238-netdevice.patch24
-rw-r--r--app-emulation/vmware-modules/files/238-sema.patch83
-rw-r--r--app-emulation/vmware-modules/files/238-unlocked_ioctl.patch33
-rw-r--r--app-emulation/vmware-modules/vmware-modules-238.6.ebuild84
-rw-r--r--app-emulation/vmware-workstation/ChangeLog7
-rw-r--r--app-emulation/vmware-workstation/Manifest35
-rw-r--r--app-emulation/vmware-workstation/files/vmware-7.0.rc33
-rw-r--r--app-emulation/vmware-workstation/vmware-workstation-7.1.6.744570.ebuild308
-rw-r--r--app-emulation/vmware-workstation/vmware-workstation-9.0.2.1031769.ebuild483
17 files changed, 45 insertions, 1675 deletions
diff --git a/app-emulation/vmware-modules/ChangeLog b/app-emulation/vmware-modules/ChangeLog
index 1f02d226ed80..f99bf5b2e987 100644
--- a/app-emulation/vmware-modules/ChangeLog
+++ b/app-emulation/vmware-modules/ChangeLog
@@ -1,6 +1,14 @@
# 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.108 2013/10/19 11:42:47 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.109 2013/10/22 21:21:05 dilfridge Exp $
+
+ 22 Oct 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+ -files/238-2.6.39.patch, -files/238-makefile-kernel-dir.patch,
+ -files/238-3.2.0.patch, -files/238-d-make-root.patch,
+ -files/238-jobserver.patch, -files/238-makefile-include.patch,
+ -files/238-netdevice.patch, -files/238-sema.patch,
+ -files/238-unlocked_ioctl.patch, -vmware-modules-238.6.ebuild:
+ Drop old
*vmware-modules-279.0 (19 Oct 2013)
diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest
index c4d6161fb02e..0ba03a47e27b 100644
--- a/app-emulation/vmware-modules/Manifest
+++ b/app-emulation/vmware-modules/Manifest
@@ -1,15 +1,6 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX 238-2.6.39.patch 8566 SHA256 31e68e9897660cc8ff898eae1d722d616205fff1efd30cd8e042a3a455bd2350 SHA512 c52c1ea600103971fdbb288868f6302ba82b5a79308ff147b342752f8f63cfe30b8aeb88801318040cfe8854535fbfedf692f7f31f8bcaf0b180baeae7d43d46 WHIRLPOOL 8725ca46300a32e471aeb403c1ff251e9d687697b656cb91e7f0a5cf94d4cbede9e154a97c9c07e66da908331bb60cb0438a29e11aedaecc2c4dcc36d7f8f802
-AUX 238-3.2.0.patch 3533 SHA256 df2bf5a026281559ba6e0d364555c8f48024b7ce2231c652960b5c477cc4545a SHA512 431a77943ce0c7d1ade35534baddae12d413f7209f068af1f08f0f63e9614d488454a613551970f096652b36519e751ea3dc01056c7e930e2867c548fffea12e WHIRLPOOL d2ee45366fd3491cf4686cdce67d3ce80cdc1a7f16869beb6ad30c6cb2ffc488018e4f61ebde6246112d52727da211adedf2ab0b90c466ea4c1a2dd2d2722c14
-AUX 238-d-make-root.patch 418 SHA256 097a4be57e19b9342d2aab6d2f354969dd7e596efeef60465fd9bf818dadcd8a SHA512 948e4ef1d57e720178f8995ecd47987cf5a34981b959dccd5f8d16a214ff9261e6547a72efaa44dae920b2184aee0d65190be5b72f1d87fb760286278a789255 WHIRLPOOL b7cda3432c7cc9103d5c2b0457e7fdfc20c7c209827be61a46e6e99566aac7977a122e7de4c59468d053e664b162329bae3b5131ea3f8de3db72634179d4c48e
-AUX 238-jobserver.patch 2899 SHA256 131c606fdafe80f10151c667796270101f3b06ee70a1b872862e15bcfb4ee46d SHA512 cb744aaea00b6eb6970987dd62b71ee9194d8c9ee8941447f0f562af14ba342eee241a3b131de8ad96a8481a5cdf6d88149fd4d409d938ddfeb44b520c5bd790 WHIRLPOOL d7050bbb7160704a9f922a17e2aae14050f4618e9b469bcbb51ff0859be78f15374777b3e1504c87b5298b41ec8191dfa688a183a4d4c110bab8178d704562d1
-AUX 238-makefile-include.patch 2791 SHA256 ac676433ca499268bd6a1f0d7d904a44095bb1a777ad31d055e8c4990eea586c SHA512 300fa634ddf1a6012bfb25572152ab8251b1dc31582813d470d8a70384cb81ca19ff2c972ae940fcce70ec8f65801c399c2b5b4d4a2b4d72753481df4e5cae38 WHIRLPOOL 3787084621fd87f180f039b9a324b6923f257ead21b7418e4c0c19d5c9429974763e2bca988e8850612e73c0bfd173f7dd6942da9a62f5177b67bc12e5cbebdb
-AUX 238-makefile-kernel-dir.patch 2201 SHA256 780b79fcc6e8e836632f4542ac6c3da2d475b3ad1e2e88e1c51aea849a5172c7 SHA512 bb67ad9ec9152fb0192ba978566a6777bbf5d99ed8ccc6762c5af96615368d497d4183e42fbe78d8359f3d59749929742131e83e77edf649878767f0007babbf WHIRLPOOL 9932ed3ac03ead8507c348512a7a554dad28c2133347ce83dad4bc528228944559950258cb0f838bd8510d637988c2aba1105fa8fbea3a7852ed0df7af0aae49
-AUX 238-netdevice.patch 833 SHA256 8f17ce379abda45a8f94e1dcd6e43367273f97f76edd41f9941beb3b1730a751 SHA512 b4ec7c1694968a1843f10e8bfe0dbfdc99bd3b5fc1391456d91a3648b848b82df681a0748d967afa19e728c4d19b79b6a3cb9fd3e15a52a5cab048a6ac9b06a9 WHIRLPOOL b0cabe2ec1b8ca52d427c02593d6057c98d4ed00c578d006de65460138c37a5be76a7938d85f5a35eb6f49ee5e34065ce62b60a51b0ccf021639a59b27aeac8a
-AUX 238-sema.patch 3621 SHA256 b56a5b6aa655f830f93424ec23cedd7dde7304f214357cde05bc89574600cbe0 SHA512 23eb215a97b72516069b10383356a3e8fe19c9689e4f0cb6f281536b8a7ec8b82598ed0360100b0107a5e5b2f001fa60e319198f97b3b05e1b25241574943007 WHIRLPOOL 1b12a66e322fad4d62b404257603e6acd73ba8edba641d8cff1f43a465c2915906335dddca2ade49fb8e54985fc760e712e973e795994aad311a3140deb2d6ee
-AUX 238-unlocked_ioctl.patch 1114 SHA256 d3ea574000ab0ccacad75534fc76b482ef78a47a7804e9f2abeb406ceccbb458 SHA512 9f1fea3c17c945f3da6b55f55343886584980e5c9556a8323ec3edcb776f102c41f15ace29790b02df9ce0c43e396ea96e1935a575bbeeac79fed422973e0958 WHIRLPOOL 5150d0c03dbbd4b74445b173e349df4be34faac0bb770c5d689590d105a7cfd053538f5006c8ef4b69820717cf50066f424c90df0a74caafaf65021059cf173d
AUX 264-3.10.0.patch 24201 SHA256 be0dbd21542475780bd391566ffd213b9ba9b3ce7a2383f10306ad0f7927b62e SHA512 7a5f6b0247db63894bcaa7718dc5d4cd7203bc42e1f5a3b5029ca92b25d19ac34f837a7f21661801a9c42f3f4ef84f8151afce4a0d1aab91c5e3e6122374537b WHIRLPOOL 2d9b3a0ce80d51ee79991c13d979d01ba8c6ecea8c3f04c5b991e5c5276c2b5f9f88b5f39d47c44d30ad6de5fbbb518a76d4405bcc47615eab23fc9918773b32
AUX 264-3.2.0.patch 2949 SHA256 4105952362a9bf8a054df1c23f2562e86f79b3bef70696422548c01db248c1b0 SHA512 d3b9f2ad688c7ad0922f9b036f3b2fb0e7209cf4814e34431dccb72f11d239ac8bf9cf16f7e6e8ddfbcf839ad043bbc45233fe488564665bb782b8e296e6facf WHIRLPOOL 4041bfbbb472c6eb7372ca8883ee037c0facc0d1b1c85fab3adb01783291e5c1f2b1685a9cfa41e4433d4255e495af735e0d8af0726c0bc31d15564c96abb0bc
AUX 264-3.8.0.patch 1243 SHA256 75bca77a37dec85288c28805799690cbd39ef4dc87da9c7ee1486d7872a1e669 SHA512 4c6e437e7198cc24c344116410f175a460e81f5ec33e165dca80851c833925c722d0d0147b2df50aa5101afa16b9145538bf889a6d788b1265419bef04d40d49 WHIRLPOOL 0a4caf5729d1dfb05a0cc84176bc904383aaf184007fdc8fd953d9ba0c4234dc4fc49a99f5c1e1c1431dadff2a3d3bc8ce925a528306fa9ca5459e93321fd678
@@ -35,28 +26,27 @@ AUX 279-netdevice.patch 833 SHA256 8f17ce379abda45a8f94e1dcd6e43367273f97f76edd4
AUX 279-putname.patch 394 SHA256 b8103d3c72c24696e974e49dcdcdf2d5a2b2c2fdd5f6ca050842b840e906ba77 SHA512 86a0a0ec3ff225940190056e85d498fd7eb260bcc52882fea8921398f572bc46f56c3f2941d3f3d1587a07bc72c8885cbddacf632d2b5fed7d8c9d284399d6d8 WHIRLPOOL e1e8afcafe00131fd6d90b61e5d911da69d7c26b7fd19be085eb5cfd23c2ab19784ae5ddf18928f9cc4a178d87c6d51e8de27dfab8507e2d57fc18868fde9f45
AUX 279-vmblock.patch 1217 SHA256 6c25464162853bbf4d149314d13a7de3212d20e53269c918ab65c0d02252fba6 SHA512 34b26256a36c483ac917f483e5f87cb1e6a72c21a9113944f7525156d80483970bbee7c68863b6c96f11f9be5689e457dacb92ef1cbca6cc39c4fc72b4e88a0e WHIRLPOOL 1ad37266559f13ac8bde700460340d16bf152b44a8e01827916612ac13013fa280eaf1c4fa0b76944959ac4d6b3dde709e0f823c2259690307a0266f86b71fba
AUX hardened.patch 5052 SHA256 191cf892bfb9a6288d110191de824bf6243bc6f48f1e62ab49f3582c7ade5af6 SHA512 52dcca8d9f689f0a0d0ca369c0c7ce0d177de3529d2d1325330eb5a9e940a55e8930bbbe7374793bdf29cbdefac9727e9eb21d00f81ad4f5eddba3a51597b7a5 WHIRLPOOL 539731bc36f3e292403f55d74c353deeb28baa312f726b36d2a6060adf3483dfa2ed011baf93eff941fa754ef62f4d6da86868c40550ee2292c4a711e061bde0
-EBUILD vmware-modules-238.6.ebuild 2216 SHA256 495f742c98fc4ea4aaaa9daf1ffbc6d79e56a77e2d032cfe0ebc6cf409fa904c SHA512 70d3d107ac3b72215054efdf355f2731720dfdbc5b4ba6736b5b12a4f7809b29cc04809b30c208398c90152ba14ee6124d82dc067d6c0342538a2c3c8e9075fe WHIRLPOOL 9ff331f9b7c6bde939730b0b2511776f14607b768c1748ab612f2f52754736cb889cfdfb16186b0d6ef38fd83bdd07c1aabe2095059e8f79f89d8c72ab470675
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 23874 SHA256 4759186b8e0bf4257c6791499f1a57f66f4b3188565ecad223c88f32ddc5136c SHA512 aebfbea0b27f2842d6d698570be4f1c3edd5a7affcfac895c53b6e814f0fc55fa8bd605e1922b9ac14f8e0f5664085f6825c4e266b576f143c402444907c8140 WHIRLPOOL 647f4f2a896959cc1cc0276c03d5c9717379983fa1f74fc750a595aeeb9ed15b9a7849969bc2042eaad09397c0c004d67b0fcf24f26e57d7ce637f4cb1dbe5dc
+MISC ChangeLog 24247 SHA256 c009bd1a8efe0ec89d4414ae68e65c2a69622a0069fc1afec5c405c4855e172a SHA512 4476191ae9d99941db4eebb8b8193a99a1f90c17e2aaf55e86c5a04ab9b4070b7df2ffae143c05203be6598902ca732404b705013935d6de3f921f417e595c2a WHIRLPOOL 4a728fa53f8e045c6ea1b7c5662f56359173acff16ba1871c70ed15eae3bb4c4e96867345e2b5ac32955020855d9ada8b20963fdbb4a6adb71ee57021b6d86bb
MISC metadata.xml 318 SHA256 ac8fd80ce620f3ec98dfc0dac974408e862ac259c9e43830465598393faa95d0 SHA512 9f7b8c607064b29a2a80ab3af8e5a442a2af1cee3ef9f1929a525e8b3724cf7fef0a4de8d78f32b2bc30f1f734ecc204a3db06a0bcf1e09dbe3d6b8d49dba458 WHIRLPOOL de36c0b8febb345a20d876fceeaeab2bf6f2399620174028fe5bf956cdc871e6623981f8e42562668b34dbf0cf8c4fe35035f4696779f582f679614682c81c72
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iQJ8BAEBCABmBQJSYnBEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJSZuxRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcjx4P/2qGYKHigokxPVw8zby6022c
-BRUr8hYAHtPvsfvIOGv2bPiaJmVGa4k4WqbNx9ASv8SzUugC77r98oslMeAb+GmJ
-X9swY6UT85dnIXBW3JeYOlWUscUhSUDUYd639UQWcHLjefXHO2x34C0uDmwzcAuB
-oFgWw92tuk2DDRHTwleRyId8rPWB+gIvVx9IpUd2ee72Y5lPj/IQolYF9ik9yIJX
-ci5016Jy+DhzXRoj/kyR5P8Wzqgj9SBXPCfbE5NsJ9S4iblwGmXgzl100F06K1rw
-s6/sdosdAgmuXr5aKcAk48CDXsOgUF5es4esWM8THt4/uvxp2F3HUcX93aSblNnR
-iLr0uta3TgP7y8oFnmEROJC/g8MpMnehVluLqPWe0RZ1dnKFMsJ5GrpPyapefn1z
-SIp7WB9H4uFOHWsbP50gj50pRCUNT2nec/zB7B06bYohzJdRyliKB/p82FrmWc8h
-yMmiMTFcKa/pakdaSzMMu5PXaY9Vwl0P9j2dtUd3zl9Yb2CpoSfCcRK/EVyulZg1
-00KaiiNPzsvsJGxwS7oVsf6xmm6EIY1CHtS7rcsNnBNqdyrJLzf441JciBfc1RDw
-HB/24/gvB4iPfQUr5GCStRMsCJ2TYs/Ns7fUqkMKduyKHmZqePCXk8f6oX1Zfcj6
-HMjD6s3yGvW7RWppjW5Y
-=6gXD
+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
-----END PGP SIGNATURE-----
diff --git a/app-emulation/vmware-modules/files/238-2.6.39.patch b/app-emulation/vmware-modules/files/238-2.6.39.patch
deleted file mode 100644
index 88873e581400..000000000000
--- a/app-emulation/vmware-modules/files/238-2.6.39.patch
+++ /dev/null
@@ -1,243 +0,0 @@
-diff --git a/vmblock-only/linux/dentry.c b/vmblock-only/linux/dentry.c
-index 66537c8..05ea95a 100644
---- a/vmblock-only/linux/dentry.c
-+++ b/vmblock-only/linux/dentry.c
-@@ -104,7 +104,7 @@ DentryOpRevalidate(struct dentry *dentry, // IN: dentry revalidating
- return actualDentry->d_op->d_revalidate(actualDentry, nd);
- }
-
-- if (path_lookup(iinfo->name, 0, &actualNd)) {
-+ if (compat_path_lookup(iinfo->name, 0, &actualNd)) {
- LOG(4, "DentryOpRevalidate: [%s] no longer exists\n", iinfo->name);
- return 0;
- }
-diff --git a/vmblock-only/linux/filesystem.c b/vmblock-only/linux/filesystem.c
-index 53840fd..bc117c5 100644
---- a/vmblock-only/linux/filesystem.c
-+++ b/vmblock-only/linux/filesystem.c
-@@ -66,7 +66,6 @@ static size_t fsRootLen;
- static struct file_system_type fsType = {
- .owner = THIS_MODULE,
- .name = VMBLOCK_FS_NAME,
-- .get_sb = FsOpGetSb,
- .kill_sb = kill_anon_super,
- };
-
-@@ -553,7 +552,7 @@ FsOpReadSuper(struct super_block *sb, // OUT: Superblock object
- *-----------------------------------------------------------------------------
- */
-
--static int
-+/*static int
- FsOpGetSb(struct file_system_type *fs_type, // IN: file system type of mount
- int flags, // IN: mount flags
- const char *dev_name, // IN: device mounting on
-@@ -561,7 +560,7 @@ FsOpGetSb(struct file_system_type *fs_type, // IN: file system type of mount
- struct vfsmount *mnt) // IN: vfs mount
- {
- return get_sb_nodev(fs_type, flags, rawData, FsOpReadSuper, mnt);
--}
-+}*/
- #else
- /*
- *-----------------------------------------------------------------------------
-diff --git a/vmblock-only/shared/compat_namei.h b/vmblock-only/shared/compat_namei.h
-index 28d72c8..4214247 100644
---- a/vmblock-only/shared/compat_namei.h
-+++ b/vmblock-only/shared/compat_namei.h
-@@ -40,8 +40,11 @@
- #define compat_path_release(nd) path_release(nd)
- #endif
-
-+/* path_lookup was removed in 2.6.39 merge window VFS merge */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)
-+#define compat_path_lookup(name, flags, nd) kern_path(name, flags, &((nd)->path))
- /* path_lookup was exported in 2.4.25 */
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 25)
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 25)
- #define compat_path_lookup(path, flags, nd) path_lookup(path, flags, nd)
- #else
- #define compat_path_lookup(path, flags, nd) \
-diff --git a/vmci-only/linux/driver.c b/vmci-only/linux/driver.c
-index a0f5498..49795e1 100644
---- a/vmci-only/linux/driver.c
-+++ b/vmci-only/linux/driver.c
-@@ -42,7 +42,6 @@ sys_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg);
- #include <linux/miscdevice.h>
- #include <linux/poll.h>
- #include <linux/smp.h>
--#include <linux/smp_lock.h>
-
- #include "compat_file.h"
- #include "compat_highmem.h"
-diff --git a/vmmon-only/linux/driver.c b/vmmon-only/linux/driver.c
-index a33c983..89f8827 100644
---- a/vmmon-only/linux/driver.c
-+++ b/vmmon-only/linux/driver.c
-@@ -781,7 +781,7 @@ LinuxDriver_Close(struct inode *inode, // IN
-
-
- #define POLLQUEUE_MAX_TASK 1000
--static spinlock_t pollQueueLock __attribute__((unused)) = SPIN_LOCK_UNLOCKED;
-+static DEFINE_SPINLOCK(pollQueueLock);
- static void *pollQueue[POLLQUEUE_MAX_TASK];
- static unsigned int pollQueueCount = 0;
-
-@@ -1042,7 +1042,8 @@ LinuxDriverPoll(struct file *filp,
- * but unfortunately there is no way how to detect that
- * we are building for RedHat's kernel...
- */
-- static spinlock_t timerLock = SPIN_LOCK_UNLOCKED;
-+
-+ static DEFINE_SPINLOCK(timerLock);
-
- spin_lock(&timerLock);
- mod_timer(&linuxState.pollTimer, jiffies + 1);
-diff --git a/vmmon-only/linux/hostif.c b/vmmon-only/linux/hostif.c
-index 6c7b34d..fabb44d 100644
---- a/vmmon-only/linux/hostif.c
-+++ b/vmmon-only/linux/hostif.c
-@@ -46,7 +46,6 @@
- #include <linux/mman.h>
-
- #include <linux/smp.h>
--#include <linux/smp_lock.h>
-
- #include <asm/io.h>
- #include <linux/mc146818rtc.h>
-diff --git a/vmmon-only/linux/iommu.c b/vmmon-only/linux/iommu.c
-index f64e80a..b0ee013 100644
---- a/vmmon-only/linux/iommu.c
-+++ b/vmmon-only/linux/iommu.c
-@@ -44,7 +44,7 @@ typedef struct PassthruDevice {
-
-
- static LIST_HEAD(passthruDeviceList);
--static spinlock_t passthruDeviceListLock = SPIN_LOCK_UNLOCKED;
-+static DEFINE_SPINLOCK(passthruDeviceListLock);
- static void *pciHolePage = NULL;
-
- /*
-diff --git a/vmnet-only/driver.c b/vmnet-only/driver.c
-index c91a1dc..4c195e1 100644
---- a/vmnet-only/driver.c
-+++ b/vmnet-only/driver.c
-@@ -28,7 +28,6 @@
- #include <linux/poll.h>
-
- #include <linux/smp.h>
--#include <linux/smp_lock.h>
-
- #include <linux/netdevice.h>
- #include <linux/etherdevice.h>
-@@ -105,7 +104,7 @@ const uint8 broadcast[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
- * not have vnetStructureMutex already acquired,
- * it is most certainly a bug.
- */
--static rwlock_t vnetPeerLock = RW_LOCK_UNLOCKED;
-+static DEFINE_RWLOCK(vnetPeerLock);
-
- /*
- * All concurrent changes to the network structure are
-@@ -115,6 +114,7 @@ static rwlock_t vnetPeerLock = RW_LOCK_UNLOCKED;
- * vnetStructureMutex and vnetPeerLock for write.
- */
- compat_define_mutex(vnetStructureMutex);
-+compat_define_mutex(vnetMutex);
-
- #if defined(VM_X86_64) && !defined(HAVE_COMPAT_IOCTL)
- /*
-@@ -264,11 +264,11 @@ LinuxDriver_Ioctl32_Handler(unsigned int fd, // IN: (unused)
- struct file * filp) // IN:
- {
- int ret = -ENOTTY;
-- lock_kernel();
-+ compat_mutex_lock(&vnetMutex);
- if (filp && filp->f_op && filp->f_op->ioctl == VNetFileOpIoctl) {
- ret = VNetFileOpIoctl(filp->f_dentry->d_inode, filp, iocmd, ioarg);
- }
-- unlock_kernel();
-+ compat_mutex_unlock(&vnetMutex);
- return ret;
- }
-
-@@ -1134,9 +1134,9 @@ VNetFileOpUnlockedIoctl(struct file *filp, // IN:
- if (filp && filp->f_dentry) {
- inode = filp->f_dentry->d_inode;
- }
-- lock_kernel();
-+ compat_mutex_lock(&vnetMutex);
- err = VNetFileOpIoctl(inode, filp, iocmd, ioarg);
-- unlock_kernel();
-+ compat_mutex_unlock(&vnetMutex);
- return err;
- }
- #endif
-diff --git a/vmnet-only/filter.c b/vmnet-only/filter.c
-index 34b7d3d..b0017d7 100644
---- a/vmnet-only/filter.c
-+++ b/vmnet-only/filter.c
-@@ -85,7 +85,7 @@ static compat_define_mutex(filterIoctlMutex); /* serialize ioctl()s from user sp
- * callbacks can be concurrently executing on multiple threads on multiple
- * CPUs, so we should revisit locking for allowing for that in the future.
- */
--spinlock_t activeRuleLock = SPIN_LOCK_UNLOCKED;
-+DEFINE_SPINLOCK(activeRuleLock);
-
- /*
- * Logging.
-diff --git a/vmnet-only/hub.c b/vmnet-only/hub.c
-index b05efea..38d9aef 100644
---- a/vmnet-only/hub.c
-+++ b/vmnet-only/hub.c
-@@ -81,7 +81,7 @@ static VNetHub *vnetHub = NULL;
- * so we use __attribute__((unused)) to quiet the compiler.
- */
-
--static spinlock_t vnetHubLock __attribute__((unused)) = SPIN_LOCK_UNLOCKED;
-+static DEFINE_SPINLOCK(vnetHubLock);
-
-
- /*
-diff --git a/vsock-only/linux/af_vsock.c b/vsock-only/linux/af_vsock.c
-index ecd057e..d565ec0 100644
---- a/vsock-only/linux/af_vsock.c
-+++ b/vsock-only/linux/af_vsock.c
-@@ -102,7 +102,6 @@
- #include <linux/miscdevice.h>
- #include <linux/poll.h>
- #include <linux/smp.h>
--#include <linux/smp_lock.h>
- #include <asm/io.h>
- #if defined(__x86_64__) && LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 12)
- # if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
-diff --git a/vsock-only/linux/util.c b/vsock-only/linux/util.c
-index 53f2edb..32a7da7 100644
---- a/vsock-only/linux/util.c
-+++ b/vsock-only/linux/util.c
-@@ -34,7 +34,7 @@
- struct list_head vsockBindTable[VSOCK_HASH_SIZE + 1];
- struct list_head vsockConnectedTable[VSOCK_HASH_SIZE];
-
--spinlock_t vsockTableLock = SPIN_LOCK_UNLOCKED;
-+DEFINE_SPINLOCK(vsockTableLock);
-
- /*
- * snprintf() wasn't exported until 2.4.10: fall back on sprintf in those
-diff --git a/vsock-only/shared/compat_namei.h b/vsock-only/shared/compat_namei.h
-index 28d72c8..4214247 100644
---- a/vsock-only/shared/compat_namei.h
-+++ b/vsock-only/shared/compat_namei.h
-@@ -40,8 +40,11 @@
- #define compat_path_release(nd) path_release(nd)
- #endif
-
-+/* path_lookup was removed in 2.6.39 merge window VFS merge */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)
-+#define compat_path_lookup(name, flags, nd) kern_path(name, flags, &((nd)->path))
- /* path_lookup was exported in 2.4.25 */
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 25)
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 25)
- #define compat_path_lookup(path, flags, nd) path_lookup(path, flags, nd)
- #else
- #define compat_path_lookup(path, flags, nd) \
diff --git a/app-emulation/vmware-modules/files/238-3.2.0.patch b/app-emulation/vmware-modules/files/238-3.2.0.patch
deleted file mode 100644
index 0416214c3125..000000000000
--- a/app-emulation/vmware-modules/files/238-3.2.0.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-diff --git a/vmmon-only/linux/iommu.c b/vmmon-only/linux/iommu.c
-index b0ee013..f0f5c9a 100644
---- a/vmmon-only/linux/iommu.c
-+++ b/vmmon-only/linux/iommu.c
-@@ -36,6 +36,12 @@
- #define PCI_BDF_SLOTFUNC(bdf) PCI_DEVFN(PCI_SLOT(bdf), PCI_FUNC(bdf))
- #define PCI_BDF_BUS(bdf) (((bdf) >> 8) & 0xff)
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
-+#include <linux/pci.h>
-+#define iommu_found() iommu_present(&pci_bus_type)
-+#define iommu_domain_alloc() iommu_domain_alloc(&pci_bus_type)
-+#endif
-+
- typedef struct PassthruDevice {
- struct pci_dev *pdev;
- VMLinux *vmLinux;
-diff --git a/vmnet-only/filter.c b/vmnet-only/filter.c
-index b0017d7..6c0687f 100644
---- a/vmnet-only/filter.c
-+++ b/vmnet-only/filter.c
-@@ -41,6 +41,10 @@
- #include "vnetInt.h"
- #include "vmnetInt.h"
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
-+#include <linux/export.h>
-+#endif
-+
- // VNet_FilterLogPacket.action for dropped packets
- #define VNET_FILTER_ACTION_DRP (1)
- #define VNET_FILTER_ACTION_DRP_SHORT (2)
-diff --git a/vmnet-only/netif.c b/vmnet-only/netif.c
-index b3c752b..79d4896 100644
---- a/vmnet-only/netif.c
-+++ b/vmnet-only/netif.c
-@@ -62,7 +62,9 @@ static int VNetNetifClose(struct net_device *dev);
- static int VNetNetifStartXmit(struct sk_buff *skb, struct net_device *dev);
- static struct net_device_stats *VNetNetifGetStats(struct net_device *dev);
- static int VNetNetifSetMAC(struct net_device *dev, void *addr);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)
- static void VNetNetifSetMulticast(struct net_device *dev);
-+#endif
- #if 0
- static void VNetNetifTxTimeout(struct net_device *dev);
- #endif
-@@ -131,7 +133,9 @@ VNetNetIfSetup(struct net_device *dev) // IN:
- .ndo_stop = VNetNetifClose,
- .ndo_get_stats = VNetNetifGetStats,
- .ndo_set_mac_address = VNetNetifSetMAC,
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)
- .ndo_set_multicast_list = VNetNetifSetMulticast,
-+#endif
- /*
- * We cannot stuck... If someone will report problems under
- * low memory conditions or some such, we should enable it.
-@@ -152,7 +156,9 @@ VNetNetIfSetup(struct net_device *dev) // IN:
- dev->stop = VNetNetifClose;
- dev->get_stats = VNetNetifGetStats;
- dev->set_mac_address = VNetNetifSetMAC;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)
- dev->set_multicast_list = VNetNetifSetMulticast;
-+#endif
- /*
- * We cannot stuck... If someone will report problems under
- * low memory conditions or some such, we should enable it.
-@@ -621,11 +627,12 @@ VNetNetifSetMAC(struct net_device *dev, // IN:
- *----------------------------------------------------------------------
- */
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)
- void
- VNetNetifSetMulticast(struct net_device *dev) // IN: unused
- {
- }
--
-+#endif
-
- /*
- *----------------------------------------------------------------------
-diff --git a/vmnet-only/userif.c b/vmnet-only/userif.c
-index 4e65c76..fd12aa9 100644
---- a/vmnet-only/userif.c
-+++ b/vmnet-only/userif.c
-@@ -572,10 +572,18 @@ VNetCsumCopyDatagram(const struct sk_buff *skb, // IN: skb to copy
- unsigned int tmpCsum;
- const void *vaddr;
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
-+ vaddr = kmap(skb_frag_page(frag));
-+#else
- vaddr = kmap(frag->page);
-+#endif
- tmpCsum = csum_and_copy_to_user(vaddr + frag->page_offset,
- curr, frag->size, 0, &err);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
-+ kunmap(skb_frag_page(frag));
-+#else
- kunmap(frag->page);
-+#endif
- if (err) {
- return err;
- }
diff --git a/app-emulation/vmware-modules/files/238-d-make-root.patch b/app-emulation/vmware-modules/files/238-d-make-root.patch
deleted file mode 100644
index 7e83a1e91092..000000000000
--- a/app-emulation/vmware-modules/files/238-d-make-root.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/vmblock-only/linux/filesystem.c 2012-05-23 20:08:00.632051396 -0500
-+++ b/vmblock-only/linux/filesystem.c 2012-05-23 20:17:00.896297163 -0500
-@@ -517,7 +517,11 @@
- return -EINVAL;
- }
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)
- rootDentry = d_alloc_root(rootInode);
-+#else
-+ rootDentry = d_make_root(rootInode);
-+#endif
- if (!rootDentry) {
- iput(rootInode);
- return -ENOMEM;
diff --git a/app-emulation/vmware-modules/files/238-jobserver.patch b/app-emulation/vmware-modules/files/238-jobserver.patch
deleted file mode 100644
index 59a6ccca1da0..000000000000
--- a/app-emulation/vmware-modules/files/238-jobserver.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff -ru a/work/vmblock-only/Makefile b/work/vmblock-only/Makefile
---- a/work/vmblock-only/Makefile 2011-01-22 08:59:15.907152002 -0500
-+++ b/work/vmblock-only/Makefile 2011-01-22 09:13:55.894938002 -0500
-@@ -123,9 +123,9 @@
- postbuild:: ;
-
- $(DRIVER_KO): prebuild
-- make -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
-+ $(MAKE) -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
- MODULEBUILDDIR=$(MODULEBUILDDIR) modules
-- make -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
-+ $(MAKE) -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
- MODULEBUILDDIR=$(MODULEBUILDDIR) postbuild
- endif
-
-diff -ru a/work/vmci-only/Makefile b/work/vmci-only/Makefile
---- a/work/vmci-only/Makefile 2011-01-22 08:59:15.907152002 -0500
-+++ b/work/vmci-only/Makefile 2011-01-22 09:13:55.898936002 -0500
-@@ -123,9 +123,9 @@
- postbuild:: ;
-
- $(DRIVER_KO): prebuild
-- make -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
-+ $(MAKE) -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
- MODULEBUILDDIR=$(MODULEBUILDDIR) modules
-- make -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
-+ $(MAKE) -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
- MODULEBUILDDIR=$(MODULEBUILDDIR) postbuild
- endif
-
-diff -ru a/work/vmmon-only/Makefile b/work/vmmon-only/Makefile
---- a/work/vmmon-only/Makefile 2011-01-22 08:59:15.907152002 -0500
-+++ b/work/vmmon-only/Makefile 2011-01-22 09:13:55.894938002 -0500
-@@ -123,9 +123,9 @@
- postbuild:: ;
-
- $(DRIVER_KO): prebuild
-- make -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
-+ $(MAKE) -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
- MODULEBUILDDIR=$(MODULEBUILDDIR) modules
-- make -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
-+ $(MAKE) -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
- MODULEBUILDDIR=$(MODULEBUILDDIR) postbuild
- endif
-
-diff -ru a/work/vmnet-only/Makefile b/work/vmnet-only/Makefile
---- a/work/vmnet-only/Makefile 2011-01-22 08:59:15.911150002 -0500
-+++ b/work/vmnet-only/Makefile 2011-01-22 09:13:55.898936002 -0500
-@@ -123,9 +123,9 @@
- postbuild:: ;
-
- $(DRIVER_KO): prebuild
-- make -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
-+ $(MAKE) -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
- MODULEBUILDDIR=$(MODULEBUILDDIR) modules
-- make -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
-+ $(MAKE) -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
- MODULEBUILDDIR=$(MODULEBUILDDIR) postbuild
- endif
-
-diff -ru a/work/vsock-only/Makefile b/work/vsock-only/Makefile
---- a/work/vsock-only/Makefile 2011-01-22 08:59:15.911150002 -0500
-+++ b/work/vsock-only/Makefile 2011-01-22 09:13:55.894938002 -0500
-@@ -123,9 +123,9 @@
- postbuild:: ;
-
- $(DRIVER_KO): prebuild
-- make -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
-+ $(MAKE) -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
- MODULEBUILDDIR=$(MODULEBUILDDIR) modules
-- make -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
-+ $(MAKE) -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
- MODULEBUILDDIR=$(MODULEBUILDDIR) postbuild
- endif
-
diff --git a/app-emulation/vmware-modules/files/238-makefile-include.patch b/app-emulation/vmware-modules/files/238-makefile-include.patch
deleted file mode 100644
index 777a3fd8bb6f..000000000000
--- a/app-emulation/vmware-modules/files/238-makefile-include.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/work/vmblock-only/Makefile.kernel b/work/vmblock-only/Makefile.kernel
-index 9d7c5ca..92cefff 100644
---- a/work/vmblock-only/Makefile.kernel
-+++ b/work/vmblock-only/Makefile.kernel
-@@ -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, $(AUTOCONF_DIR)/setnice.c, -DVMW_HAVE_SET_USER_NICE, )
- EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/epoll.c, -DVMW_HAVE_EPOLL, )
-diff --git a/work/vmci-only/Makefile.kernel b/work/vmci-only/Makefile.kernel
-index 22dc232..67e709f 100644
---- a/work/vmci-only/Makefile.kernel
-+++ b/work/vmci-only/Makefile.kernel
-@@ -21,7 +21,7 @@ CC_OPTS += -DVMCI
-
- 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 --git a/work/vmmon-only/Makefile.kernel b/work/vmmon-only/Makefile.kernel
-index a7e26ea..befaca7 100644
---- a/work/vmmon-only/Makefile.kernel
-+++ b/work/vmmon-only/Makefile.kernel
-@@ -22,7 +22,7 @@ CC_OPTS += -DVMMON -DVMCORE
- 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 --git a/work/vmnet-only/Makefile.kernel b/work/vmnet-only/Makefile.kernel
-index 4b16d06..0e252a6 100644
---- a/work/vmnet-only/Makefile.kernel
-+++ b/work/vmnet-only/Makefile.kernel
-@@ -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)/sk_alloc.c,-DVMW_HAVE_SK_ALLOC_WITH_PROTO, )
- EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netdev_has_net.c,-DVMW_NETDEV_HAS_NET, )
-diff --git a/work/vsock-only/Makefile.kernel b/work/vsock-only/Makefile.kernel
-index 47ef5f3..b3539ef 100644
---- a/work/vsock-only/Makefile.kernel
-+++ b/work/vsock-only/Makefile.kernel
-@@ -25,7 +25,7 @@ INCLUDE += -I$(SRCROOT)/include
- 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, $(AUTOCONF_DIR)/epoll.c, -DVMW_HAVE_EPOLL, )
- EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/setnice.c, -DVMW_HAVE_SET_USER_NICE, )
-
diff --git a/app-emulation/vmware-modules/files/238-makefile-kernel-dir.patch b/app-emulation/vmware-modules/files/238-makefile-kernel-dir.patch
deleted file mode 100644
index d4bd6d12fed0..000000000000
--- a/app-emulation/vmware-modules/files/238-makefile-kernel-dir.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff --git a/work/vmblock-only/Makefile b/work/vmblock-only/Makefile
-index 0bd0e74..27c3ede 100644
---- a/work/vmblock-only/Makefile
-+++ b/work/vmblock-only/Makefile
-@@ -46,9 +46,9 @@ endif
- 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 := tools
-diff --git a/work/vmci-only/Makefile b/work/vmci-only/Makefile
-index 7babb8a..fbc5878 100644
---- a/work/vmci-only/Makefile
-+++ b/work/vmci-only/Makefile
-@@ -46,9 +46,9 @@ endif
- 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/work/vmmon-only/Makefile b/work/vmmon-only/Makefile
-index 4b4eb3e..1bb35ef 100644
---- a/work/vmmon-only/Makefile
-+++ b/work/vmmon-only/Makefile
-@@ -46,9 +46,9 @@ endif
- 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/work/vmnet-only/Makefile b/work/vmnet-only/Makefile
-index 06856e7..fd53bf8 100644
---- a/work/vmnet-only/Makefile
-+++ b/work/vmnet-only/Makefile
-@@ -46,9 +46,9 @@ endif
- 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/work/vsock-only/Makefile b/work/vsock-only/Makefile
-index e02adb0..210e502 100644
---- a/work/vsock-only/Makefile
-+++ b/work/vsock-only/Makefile
-@@ -46,9 +46,9 @@ endif
- 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/238-netdevice.patch b/app-emulation/vmware-modules/files/238-netdevice.patch
deleted file mode 100644
index 35231a3205e3..000000000000
--- a/app-emulation/vmware-modules/files/238-netdevice.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/vmnet-only/compat_netdevice.h b/vmnet-only/compat_netdevice.h
-index 7a56304..9ff4548 100644
---- a/vmnet-only/compat_netdevice.h
-+++ b/vmnet-only/compat_netdevice.h
-@@ -47,6 +47,19 @@
- # define net_device device
- #endif
-
-+/* it looks like these have been removed from the kernel 3.1
-+ * probably because the "transition" is considered complete.
-+ * so to keep this source compatible we just redefine them like they were
-+ * previously
-+ */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0)
-+#define HAVE_ALLOC_NETDEV /* feature macro: alloc_xxxdev
-+ functions are available. */
-+#define HAVE_FREE_NETDEV /* free_netdev() */
-+#define HAVE_NETDEV_PRIV /* netdev_priv() */
-+#define HAVE_NETIF_QUEUE
-+#define HAVE_NET_DEVICE_OPS
-+#endif
-
- /*
- * SET_MODULE_OWNER appeared sometime during 2.3.x. It was setting
diff --git a/app-emulation/vmware-modules/files/238-sema.patch b/app-emulation/vmware-modules/files/238-sema.patch
deleted file mode 100644
index 1ebdab7ee009..000000000000
--- a/app-emulation/vmware-modules/files/238-sema.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff -ru original//vmci-only/include/compat_semaphore.h patched//vmci-only/include/compat_semaphore.h
---- original//vmci-only/include/compat_semaphore.h 2010-11-11 15:37:25.000000000 -0500
-+++ patched//vmci-only/include/compat_semaphore.h 2010-11-20 10:11:56.000000000 -0500
-@@ -28,7 +28,7 @@
- #endif
-
-
--#if defined CONFIG_PREEMPT_RT && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)
-+#if (defined CONFIG_PREEMPT_RT && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)) || LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
- /*
- * The -rt patch series changes the name of semaphore/mutex initialization
- * routines (across the entire kernel). Probably to identify locations that
-@@ -41,7 +41,7 @@
- #define DECLARE_MUTEX(_m) DEFINE_SEMAPHORE(_m)
- #endif
- #ifndef init_MUTEX
-- #define init_MUTEX(_m) semaphore_init(_m)
-+ #define init_MUTEX(_m) sema_init(_m,1)
- #endif
- #endif
-
-diff -ru original//vmmon-only/linux/driver.c patched//vmmon-only/linux/driver.c
---- original//vmmon-only/linux/driver.c 2010-11-11 15:37:22.000000000 -0500
-+++ patched//vmmon-only/linux/driver.c 2010-11-29 23:09:16.000000000 -0500
-@@ -145,7 +145,7 @@
- #endif
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) && \
- (defined(CONFIG_SMP) || defined(CONFIG_PREEMPT))
--# define kernel_locked_by_current() kernel_locked()
-+# define kernel_locked_by_current() (current->lock_depth >= 0)
- #else
- # define kernel_locked_by_current() 0
- #endif
-@@ -170,6 +170,7 @@
- static int LinuxDriver_Ioctl(struct inode *inode, struct file *filp,
- u_int iocmd, unsigned long ioarg);
- #if defined(HAVE_UNLOCKED_IOCTL) || defined(HAVE_COMPAT_IOCTL)
-+#define VMW_HAVE_UNLOCKED_IOCTL
- static long LinuxDriver_UnlockedIoctl(struct file *filp,
- u_int iocmd, unsigned long ioarg);
- #endif
-diff -ru original//vmnet-only/compat_semaphore.h patched//vmnet-only/compat_semaphore.h
---- original//vmnet-only/compat_semaphore.h 2010-11-11 15:37:23.000000000 -0500
-+++ patched//vmnet-only/compat_semaphore.h 2010-11-20 10:11:56.000000000 -0500
-@@ -28,7 +28,7 @@
- #endif
-
-
--#if defined CONFIG_PREEMPT_RT && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)
-+#if (defined CONFIG_PREEMPT_RT && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)) || LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
- /*
- * The -rt patch series changes the name of semaphore/mutex initialization
- * routines (across the entire kernel). Probably to identify locations that
-@@ -41,7 +41,7 @@
- #define DECLARE_MUTEX(_m) DEFINE_SEMAPHORE(_m)
- #endif
- #ifndef init_MUTEX
-- #define init_MUTEX(_m) semaphore_init(_m)
-+ #define init_MUTEX(_m) sema_init(_m,1)
- #endif
- #endif
-
-diff -ru original//vsock-only/shared/compat_semaphore.h patched//vsock-only/shared/compat_semaphore.h
---- original//vsock-only/shared/compat_semaphore.h 2010-11-11 13:04:44.000000000 -0500
-+++ patched//vsock-only/shared/compat_semaphore.h 2010-11-20 10:11:56.000000000 -0500
-@@ -28,7 +28,7 @@
- #endif
-
-
--#if defined CONFIG_PREEMPT_RT && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)
-+#if (defined CONFIG_PREEMPT_RT && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)) || LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
- /*
- * The -rt patch series changes the name of semaphore/mutex initialization
- * routines (across the entire kernel). Probably to identify locations that
-@@ -41,7 +41,7 @@
- #define DECLARE_MUTEX(_m) DEFINE_SEMAPHORE(_m)
- #endif
- #ifndef init_MUTEX
-- #define init_MUTEX(_m) semaphore_init(_m)
-+ #define init_MUTEX(_m) sema_init(_m,1)
- #endif
- #endif
-
diff --git a/app-emulation/vmware-modules/files/238-unlocked_ioctl.patch b/app-emulation/vmware-modules/files/238-unlocked_ioctl.patch
deleted file mode 100644
index 3f1cd030c425..000000000000
--- a/app-emulation/vmware-modules/files/238-unlocked_ioctl.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/vmmon-only/linux/driver.c b/vmmon-only/linux/driver.c
-index 1a0e753..089aba3 100644
---- a/vmmon-only/linux/driver.c
-+++ b/vmmon-only/linux/driver.c
-@@ -170,6 +170,7 @@ static int LinuxDriver_Open(struct inode *inode, struct file *filp);
- static int LinuxDriver_Ioctl(struct inode *inode, struct file *filp,
- u_int iocmd, unsigned long ioarg);
- #if defined(HAVE_UNLOCKED_IOCTL) || defined(HAVE_COMPAT_IOCTL)
-+#define VMW_HAVE_UNLOCKED_IOCTL
- static long LinuxDriver_UnlockedIoctl(struct file *filp,
- u_int iocmd, unsigned long ioarg);
- #endif
-diff --git a/vmmon-only/linux/hostif.c b/vmmon-only/linux/hostif.c
-index 5847323..9042b97 100644
---- a/vmmon-only/linux/hostif.c
-+++ b/vmmon-only/linux/hostif.c
-@@ -3702,7 +3702,7 @@ HostIFDoIoctl(struct file *filp,
- if (filp->f_op->unlocked_ioctl) {
- return filp->f_op->unlocked_ioctl(filp, iocmd, ioarg);
- }
--#endif
-+#else
- if (filp->f_op->ioctl) {
- long err;
-
-@@ -3712,6 +3712,7 @@ HostIFDoIoctl(struct file *filp,
-
- return err;
- }
-+#endif
-
- return -ENOIOCTLCMD;
- }
diff --git a/app-emulation/vmware-modules/vmware-modules-238.6.ebuild b/app-emulation/vmware-modules/vmware-modules-238.6.ebuild
deleted file mode 100644
index 599ffed04757..000000000000
--- a/app-emulation/vmware-modules/vmware-modules-238.6.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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-238.6.ebuild,v 1.3 2013/06/21 20:44:01 dilfridge Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic linux-info linux-mod user versionator udev
-
-PV_MAJOR=$(get_major_version)
-PV_MINOR=$(get_version_component_range 2)
-
-DESCRIPTION="VMware kernel modules"
-HOMEPAGE="http://www.vmware.com/"
-
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- || ( =app-emulation/vmware-player-3.1.${PV_MINOR}*
- =app-emulation/vmware-workstation-7.1.${PV_MINOR}* )"
-
-S=${WORKDIR}
-
-pkg_setup() {
- CONFIG_CHECK="~HIGH_RES_TIMERS"
- if kernel_is ge 2 6 37 && kernel_is lt 2 6 39; then
- CONFIG_CHECK="${CONFIG_CHECK} BKL"
- fi
-
- linux-info_pkg_setup
-
- linux-mod_pkg_setup
-
- VMWARE_GROUP=${VMWARE_GROUP:-vmware}
-
- VMWARE_MODULE_LIST="vmblock vmci vmmon vmnet vsock"
- VMWARE_MOD_DIR="${PN}-${PVR}"
-
- BUILD_TARGETS="auto-build KERNEL_DIR=${KERNEL_DIR} KBUILD_OUTPUT=${KV_OUT_DIR}"
-
- enewgroup "${VMWARE_GROUP}"
- filter-flags -mfpmath=sse
-
- for mod in ${VMWARE_MODULE_LIST}; do
- MODULE_NAMES="${MODULE_NAMES} ${mod}(misc:${S}/${mod}-only)"
- done
-}
-
-src_unpack() {
- cd "${S}"
- for mod in ${VMWARE_MODULE_LIST}; do
- tar -xf /opt/vmware/lib/vmware/modules/source/${mod}.tar
- done
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PV_MAJOR}-makefile-kernel-dir.patch"
- epatch "${FILESDIR}/${PV_MAJOR}-makefile-include.patch"
- epatch "${FILESDIR}/${PV_MAJOR}-jobserver.patch"
- kernel_is ge 2 6 37 && epatch "${FILESDIR}/${PV_MAJOR}-sema.patch"
- kernel_is ge 2 6 39 && epatch "${FILESDIR}/${PV_MAJOR}-2.6.39.patch"
- epatch "${FILESDIR}/${PV_MAJOR}-netdevice.patch"
- epatch "${FILESDIR}/${PV_MAJOR}-3.2.0.patch"
- epatch "${FILESDIR}/${PV_MAJOR}-d-make-root.patch"
-
- # Allow user patches so they can support RC kernels and whatever else
- epatch_user
-}
-
-src_install() {
- linux-mod_src_install
- local udevrules="${T}/60-vmware.rules"
- cat > "${udevrules}" <<-EOF
- KERNEL=="vmci", GROUP="vmware", MODE=660
- KERNEL=="vmmon", GROUP="vmware", MODE=660
- KERNEL=="vsock", GROUP="vmware", MODE=660
- EOF
- udev_dorules "${udevrules}"
-}
diff --git a/app-emulation/vmware-workstation/ChangeLog b/app-emulation/vmware-workstation/ChangeLog
index 1c01515cc469..b9f526eff1e3 100644
--- a/app-emulation/vmware-workstation/ChangeLog
+++ b/app-emulation/vmware-workstation/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-emulation/vmware-workstation
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.247 2013/10/19 11:38:38 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.248 2013/10/22 21:19:50 dilfridge Exp $
+
+ 22 Oct 2013; Andreas K. Huettel <dilfridge@gentoo.org> -files/vmware-7.0.rc,
+ -vmware-workstation-7.1.6.744570.ebuild,
+ -vmware-workstation-9.0.2.1031769.ebuild:
+ Drop old
*vmware-workstation-10.0.0.1295980 (19 Oct 2013)
diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
index 64fc07fff1ad..f32a2994ddab 100644
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@@ -5,7 +5,6 @@ AUX configure-hostd.sh 372 SHA256 072604b18a4122d72004caa33fee4e5a8624f37c6c4a32
AUX list-bundle-components.xsl 470 SHA256 4fe6b25ecbb99b3a4f15cbb8de41be466ff545f8e9fa1110d62ca0cf24e72395 SHA512 7e1a186e9e40df09f3fdee413e67a5377d04c25f92b807a7800929cb7d585aeb0d5d3869997a409d35ff8dcd0334255d1e33d32e1a78d7ba9876f99b0f8647ae WHIRLPOOL 9b6a0a79e4ecdfe5bdf40eabbeb37d5d69aa34559d5507a6e9350b6978617fb7ccc684fbfd2516f3c591ed76e68acea30872bf74f4d8ad7eff50fafd4f16048c
AUX list-component-files.xsl 545 SHA256 6682c07630ef4586016776e065018f8695a790c5297408597b1ae24692fab629 SHA512 e3e4e7bf4eac86e614d0363d47e1a0587d3d735a3542dd830304c12b4de822f12f2f9f10cb6c5a128db2112721491f0317a0080a2c8cfd31acdbcda70061b260 WHIRLPOOL b05c186e9d98b51b02d8f068e5b8ae55765a22a2baa046bdd790045a2dade3be9f005f8d342eb914d541dba661d723dcff3e462908c1caea02fd95c802a83a84
AUX vmware-10.0.rc 896 SHA256 5ecf61dcbdfd0bf235e5cff37d411fa7b07ddd7507d0704323af0e6f8e933445 SHA512 48f3926aca508e3a73c7e80cb3c76c63106834c415045e790ad2c9e04f0d4fea192ebb841d0fa83403c1464e4aa58db597534fdd27c1441c89929f5d50ac43bc WHIRLPOOL 66befaa831645a7808424a52cb8b50a84aeabf621f89e6a96c899404e3c77e6f56610395827cf40674a2a25fc5eb970961034bdbffe350dbccea67ee73fc8921
-AUX vmware-7.0.rc 892 SHA256 7fcb4e2a221dbe26116597cd53c5b78f8fa27faaadebc942ba66f7b6d819517c SHA512 36f7a848ac0ca1802089d687bf23600b169e07d11e2a4828a92d9065850d308e4111ade029d6f5e7e8dbebb6c363a05139caef9ab49636758151e6b6bc7cc440 WHIRLPOOL d1299f592ba3644f88090c5bbedffaaad1994c7c049ab921e13c9d7094af3ca583cf5ece8c1debe32ccb424e2ca6d834179c8bef9d28164d6ca0dc9ad7284731
AUX vmware-8.0.rc 892 SHA256 3462430c17d53112f1b4050829a2e3ce664275ab26573d6c1d7505a5a0a55f53 SHA512 a05500982892336e726c11b7b1ad61cbe80a8ee7baef9c0984091a5ebf078b46c185de1ed47a0db53441b74356f64da6c1ebefa8322ba3cd610848b870fadc2d WHIRLPOOL 501480023227e2943fe36bfb8c3b875de69bf382643ea37172a60b8c969420eddb18ad0e6363cefc5d1039bb1cacb208e1b9345df7a64498660fe4f910eaca2e
AUX vmware-9.0.rc 892 SHA256 28fe67276cbee3cbbc76c70ade6460b11f50c042fe9cd77a186b38d68dd7be9f SHA512 098758c2aa8617741b160831c4745900a33b693f3e4d90832fd22f7cb4244416463a5151444b6a119036bd90ebb2a0f760dd8c5a82ace2f0be422a1d8cd6e9ac WHIRLPOOL 377745ba75ca193b8d15463f9c41a15d1040599c9a7a8471e2c08aeb5040863a59b6b22b9b07af619a4ee923b5328397bc41d5e2726a2f0a7d6d776ac1573011
AUX vmware-player.desktop 599 SHA256 b967f2e6dba531613498a2dea130f557fc366e869876aa63ba3ae97f5ff59c54 SHA512 9dc8b41dc94ebeaec8e6c476a893443d36806df21d877ee2a667efec9558f393b2c21fa647180bb67da20cf906c5e6a106df114e5f224725397f04ebffa67273 WHIRLPOOL 4579b6fd704a5add0d0eb32f72571fb64e5a54b584d39664a9e1e3c11c979ec1e0b41cfe079d17e9d8a4d2e0aa9c8294e06fec68faf9fe27d078ad948f8b799f
@@ -15,36 +14,32 @@ AUX vmware-server-9.0.rc 1686 SHA256 2c92bf5ea701ac2e844431d22cefd82a07b9a54645b
AUX vmware-workstation.desktop 605 SHA256 ae2f572200a16a1e1222e282268ae138588c0e7576045a584c1d17f54f379f3e SHA512 7cebb97a4e0d4fc6804d7e6535ae01ff036b94fa4d2458986ad6b18d1637686e83e4779efbb57c708f0309de60b8bf64afac48d89ea5dc1d155e544307b26228 WHIRLPOOL ed0b481cdb2bb6ee3c586cc757b5167abf7ba2b9f29e47af49aa34d162132309eb261bdabf94366ec3a459d2d9b46ee0f7cda1c0d290798435143e7bb255e9f2
DIST VMware-Workstation-10.0.0-1295980.i386.bundle.tar 282490880 SHA256 51a085502cf8c2afda111fca0d01465939d1f3e56139465baa62c60fe7411198 SHA512 33d3cc5990bc403829129a6730efbef4427fb0da92e4b6161dae7f408892f9282c79fa694a24e9179a7fcf687d2fbd8278f8176ff43eba15c22647a3352466fe WHIRLPOOL b70e361113a35725d9e9fad1379bbba012941ea2ba8ee568954192d3a90a3486ad8de97d4cc483b5a46d64bc8bf9b3dd75ef314b01bdc45c99af3d18381ff1f1
DIST VMware-Workstation-10.0.0-1295980.x86_64.bundle.tar 253061120 SHA256 adcd30b81f7825ac41a10246105c38953177ad98195589c47f46b4313ed625e3 SHA512 5fa16700d02899821cd2533e4032dfaaf7b0066bd87af2a4c219eb72afa45833785054112d589b90e7e5665d24ae08cc484380966fa687cc5517fcf830e29d09 WHIRLPOOL 40bc90959022b8251828e6fb05093c601bb5a1afaed79ac54c5e2a4dfb061f49fc88dd3f885c1063ac2e8f7790e164ab146dea71a4f05d7a19556f4ce3dd218b
-DIST VMware-Workstation-7.1.6-744570.i386.bundle 130391795 SHA256 fbeadabe7c0929a10f144dc82e37afc73bbd60bedf299bb2c6142dda379ad5b4 SHA512 c57148f0ef7041bdadf46668aaddd0315134185103706dc23815bf3ebe4f2389a9387c63d0caf3fb0e1baf236320c633264e473439b2e00eb26c11d489e6af0a WHIRLPOOL e631ccb14424d5165fc2f9bbe7d910e60c06ed3f4c5fbddbbf5b4bc66153a84927a3779359f3d07b258a59766ff9d063585e1ecc70dc4d107c073bf529541dbf
-DIST VMware-Workstation-7.1.6-744570.x86_64.bundle 137422513 SHA256 1a0694349393ce326f62c291d76c1c5e8d5473b49bf986476e1485df422a2f8f SHA512 df72b0c770f9e356efd1bbffe2c596909f193bc2100a015cfbab819fea017ee735fcc932180c0cc5ffbe8223fa66a06dcd35e34d183b06f71c7ba937c440e2fd WHIRLPOOL e7b50e706b88e30801ccaeaedf59f5fbdf06342d8566a65b3cb19ec2c433da52768b55f9e5e58e274071c284d38280e0635f8a9c3fd2d01f53037c1082d15af3
DIST VMware-Workstation-8.0.5-893925.i386.bundle.tar 188180480 SHA256 79033aa837a1b2fcf1229c407b159586152d41f3c624ae1745264443bad06a90 SHA512 2ea55d6ba1b64ee33ca73af46ce4ba58be441ecb973e4f9e3711b7d516b1d6233ee8e125c0d90226169258a5bbccf73f67ea593a1eaa48e7368275f545db3306 WHIRLPOOL 270b37814ee4c19bbe3e1d573016cf1899a90dc1c3500181eeb336220eebde276fb11bb4e46d3121a8e1517f749fe9a127eb76f642938d7b8e8f22ae3fbed556
DIST VMware-Workstation-8.0.5-893925.x86_64.bundle.tar 187729920 SHA256 39010a8b712c9e9ea86f0bf32b1ad86a7788748f00292f344b1bdea899a6ac0d SHA512 010cbe7a6ffa6cd07b6daab8534c4da260aae17a6c7988e74792aa450f266bea306cca49820a65dfb3e0b76e912a5430fe98f4f0446f750fe26b867cfe2ed48d WHIRLPOOL dbf6994fbf87b3eca0fe882075dbdd68de599c7b699e609a43d3bade5e23704158ef11a13dea12b41c2c3c7d57ba493e324b4ebf2b138c9cf5835699ba76ae55
DIST VMware-Workstation-9.0.2-1031769.i386.bundle.tar 264898560 SHA256 f23efa3db418790cffa38a90639edd0f5e0834fa98c69a3146489cc3774a71c7 SHA512 ea38c747e236e3a5ae3da809f22a997044c3306239afbc2cc28dfd04f3589dc23e35295bcb5dfb7f5ea687a908b790fb56afa062b7a5cea523c8645d94d652b0 WHIRLPOOL 18aaed121c973911d00a89790b98c8b22b942d29a3580181e7937fe27882d4cd30b2e0a7c13d22129c2e72c7cbce87cff0c80f32e6726d25cf67ec159506db46
DIST VMware-Workstation-9.0.2-1031769.x86_64.bundle.tar 232693760 SHA256 53e175340086f8be2a9cf6c272fe1f8721aa06ed227a2c880a23323c4c491ee3 SHA512 2b11078e96826eaf8b83053fa091d9b7799810fdd93ef730f9732876f29a1d989728cd94c0dafb9f27e9e006c8930bb7546ca1b8bb9390a7c5d62b8ff507f5b4 WHIRLPOOL 37dc8d6cd17c8580f360d180b8fff160204d57afbfb74cc34ffb900766b9d362ebf809383a99478a586dcb9da41594d80880e9e84cb5e17433521c7f90196a4f
DIST gentoo-01.tar.gz 1884 SHA256 e92c694865f1b29f4d7a39efa1dd87bc71dc5f922573f00a3d31ee8e27a8c335 SHA512 454ab93997781bd0a9accddb2ac7bb446f07ea7cddef5640369025c30e03592e14869e0f0f7b4457db2f1ada31c98051426016c86201afa8bc8e3aa4ccc2f875 WHIRLPOOL 9202583b617532ab2612b384da307218e7c93c2962f0d233e28bea066b07163c9bc51c0a599309f9d703c5575ebeb292d787716225624dc1c2fdff3c44fa3513
EBUILD vmware-workstation-10.0.0.1295980.ebuild 14232 SHA256 96840920990d48c9054ad7ab26e5f5ee974a51231772053e2ee6951b85c63a51 SHA512 20c55db9b0be82ba928542a4077bb273098b5549987e589acbae0307a694642d3ae2bbe18dcb40622abf840b40b77a1ff832ccc8f32def6dd05398d0177fcf20 WHIRLPOOL 7ee7410924413b03ce4bbfdf10be06ee3326107e2151e9b5fc6defd2f95f45aade9c2db9e7ba9d7c8159f0f0acbd84440ea7cf4a23bb9e7b08906c17e5faf300
-EBUILD vmware-workstation-7.1.6.744570.ebuild 8346 SHA256 3dd32ca812b6d1b210d35d49b73d3610884878bf31cc53bc4bfa9427eb9af13e SHA512 139d6d726b7afd87eb4bc7b6a8ca9a26e120c760b17eb2c02e0f775b388a973f8bad9724f266b57d3e0c1310a26a291e73dd13cb98bfb7fe5f288a55d3e55460 WHIRLPOOL 99656df5e5d8378a7319382f4c60946eda79b5312cccf7b31afc43dc1a24b8412060707b03d0b52906cf97493f5165c0f7c113e9abf4525650144c22397946df
EBUILD vmware-workstation-8.0.5.893925.ebuild 13495 SHA256 34939d7d405fdc0a078518e9a85da363ec7a1b6103bd1bc0605e2e9b2d687ddb SHA512 bfa8c637a02b20211fd87fa86867531a20427b82f09e34b1dc9e7abf2b2e547c0070e4881ac31b774d310a2b9c270b39f324064137ea078d0ebdb73fbddfce2f WHIRLPOOL 15baad019c6617e462eed8a0cbb19d9664dacdd12ddae1a81e8c32d253b60d5e9912c10220fd9a1df9ff0f3ac5647a15cc0b441e6b6171b050fa5142abdd4942
EBUILD vmware-workstation-9.0.2.1031769-r1.ebuild 14220 SHA256 8242820c197de40a07b5b06b5c80ad7dd29981d38933982e12bd3f4e9ae4f4de SHA512 2c5d23e70571a6a3d86014495c34a202bdf4fa62ca9c9f9676e25cd5ab80fa953a7e131e26fb3cb0d3f39739f443bb33cadbfa14d1bc69dc0d3d77247f189388 WHIRLPOOL 63e03068e35f8fc9325f5033528780ba315cf554c2aec3f1a7ff77f05818a2f3c2816a18042a66f09ea9351385ae86c4a519e00b9b38fbc46d11ed8c1be280c7
-EBUILD vmware-workstation-9.0.2.1031769.ebuild 13910 SHA256 101b97edc8df6ce469e49c0b1a80ee803b502b96de659ce040cd67185f15ccf6 SHA512 dbc924d08f1705f7313cf749a3356d43f35ac10f6d2c3f9e3fad909a2da7d81c1cd11de657971381d355addeef99e67bd8252218e4de0be216fd0282f7e3a6ad WHIRLPOOL 207b27442442cc515a870f7e371ea031315560afce75b3cf7d09a4fce2611df078f74988c912568f760bf56cf62c6560e575ad4189b25c636f24b110a9ad7d23
-MISC ChangeLog 42694 SHA256 570478290a3cc63b90e4acdf1385381cb9857063b801695beede015c92909098 SHA512 3165b153d2544cc3180755c97e20cd9d8e0ff17ad42b9892b631867b72025f41da1854f983e3399110c8005dc3b8e9598873a1d5cad5d6fe0189e281500c4110 WHIRLPOOL 815c14d52e9d9613b6305e6828c9e9f24d347e1fd1305206587a0f95a24094c0ae14704a6b0c5736f21c9377503ac7fde4a9dbbb081e0fb7b7bc5405298fd817
+MISC ChangeLog 42872 SHA256 52d00bcf95f95f41df26db74c812aea0d7847bf40a664ebe055e3355a52c18ed SHA512 398a0f6b1af6e7ad29b6ccfe4cc7c9cfab1dd05e2b8c4b64631f897ed400cceefe69b41a3885ecc8a7a5fd74fdde0f076d9ce2264fa47b8c40856fceddfcc87f WHIRLPOOL a527db862ad48dcac95bcd38a0b650817b3b9d61aa57f9f26bd92fe49702747a36f25e5e90ddf2f603f10b5faaa42aa9d9ea8548892b6ea20095b300f5ad969f
MISC metadata.xml 757 SHA256 299d53409b7bdc264fadde3385e44b378fb1394745f8df5e3847411f0a3f7217 SHA512 6114d20497a28437680b733e501357b401ae31645f189128c450942adc8c0886530d07ebcc1bed93e3b5966c7e79b13eeb79cb68a6f16da130b3761694f94b4f WHIRLPOOL db2983b2e0a2827824c2a78f5e5379cf0481cbd3bc5612c4a43b196f2d22826362fd3d4fdd1f78d15fdd7e98f7acbc7c1f0a7313955cbf69dc502957e4ecddb4
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iQJ8BAEBCABmBQJSYm9MXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJSZuwGXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcXPgP/3b4gGGDR3do9OTNS2VcX0+8
-lKSWekusEbSJRHK4jx0dKzcKiNOUSAdVFucGfcYRgyf3FurGKYbJlxJrEVAdJEk4
-2OKM0WQ/NOa35DyNnJ/3lUYawrExMQTyUtaNsxNiWSNZQUNjJiZisaskdN4wzLPJ
-Q+l6wg1coKAM0A3mBJSAGU6G2ZRuybR/xP0mP+vHgpQzxBxRFyUoJ7TMWK+USEkg
-ebZXSljsBuurRzOVE2CYSLIkNUpMvRsd1bAWfPIPo6FlbqzTDQN9Q9ftKMLxW70R
-KkMubpCzmIRtFdQv7gaudr8DvNEQ1/zBicI6M12oPbOXiOXw/bFj2MOPXIGRvzY6
-a8JWpYuOR9M6ol/U2y7MuxUwQ/8ui+8Nwty/n4pVdaWTqCB5qoy66wIB2wdiTXSU
-xR6woWhp22KWlq7vwAl9IP6UpyjfHXV4vN5ILIGgifk1C0vrQA5lwzVmpd3uS8hS
-px9xW2ZtsQyu6IS6JCJDFzJdfaVSu+wqSnG/6t0aC6+c5nbNWEOOzLF758LKJv9j
-NIId5HeS4t+ktKr9qqb3FjllGUiTslLhD11Fi9AwHQc74k+PuvvW8bqP5ZQ7HFWi
-V9LENYJClL/rpZX8PHEY+8YozBf11wKewu8TKGXnN59VyfiRoU1w89Hx0B/SS2hq
-XJb6oPONS7btHZATHiTb
-=+3iS
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcpkcP/1zeV/VLWODLRoXRnqv2Sup4
+wDQ4PchlWimBDu5T2VkQ8ShfYI/TjaN1zW6DyYR8uUkyrs6202m46lqxlkAeNcBH
+O321Q+3C9Q+H0LCMOJ2oa2TiLHBbV9+4nJNqXuUOAUtg/59/MpLSHw+8VUr33FQH
+0j10CuTIk0i9+QbJsd6lndJQtLZ/4VdAYu6O4kAhukzCqGV+Q9GPCfZaiKxT6I0B
+p/BhiPT1d09aUIIv5I+Nu8JTW0/JTuSt3wu7VFVyBBtEs5oQZ23YU3Fj2FkPUnBU
+M7qksRb1q75X1xq8fCaw6fUbYyjfUbR/j2s796FodB/Gv7pmIML+2Klgmd2DUXGj
+GCnR9du7FrBVhxZ4pSe0bEU7ZqfV1VA/fFj8LMZ8Jsvm5eRz2S79zgRUIPuAbWee
+xjQRq96gj+QU+RA3tZPUVx64KJhZqdEUMaiN1LLE5NBV/4/VzBgQbkxDnYeEEN1N
+us0qthI8ixYOiSRkuaMb9ASDSl6cRk9EgH0z1qnh3Wm1TGhgI/Id+0J4ytqS02KY
+Q0M2+LtsdYnJlKfVi8tizzhg8wG6I/zUIEWjedzY6Kv9VGEKjR2KAr7KB2om1hnI
+5oymcWwO9qzgwajDLJWEjQ+ocb/o8i3FgYFZopK4BkHmC7MygnrmUwVvxVKDcyFG
+6yHr3svdimtmW0rGx9oh
+=E+tU
-----END PGP SIGNATURE-----
diff --git a/app-emulation/vmware-workstation/files/vmware-7.0.rc b/app-emulation/vmware-workstation/files/vmware-7.0.rc
deleted file mode 100644
index 5cbb6e5e3fd9..000000000000
--- a/app-emulation/vmware-workstation/files/vmware-7.0.rc
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/files/vmware-7.0.rc,v 1.1 2011/03/27 15:25:47 vadimk Exp $
-
-depend() {
- need localmount
- use net
-}
-
-start() {
- ebegin Starting VMware USB Arbitrator
- #start-stop-daemon --start --exec @@BINDIR@@/vmware-usbarbitrator
- @@BINDIR@@/vmware-usbarbitrator
- eend $?
- ebegin Starting VMware services
- modprobe -a vmmon vmci vsock vmblock vmnet
- eend $?
- @@BINDIR@@/vmware-networks --start
- eend $?
-}
-
-stop() {
- ebegin Stopping VMware USB Arbitrator
- #start-stop-daemon --stop --exec @@BINDIR@@/vmware-usbarbitrator
- killall --wait @@BINDIR@@/vmware-usbarbitrator
- eend $?
- @@BINDIR@@/vmware-networks --stop
- eend $?
- ebegin Stopping VMware services
- modprobe -r vsock vmci vmmon vmblock vmnet
- eend $?
-}
diff --git a/app-emulation/vmware-workstation/vmware-workstation-7.1.6.744570.ebuild b/app-emulation/vmware-workstation/vmware-workstation-7.1.6.744570.ebuild
deleted file mode 100644
index 29264f5c2bcc..000000000000
--- a/app-emulation/vmware-workstation/vmware-workstation-7.1.6.744570.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-7.1.6.744570.ebuild,v 1.3 2013/06/22 22:44:06 dilfridge Exp $
-
-EAPI="2"
-
-inherit eutils versionator fdo-mime gnome2-utils vmware-bundle
-
-MY_PN="VMware-Workstation"
-MY_PV="$(replace_version_separator 3 - $PV)"
-MY_P="${MY_PN}-${MY_PV}"
-PV_MINOR=$(get_version_component_range 3)
-
-DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
-HOMEPAGE="http://www.vmware.com/products/workstation/"
-SRC_URI="
- x86? ( ${MY_P}.i386.bundle )
- amd64? ( ${MY_P}.x86_64.bundle )
- "
-
-LICENSE="vmware GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="doc vix +vmware-tools"
-RESTRICT="fetch mirror strip"
-
-# vmware-workstation should not use virtual/libc as this is a
-# precompiled binary package thats linked to glibc.
-RDEPEND="dev-cpp/cairomm
- dev-cpp/glibmm:2
- dev-cpp/gtkmm:2.4
- dev-cpp/libgnomecanvasmm
- dev-cpp/libsexymm
- dev-cpp/pangomm
- dev-libs/atk
- dev-libs/glib:2
- dev-libs/libaio
- dev-libs/libsigc++
- dev-libs/libxml2
- =dev-libs/openssl-0.9.8*
- dev-libs/xmlrpc-c
- gnome-base/libgnomecanvas
- gnome-base/libgtop:2
- gnome-base/librsvg:2
- gnome-base/orbit
- media-libs/fontconfig
- media-libs/freetype
- media-libs/libart_lgpl
- =media-libs/libpng-1.2*
- net-misc/curl
- sys-devel/gcc
- sys-fs/fuse
- sys-libs/glibc
- sys-libs/zlib
- x11-libs/cairo
- x11-libs/gtk+:2
- x11-libs/libgksu
- x11-libs/libICE
- x11-libs/libsexy
- x11-libs/libSM
- >=x11-libs/libview-0.6.6
- x11-libs/libX11
- x11-libs/libXau
- x11-libs/libxcb
- x11-libs/libXcomposite
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXdmcp
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXft
- x11-libs/libXi
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXtst
- x11-libs/pango
- x11-libs/startup-notification
- x11-themes/hicolor-icon-theme
- !app-emulation/vmware-server
- !app-emulation/vmware-player"
-PDEPEND="~app-emulation/vmware-modules-238.${PV_MINOR}
- vmware-tools? ( app-emulation/vmware-tools )"
-
-S=${WORKDIR}
-VM_INSTALL_DIR="/opt/vmware"
-
-pkg_nofetch() {
- local bundle
-
- if use x86; then
- bundle="${MY_P}.i386.bundle"
- elif use amd64; then
- bundle="${MY_P}.x86_64.bundle"
- fi
-
- einfo "Please download ${bundle}"
- einfo "from ${HOMEPAGE}"
- einfo "and place it in ${DISTDIR}"
-}
-
-src_unpack() {
- vmware-bundle_extract-bundle-component "${DISTDIR}/${A}" vmware-player-app
- vmware-bundle_extract-bundle-component "${DISTDIR}/${A}" vmware-player-setup
- vmware-bundle_extract-bundle-component "${DISTDIR}/${A}" vmware-workstation
- if use vix; then
- vmware-bundle_extract-bundle-component "${DISTDIR}/${A}" vmware-vix
- fi
-}
-
-src_prepare() {
- rm -rf "${S}"/vmware-player-app/bin/vmware-modconfig
- rm -rf "${S}"/vmware-player-app/lib/modules/binary
-
- # remove superfluous libraries
- ebegin 'Removing superfluous libraries'
- cd vmware-player-app/lib/lib || die
- # exclude OpenSSL from unbundling until the AES-NI patch gets into the tree
- # see http://forums.gentoo.org/viewtopic-t-835867.html
- ldconfig -p | sed 's:^\s\+\([^(]*[^( ]\).*=> /.*$:\1:g;t;d' | fgrep -vx 'libcrypto.so.0.9.8
-libssl.so.0.9.8' | xargs -d'\n' -r rm -rf
- cd ../../../vmware-workstation/lib/lib || die
- ldconfig -p | sed 's:^\s\+\([^(]*[^( ]\).*=> /.*$:\1:g;t;d' | fgrep -vx 'libcrypto.so.0.9.8
-libssl.so.0.9.8' | xargs -d'\n' -r rm -rf
- eend
-}
-
-src_install() {
- local major_minor_revision=$(get_version_component_range 1-3 "${PV}")
- local build=$(get_version_component_range 4 "${PV}")
-
- cd "${S}"/vmware-player-app
-
- # install the binaries
- into "${VM_INSTALL_DIR}"
- dobin bin/*
- dosbin sbin/*
-
- # install the libraries
- insinto "${VM_INSTALL_DIR}"/lib/vmware
- doins -r lib/*
-
- # install the ancillaries
- insinto /usr
- doins -r share
-
- # commented out until Portage gets OpenSSL 0.9.8 with AES-NI support
- # see http://forums.gentoo.org/viewtopic-t-835867.html
- ## these two libraries do not like to load from /usr/lib*
- #local each ; for each in libcrypto.so.0.9.8 libssl.so.0.9.8 ; do
- # if [[ ! -f "${VM_INSTALL_DIR}/lib/vmware/lib/${each}" ]] ; then
- # dosym "/usr/$(get_libdir)/${each}" \
- # "${VM_INSTALL_DIR}/lib/vmware/lib/${each}/${each}"
- # fi
- #done
-
- # install vmware-config
- cd "${S}"/vmware-player-setup
- insinto "${VM_INSTALL_DIR}"/lib/vmware/setup
- doins vmware-config
-
- # install vmware-workstation
- cd "${S}"/vmware-workstation
-
- # install the binaries
- into "${VM_INSTALL_DIR}"
- dobin bin/*
-
- # install the libraries
- insinto "${VM_INSTALL_DIR}"/lib/vmware
- doins -r lib/*
-
- # install the ancillaries
- insinto /usr
- doins -r share
-
- # install documentation
- doman man/man1/vmware.1.gz
-
- if use doc; then
- dodoc doc/open_source_licenses.txt
- dodoc doc/vmware-vmci/samples/*
- fi
-
- # install vmware-vix
- if use vix; then
- cd "${S}"/vmware-vix
-
- # install the binary
- into "${VM_INSTALL_DIR}"
- dobin bin/*
-
- # install the libraries
- insinto "${VM_INSTALL_DIR}"/lib/vmware-vix
- doins -r lib/*
-
- dosym vmware-vix/libvixAllProducts.so "${VM_INSTALL_DIR}"/lib/libbvixAllProducts.so
-
- # install headers
- insinto /usr/include/vmware-vix
- doins include/*
-
- if use doc; then
- dohtml -r doc/*
- fi
- fi
-
- # create symlinks for the various tools
- local tool ; for tool in vmware vmplayer{,-daemon} \
- vmware-{acetool,gksu,fuseUI,modconfig{,-console},netcfg,tray,unity-helper} ; do
- dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}"
- done
- dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer "${VM_INSTALL_DIR}"/bin/vmplayer
- dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware "${VM_INSTALL_DIR}"/bin/vmware
-
- # fix up permissions
- chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware/{bin/*,lib/wrapper-gtk24.sh,setup/*}
- chmod 04711 "${D}${VM_INSTALL_DIR}"/sbin/vmware-authd
- chmod 04711 "${D}${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx*
- if use vix; then
- chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware-vix/setup/*
- fi
-
- # create the environment
- local envd="${T}/90vmware"
- cat > "${envd}" <<-EOF
- PATH='${VM_INSTALL_DIR}/bin'
- ROOTPATH='${VM_INSTALL_DIR}/bin'
- EOF
- doenvd "${envd}"
-
- # create the configuration
- dodir /etc/vmware
-
- cat > "${D}"/etc/vmware/bootstrap <<-EOF
- BINDIR='${VM_INSTALL_DIR}/bin'
- LIBDIR='${VM_INSTALL_DIR}/lib'
- EOF
-
- cat > "${D}"/etc/vmware/config <<-EOF
- bindir = "${VM_INSTALL_DIR}/bin"
- libdir = "${VM_INSTALL_DIR}/lib/vmware"
- initscriptdir = "/etc/init.d"
- authd.fullpath = "${VM_INSTALL_DIR}/sbin/vmware-authd"
- gksu.rootMethod = "su"
- VMCI_CONFED = "yes"
- VMBLOCK_CONFED = "yes"
- VSOCK_CONFED = "yes"
- NETWORKING = "yes"
- player.product.version = "${major_minor_revision}"
- product.buildNumber = "${build}"
- product.name = "VMware Workstation"
- workstation.product.version = "${major_minor_revision}"
- EOF
-
- if use vix; then
- cat >> "${D}"/etc/vmware/config <<-EOF
- vmware.fullpath = "${VM_INSTALL_DIR}/bin/vmware"
- vix.libdir = "${VM_INSTALL_DIR}/lib/vmware-vix"
- vix.config.version = "1"
- EOF
- fi
-
- # install the init.d script
- local initscript="${T}/vmware.rc"
- sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
- "${FILESDIR}/vmware-7.0.rc" > ${initscript}
- newinitd "${initscript}" vmware
-
- # fill in variable placeholders
- sed -e "s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g" \
- -i "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}}
- sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware:g" \
- -i "${D}/usr/share/applications/${PN}.desktop"
- sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \
- -i "${D}/usr/share/applications/vmware-player.desktop"
- sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware-netcfg:g" \
- -i "${D}/usr/share/applications/vmware-netcfg.desktop"
-}
-
-pkg_config() {
- "${VM_INSTALL_DIR}"/bin/vmware-networks --postinstall ${PN},old,new
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-
- ewarn "/etc/env.d was updated. Please run:"
- ewarn "env-update && source /etc/profile"
- ewarn ""
- ewarn "Before you can use vmware-player, you must configure a default network setup."
- ewarn "You can do this by running 'emerge --config ${PN}'."
-}
-
-pkg_prerm() {
- einfo "Stopping ${PN} for safe unmerge"
- /etc/init.d/vmware stop
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-}
diff --git a/app-emulation/vmware-workstation/vmware-workstation-9.0.2.1031769.ebuild b/app-emulation/vmware-workstation/vmware-workstation-9.0.2.1031769.ebuild
deleted file mode 100644
index 031fe78f1b67..000000000000
--- a/app-emulation/vmware-workstation/vmware-workstation-9.0.2.1031769.ebuild
+++ /dev/null
@@ -1,483 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-9.0.2.1031769.ebuild,v 1.2 2013/06/22 22:44:06 dilfridge Exp $
-
-EAPI="4"
-
-inherit eutils versionator fdo-mime gnome2-utils pam vmware-bundle
-
-MY_PN="VMware-Workstation"
-MY_PV=$(get_version_component_range 1-3)
-PV_MINOR=$(get_version_component_range 3)
-PV_BUILD=$(get_version_component_range 4)
-MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}"
-
-DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
-HOMEPAGE="http://www.vmware.com/products/workstation/"
-BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/ws/${MY_PV}/${PV_BUILD}/linux/core/"
-SRC_URI="
- x86? ( ${BASE_URI}${MY_P}.i386.bundle.tar )
- amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar )
- "
-LICENSE="vmware GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="cups doc ovftool server vix vmware-tools"
-RESTRICT="mirror strip"
-
-# vmware-workstation should not use virtual/libc as this is a
-# precompiled binary package thats linked to glibc.
-RDEPEND="dev-cpp/cairomm
- dev-cpp/glibmm:2
- dev-cpp/gtkmm:2.4
- dev-cpp/libgnomecanvasmm
- dev-cpp/pangomm
- dev-libs/atk
- dev-libs/glib:2
- dev-libs/icu
- dev-libs/expat
- dev-libs/libaio
- dev-libs/libsigc++
- dev-libs/libxml2
- =dev-libs/openssl-0.9.8*
- dev-libs/xmlrpc-c
- gnome-base/libgnomecanvas
- gnome-base/libgtop:2
- gnome-base/librsvg:2
- gnome-base/orbit
- media-libs/fontconfig
- media-libs/freetype
- media-libs/libart_lgpl
- =media-libs/libpng-1.2*
- media-libs/libpng
- net-misc/curl
- cups? ( net-print/cups )
- sys-devel/gcc
- sys-fs/fuse
- sys-libs/glibc
- sys-libs/zlib
- x11-libs/cairo
- x11-libs/gtk+:2
- x11-libs/libgksu
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXau
- x11-libs/libxcb
- x11-libs/libXcomposite
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXdmcp
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXft
- x11-libs/libXi
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXtst
- x11-libs/pango
- x11-libs/startup-notification
- x11-themes/hicolor-icon-theme
- !app-emulation/vmware-player"
-PDEPEND="~app-emulation/vmware-modules-271.${PV_MINOR}
- vmware-tools? ( app-emulation/vmware-tools )"
-
-S=${WORKDIR}
-VM_INSTALL_DIR="/opt/vmware"
-VM_DATA_STORE_DIR="/var/lib/vmware/Shared VMs"
-VM_HOSTD_USER="root"
-
-src_unpack() {
- default
- local bundle=${A%.tar}
- local component; for component in \
- vmware-vmx \
- vmware-player-app \
- vmware-player-setup \
- vmware-workstation \
- vmware-network-editor \
- vmware-network-editor-ui \
- vmware-usbarbitrator \
- vmware-vprobe
- do
- vmware-bundle_extract-bundle-component "${bundle}" "${component}" "${S}"
- done
-
- if use server; then
- vmware-bundle_extract-bundle-component "${bundle}" vmware-workstation-server #"${S}"
- fi
-
- if use vix; then
- vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-core vmware-vix
- vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-lib-Workstation900andvSphere510 vmware-vix
- fi
- if use ovftool; then
- vmware-bundle_extract-bundle-component "${bundle}" vmware-ovftool
- fi
-}
-
-src_prepare() {
- rm -f bin/vmware-modconfig
- rm -rf lib/modules/binary
- # Bug 459566
- mv lib/libvmware-netcfg.so lib/lib/
-
- if use server; then
- rm -f vmware-workstation-server/bin/{openssl,configure-hostd.sh}
- fi
-
- find "${S}" -name '*.a' -delete
-
-# clean_bundled_libs
-}
-
-clean_bundled_libs() {
- ebegin 'Removing superfluous libraries'
- cd lib/lib || die
- ldconfig -p | \
- sed 's:^\s\+\([^(]*[^( ]\).*=> /.*$:\1:g;t;d' | \
- fgrep -vx 'libcrypto.so.0.9.8
-libssl.so.0.9.8i
-libgcr.so.0
-libglib-2.0.so.0' |
- xargs -d'\n' -r rm -rf
- eend
-}
-
-src_install() {
- local major_minor=$(get_version_component_range 1-2 "${PV}")
- local major_minor_revision=$(get_version_component_range 1-3 "${PV}")
- local build=$(get_version_component_range 4 "${PV}")
-
- # install the binaries
- into "${VM_INSTALL_DIR}"
- dobin bin/*
-
- # install the libraries
- insinto "${VM_INSTALL_DIR}"/lib/vmware
- doins -r lib/*
-
- # Bug 432918
- dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.0.9.8/libcrypto.so.0.9.8 \
- "${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libcrypto.so.0.9.8
- dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.0.9.8/libssl.so.0.9.8 \
- "${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libssl.so.0.9.8
-
- # install the ancillaries
- insinto /usr
- doins -r share
-
- if use cups; then
- exeinto $(cups-config --serverbin)/filter
- doexe extras/thnucups
-
- insinto /etc/cups
- doins -r etc/cups/*
- fi
-
- insinto /etc/xdg
- doins -r etc/xdg/*
-
- # install documentation
- doman man/man1/vmware.1.gz
-
- if use doc; then
- dodoc doc/*
- fi
-
- insinto "${VM_INSTALL_DIR}"/lib/vmware/setup
- doins vmware-config
-
- # install vmware workstation server
- if use server; then
- dosbin sbin/*
-
- cd "${S}"/vmware-workstation-server
-
- # install binaries
- into "${VM_INSTALL_DIR}"/lib/vmware
- dobin bin/*
-
- dobin "${FILESDIR}"/configure-hostd.sh
-
- dobin "${FILESDIR}"/configure-hostd.sh
-
- # install the libraries
- insinto "${VM_INSTALL_DIR}"/lib/vmware/lib
- doins -r lib/*
-
- into "${VM_INSTALL_DIR}"
- for tool in vmware-{hostd,wssc-adminTool} ; do
- cat > "${T}/${tool}" <<-EOF
- #!/usr/bin/env bash
- set -e
-
- . /etc/vmware/bootstrap
-
- exec "${VM_INSTALL_DIR}/lib/vmware/lib/wrapper-gtk24.sh" \\
- "${VM_INSTALL_DIR}/lib/vmware/lib" \\
- "${VM_INSTALL_DIR}/lib/vmware/bin/${tool}" \\
- "${VM_INSTALL_DIR}/lib/vmware/libconf" "\$@"
- EOF
- dobin "${T}/${tool}"
- done
-
- insinto "${VM_INSTALL_DIR}"/lib/vmware
- doins -r hostd
-
- # create the configuration
- insinto /etc/vmware/hostd
- doins -r config/etc/vmware/hostd/*
- doins -r etc/vmware/hostd/*
-
- insinto /etc/vmware/ssl
- doins etc/vmware/ssl/*
-
- # pam
- pamd_mimic_system vmware-authd auth account
-
- # create directory for shared virtual machines.
- keepdir "${VM_DATA_STORE_DIR}"
- keepdir /var/log/vmware
- fi
-
- # install vmware-vix
- if use vix; then
- cd "${S}"/vmware-vix
-
- # install the binary
- into "${VM_INSTALL_DIR}"
- dobin bin/*
-
- # install the libraries
- insinto "${VM_INSTALL_DIR}"/lib/vmware-vix
- doins -r lib/*
-
- dosym vmware-vix/libvixAllProducts.so "${VM_INSTALL_DIR}"/lib/libbvixAllProducts.so
-
- # install headers
- insinto /usr/include/vmware-vix
- doins include/*
-
- if use doc; then
- dohtml -r doc/*
- fi
- fi
-
- # install ovftool
- if use ovftool; then
- cd "${S}"
-
- insinto "${VM_INSTALL_DIR}"/lib/vmware-ovftool
- doins -r vmware-ovftool/*
-
- chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/{ovftool,ovftool.bin}
- dosym "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/ovftool "${VM_INSTALL_DIR}"/bin/ovftool
- fi
-
- # create symlinks for the various tools
- local tool ; for tool in thnuclnt vmware vmplayer{,-daemon} \
- vmware-{acetool,enter-serial,gksu,fuseUI,modconfig{,-console},netcfg,tray,unity-helper} ; do
- dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}"
- done
- dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer "${VM_INSTALL_DIR}"/bin/vmplayer
- dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware "${VM_INSTALL_DIR}"/bin/vmware
- dosym "${VM_INSTALL_DIR}"/lib/vmware/icu /etc/vmware/icu
-
- # fix permissions
- fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks}
- fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/{wrapper-gtk24.sh,libgksu2.so.0/gksu-run-helper}
- fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/setup/vmware-config
- fperms 4711 "${VM_INSTALL_DIR}"/bin/vmware-mount
- fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats}
- if use server; then
- fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-{hostd,wssc-adminTool}
- fperms 4711 "${VM_INSTALL_DIR}"/sbin/vmware-authd
- fperms 1777 "${VM_DATA_STORE_DIR}"
- fi
- if use vix; then
- fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware-vix/setup/vmware-config
- fi
-
- # create the environment
- local envd="${T}/90vmware"
- cat > "${envd}" <<-EOF
- PATH='${VM_INSTALL_DIR}/bin'
- ROOTPATH='${VM_INSTALL_DIR}/bin'
- EOF
- doenvd "${envd}"
-
- # create the configuration
- dodir /etc/vmware
-
- cat > "${D}"/etc/vmware/bootstrap <<-EOF
- BINDIR='${VM_INSTALL_DIR}/bin'
- LIBDIR='${VM_INSTALL_DIR}/lib'
- EOF
-
- cat > "${D}"/etc/vmware/config <<-EOF
- bindir = "${VM_INSTALL_DIR}/bin"
- libdir = "${VM_INSTALL_DIR}/lib/vmware"
- initscriptdir = "/etc/init.d"
- authd.fullpath = "${VM_INSTALL_DIR}/sbin/vmware-authd"
- gksu.rootMethod = "su"
- VMCI_CONFED = "yes"
- VMBLOCK_CONFED = "yes"
- VSOCK_CONFED = "yes"
- NETWORKING = "yes"
- player.product.version = "${major_minor_revision}"
- product.version = "${major_minor_revision}"
- product.buildNumber = "${build}"
- product.name = "VMware Workstation"
- workstation.product.version = "${major_minor_revision}"
- EOF
-
- if use vix; then
- cat >> "${D}"/etc/vmware/config <<-EOF
- vmware.fullpath = "${VM_INSTALL_DIR}/bin/vmware"
- vix.libdir = "${VM_INSTALL_DIR}/lib/vmware-vix"
- vix.config.version = "1"
- EOF
- fi
-
- if use server; then
- cat >> "${D}"/etc/vmware/config <<-EOF
- authd.client.port = "902"
- authd.proxy.nfc = "vmware-hostd:ha-nfc"
- authd.soapserver = "TRUE"
- EOF
- fi
-
- # install the init.d script
- local initscript="${T}/vmware.rc"
- sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
- "${FILESDIR}/vmware-${major_minor}.rc" > ${initscript}
- newinitd "${initscript}" vmware
-
- if use server; then
- # install the init.d script
- local initscript="${T}/vmware-workstation-server.rc"
- sed -e "s:@@ETCDIR@@:/etc/vmware:g" \
- -e "s:@@PREFIX@@:${VM_INSTALL_DIR}:g" \
- -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
- -e "s:@@LIBDIR@@:${VM_INSTALL_DIR}/lib/vmware:g" \
- "${FILESDIR}/vmware-server-${major_minor}.rc" > ${initscript}
- newinitd "${initscript}" vmware-workstation-server
- fi
-
- # fill in variable placeholders
- sed -e "s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g" \
- -i "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}}
- sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware:g" \
- -e "/^Encoding/d" \
- -i "${D}/usr/share/applications/${PN}.desktop"
- sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \
- -e "/^Encoding/d" \
- -i "${D}/usr/share/applications/vmware-player.desktop"
- sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware-netcfg:g" \
- -e "/^Encoding/d" \
- -i "${D}/usr/share/applications/vmware-netcfg.desktop"
-
- if use server; then
- # Configuration for vmware-workstation-server
- local hostdUser="${VM_HOSTD_USER:-root}"
- sed -e "/ACEDataUser/s:root:${hostdUser}:g" \
- -i "${D}/etc/vmware/hostd/authorization.xml" || die
-
- # Shared VMs Path: [standard].
- sed -e "s:##{DS_NAME}##:standard:g" \
- -e "s:##{DS_PATH}##:${VM_DATA_STORE_DIR}:g" \
- -i "${D}/etc/vmware/hostd/datastores.xml" || die
-
- sed -e "s:##{HTTP_PORT}##:-1:g" \
- -e "s:##{HTTPS_PORT}##:443:g" \
- -e "s:##{PIPE_PREFIX}##:/var/run/vmware/:g" \
- -i "${D}/etc/vmware/hostd/proxy.xml" || die
-
- # See vmware-workstation-server.py for more details.
- sed -e "s:##{BUILD_CFGDIR}##:/etc/vmware/hostd/:g" \
- -e "s:##{CFGALTDIR}##:/etc/vmware/hostd/:g" \
- -e "s:##{CFGDIR}##:/etc/vmware/:g" \
- -e "s:##{ENABLE_AUTH}##:true:g" \
- -e "s:##{HOSTDMODE}##:ws:g" \
- -e "s:##{HOSTD_CFGDIR}##:/etc/vmware/hostd/:g" \
- -e "s:##{HOSTD_MOCKUP}##:false:g" \
- -e "s:##{LIBDIR}##:${VM_INSTALL_DIR}/lib/vmware:g" \
- -e "s:##{LIBDIR_INSTALLED}##:${VM_INSTALL_DIR}/lib/vmware/:g" \
- -e "s:##{LOGDIR}##:/var/log/vmware/:g" \
- -e "s:##{LOGLEVEL}##:verbose:g" \
- -e "s:##{MOCKUP}##:mockup-host-config.xml:g" \
- -e "s:##{PLUGINDIR}##:./:g" \
- -e "s:##{SHLIB_PREFIX}##:lib:g" \
- -e "s:##{SHLIB_SUFFIX}##:.so:g" \
- -e "s:##{USE_BLKLISTSVC}##:false:g" \
- -e "s:##{USE_CBRCSVC}##:false:g" \
- -e "s:##{USE_CIMSVC}##:false:g" \
- -e "s:##{USE_DIRECTORYSVC}##:false:g" \
- -e "s:##{USE_DIRECTORYSVC_MOCKUP}##:false:g" \
- -e "s:##{USE_DYNAMIC_PLUGIN_LOADING}##:false:g" \
- -e "s:##{USE_DYNAMO}##:false:g" \
- -e "s:##{USE_DYNSVC}##:false:g" \
- -e "s:##{USE_GUESTSVC}##:false:g" \
- -e "s:##{USE_HBRSVC}##:false:g" \
- -e "s:##{USE_HBRSVC_MOCKUP}##:false:g" \
- -e "s:##{USE_HOSTSVC_MOCKUP}##:false:g" \
- -e "s:##{USE_HTTPNFCSVC}##:false:g" \
- -e "s:##{USE_HTTPNFCSVC_MOCKUP}##:false:g" \
- -e "s:##{USE_LICENSESVC_MOCKUP}##:false:g" \
- -e "s:##{USE_NFCSVC}##:true:g" \
- -e "s:##{USE_NFCSVC_MOCKUP}##:false:g" \
- -e "s:##{USE_OVFMGRSVC}##:true:g" \
- -e "s:##{USE_PARTITIONSVC}##:false:g" \
- -e "s:##{USE_SECURESOAP}##:false:g" \
- -e "s:##{USE_SNMPSVC}##:false:g" \
- -e "s:##{USE_SOLO_MOCKUP}##:false:g" \
- -e "s:##{USE_STATSSVC_MOCKUP}##:false:g" \
- -e "s:##{USE_VCSVC_MOCKUP}##:false:g" \
- -e "s:##{USE_VDISKSVC}##:false:g" \
- -e "s:##{USE_VDISKSVC_MOCKUP}##:false:g" \
- -e "s:##{USE_VMSVC_MOCKUP}##:false:g" \
- -e "s:##{VM_INVENTORY}##:vmInventory.xml:g" \
- -e "s:##{VM_RESOURCES}##:vmResources.xml:g" \
- -e "s:##{WEBSERVER_PORT_ENTRY}##::g" \
- -e "s:##{WORKINGDIR}##:./:g" \
- -i "${D}/etc/vmware/hostd/config.xml" || die
-
- sed -e "s:##{ENV_LOCATION}##:/etc/vmware/hostd/env/:g" \
- -i "${D}/etc/vmware/hostd/environments.xml" || die
-
- # @@VICLIENT_URL@@=XXX
- sed -e "s:@@AUTHD_PORT@@:902:g" \
- -i "${D}${VM_INSTALL_DIR}/lib/vmware/hostd/docroot/client/clients.xml" || die
- fi
-}
-
-pkg_config() {
- "${VM_INSTALL_DIR}"/bin/vmware-networks --postinstall ${PN},old,new
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-
- ewarn "/etc/env.d was updated. Please run:"
- ewarn "env-update && source /etc/profile"
- ewarn ""
- ewarn "Before you can use vmware workstation, you must configure a default network setup."
- ewarn "You can do this by running 'emerge --config ${PN}'."
-}
-
-pkg_prerm() {
- einfo "Stopping ${PN} for safe unmerge"
- /etc/init.d/vmware stop
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-}