From 7e5435b12327e9cd8aae800b35f091328b52bcf6 Mon Sep 17 00:00:00 2001 From: geos_one Date: Tue, 4 Jan 2011 13:21:44 +0000 Subject: [PATCH] app-emulation/vmware-workstation: use my modules (Portage version: 2.2.0_alpha10-r1/svn/Linux x86_64, RepoMan options: --force) git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/vmware@2798 6952d904-891a-0410-993b-d76249ca496b --- app-emulation/vmware-workstation/ChangeLog | 23 ++- app-emulation/vmware-workstation/Manifest | 27 ++- .../vmware-player-extras.py.patch | 14 ++ .../files/6.5.4.246459/vmware-player.py.patch | 64 +++++++ .../files/6.5.4.246459/vmware-vix.py.patch | 14 ++ .../6.5.4.246459/vmware-workstation.py.patch | 23 +++ .../vmware-player-extras.py.patch | 14 ++ .../files/6.5.5.328052/vmware-player.py.patch | 64 +++++++ .../files/6.5.5.328052/vmware-vix.py.patch | 14 ++ .../6.5.5.328052/vmware-workstation.py.patch | 23 +++ ...e-workstation-6.5.4.246459-installer.patch | 64 +++++++ ...e-workstation-6.5.5.328052-installer.patch | 64 +++++++ app-emulation/vmware-workstation/metadata.xml | 3 - .../vmware-workstation-5.5.9.126128.ebuild | 14 +- .../vmware-workstation-6.5.3.185404.ebuild | 5 +- ...=> vmware-workstation-6.5.4.246459.ebuild} | 17 +- .../vmware-workstation-6.5.5.328052.ebuild | 175 ++++++++++++++++++ 17 files changed, 592 insertions(+), 30 deletions(-) create mode 100644 app-emulation/vmware-workstation/files/6.5.4.246459/vmware-player-extras.py.patch create mode 100644 app-emulation/vmware-workstation/files/6.5.4.246459/vmware-player.py.patch create mode 100644 app-emulation/vmware-workstation/files/6.5.4.246459/vmware-vix.py.patch create mode 100644 app-emulation/vmware-workstation/files/6.5.4.246459/vmware-workstation.py.patch create mode 100644 app-emulation/vmware-workstation/files/6.5.5.328052/vmware-player-extras.py.patch create mode 100644 app-emulation/vmware-workstation/files/6.5.5.328052/vmware-player.py.patch create mode 100644 app-emulation/vmware-workstation/files/6.5.5.328052/vmware-vix.py.patch create mode 100644 app-emulation/vmware-workstation/files/6.5.5.328052/vmware-workstation.py.patch create mode 100644 app-emulation/vmware-workstation/files/vmware-workstation-6.5.4.246459-installer.patch create mode 100644 app-emulation/vmware-workstation/files/vmware-workstation-6.5.5.328052-installer.patch rename app-emulation/vmware-workstation/{vmware-workstation-7.0.0.203739.ebuild => vmware-workstation-6.5.4.246459.ebuild} (91%) create mode 100644 app-emulation/vmware-workstation/vmware-workstation-6.5.5.328052.ebuild diff --git a/app-emulation/vmware-workstation/ChangeLog b/app-emulation/vmware-workstation/ChangeLog index dc13939..4c75622 100644 --- a/app-emulation/vmware-workstation/ChangeLog +++ b/app-emulation/vmware-workstation/ChangeLog @@ -1,7 +1,28 @@ # ChangeLog for app-emulation/vmware-workstation -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.211 2009/09/25 10:38:14 maekke Exp $ +*vmware-workstation-6.5.5.328052 (04 Jan 2011) +*vmware-workstation-6.5.4.246459 (04 Jan 2011) + + 04 Jan 2011; Mario Fetka + +files/6.5.4.246459/vmware-player.py.patch, + +files/6.5.4.246459/vmware-player-extras.py.patch, + +files/6.5.4.246459/vmware-vix.py.patch, + +files/6.5.4.246459/vmware-workstation.py.patch, + +files/6.5.5.328052/vmware-player.py.patch, + +files/6.5.5.328052/vmware-player-extras.py.patch, + vmware-workstation-5.5.9.126128.ebuild, + vmware-workstation-6.5.3.185404.ebuild, + +vmware-workstation-6.5.4.246459.ebuild, + +files/vmware-workstation-6.5.4.246459-installer.patch, + +vmware-workstation-6.5.5.328052.ebuild, + +files/vmware-workstation-6.5.5.328052-installer.patch, + +files/6.5.5.328052/vmware-vix.py.patch, + -vmware-workstation-7.0.0.203739.ebuild, + +files/6.5.5.328052/vmware-workstation.py.patch, metadata.xml: + use my modules + 25 Sep 2009; Markus Meier vmware-workstation-6.5.3.185404.ebuild: amd64 stable, bug #282213 diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest index 6dac4ed..e760bcb 100644 --- a/app-emulation/vmware-workstation/Manifest +++ b/app-emulation/vmware-workstation/Manifest @@ -8,6 +8,14 @@ AUX 6.5.3.185404/vmware-player-extras.py.patch 426 RMD160 458d95094d2e47726221ab AUX 6.5.3.185404/vmware-player.py.patch 2936 RMD160 6b9957799b3571f5382975c4d78bc3db7d16e666 SHA1 b32f9e4c2d2213872a7d8f88754a8552b113567f SHA256 fa711634a038d313769cf5d5180ca96bfb3ba18f392f6c0dd0672a4b4f7d6c9c AUX 6.5.3.185404/vmware-vix.py.patch 439 RMD160 88e318b81efa5340830f1d9a65112ce2d23d0335 SHA1 ca84dacd405f675f31f2da5bea7cdf5d7d988739 SHA256 ad41ae4a4a580fa3b6f7ebd1d04d6e7885c3fb5695d5675ed168ce29925dbded AUX 6.5.3.185404/vmware-workstation.py.patch 948 RMD160 5ee87ba02c4bb50af44eb495ab72e1f148ff84ae SHA1 33b32bdbba9ec6115ea5d44080682ed789a7766b SHA256 4e9a01f8072a1294c0d5631daee703ea183e5a8edb6400f49deddd2b96bb2dc2 +AUX 6.5.4.246459/vmware-player-extras.py.patch 426 RMD160 458d95094d2e47726221ab427486b263b87e4297 SHA1 e41c36cfe150380aceafd1768e9e159fb4e1813f SHA256 1047cdc79d4bc138deaf809f191bdde69c4a5a8ed6ab5b595457a341ecb68abb +AUX 6.5.4.246459/vmware-player.py.patch 2936 RMD160 6b9957799b3571f5382975c4d78bc3db7d16e666 SHA1 b32f9e4c2d2213872a7d8f88754a8552b113567f SHA256 fa711634a038d313769cf5d5180ca96bfb3ba18f392f6c0dd0672a4b4f7d6c9c +AUX 6.5.4.246459/vmware-vix.py.patch 439 RMD160 88e318b81efa5340830f1d9a65112ce2d23d0335 SHA1 ca84dacd405f675f31f2da5bea7cdf5d7d988739 SHA256 ad41ae4a4a580fa3b6f7ebd1d04d6e7885c3fb5695d5675ed168ce29925dbded +AUX 6.5.4.246459/vmware-workstation.py.patch 948 RMD160 5ee87ba02c4bb50af44eb495ab72e1f148ff84ae SHA1 33b32bdbba9ec6115ea5d44080682ed789a7766b SHA256 4e9a01f8072a1294c0d5631daee703ea183e5a8edb6400f49deddd2b96bb2dc2 +AUX 6.5.5.328052/vmware-player-extras.py.patch 426 RMD160 458d95094d2e47726221ab427486b263b87e4297 SHA1 e41c36cfe150380aceafd1768e9e159fb4e1813f SHA256 1047cdc79d4bc138deaf809f191bdde69c4a5a8ed6ab5b595457a341ecb68abb +AUX 6.5.5.328052/vmware-player.py.patch 2936 RMD160 6b9957799b3571f5382975c4d78bc3db7d16e666 SHA1 b32f9e4c2d2213872a7d8f88754a8552b113567f SHA256 fa711634a038d313769cf5d5180ca96bfb3ba18f392f6c0dd0672a4b4f7d6c9c +AUX 6.5.5.328052/vmware-vix.py.patch 439 RMD160 88e318b81efa5340830f1d9a65112ce2d23d0335 SHA1 ca84dacd405f675f31f2da5bea7cdf5d7d988739 SHA256 ad41ae4a4a580fa3b6f7ebd1d04d6e7885c3fb5695d5675ed168ce29925dbded +AUX 6.5.5.328052/vmware-workstation.py.patch 948 RMD160 5ee87ba02c4bb50af44eb495ab72e1f148ff84ae SHA1 33b32bdbba9ec6115ea5d44080682ed789a7766b SHA256 4e9a01f8072a1294c0d5631daee703ea183e5a8edb6400f49deddd2b96bb2dc2 AUX 7.0.0.203739/vmware-player-extras.py.patch 426 RMD160 458d95094d2e47726221ab427486b263b87e4297 SHA1 e41c36cfe150380aceafd1768e9e159fb4e1813f SHA256 1047cdc79d4bc138deaf809f191bdde69c4a5a8ed6ab5b595457a341ecb68abb AUX 7.0.0.203739/vmware-player.py.patch 2936 RMD160 6b9957799b3571f5382975c4d78bc3db7d16e666 SHA1 b32f9e4c2d2213872a7d8f88754a8552b113567f SHA256 fa711634a038d313769cf5d5180ca96bfb3ba18f392f6c0dd0672a4b4f7d6c9c AUX 7.0.0.203739/vmware-vix.py.patch 439 RMD160 88e318b81efa5340830f1d9a65112ce2d23d0335 SHA1 ca84dacd405f675f31f2da5bea7cdf5d7d988739 SHA256 ad41ae4a4a580fa3b6f7ebd1d04d6e7885c3fb5695d5675ed168ce29925dbded @@ -18,6 +26,8 @@ AUX helpers/unbundler.sh 1828 RMD160 d5bb43628d105c4372fa1fe7e7ebac29300fa91f SH AUX helpers/vmware-config.sh 497 RMD160 04addab6d99bf2c984f855a97b935ca8e0e584d8 SHA1 935eb3f565cebdca806d20e852a4bc75c7bc420b SHA256 72712959b26b22bfe8118561cd7b0751973d2a9dd8c2b15379cd42dc8a4ac246 AUX vmware-player.desktop 599 RMD160 a5a9897671da69c4706ba412d9a041edfd13a9b7 SHA1 12af70f7039b19838e298d1949df28b1b8d407a6 SHA256 b967f2e6dba531613498a2dea130f557fc366e869876aa63ba3ae97f5ff59c54 AUX vmware-workstation-6.5.3.185404-installer.patch 2919 RMD160 7921285177ee1238501a95bbab78d100a307674d SHA1 df430803a06ef073a9725b2c86e210c3cc62ceed SHA256 ef63e8d642ae77bf10f22a586c4c37e5c387f76084d71350a9af418d1c5a2858 +AUX vmware-workstation-6.5.4.246459-installer.patch 2919 RMD160 7921285177ee1238501a95bbab78d100a307674d SHA1 df430803a06ef073a9725b2c86e210c3cc62ceed SHA256 ef63e8d642ae77bf10f22a586c4c37e5c387f76084d71350a9af418d1c5a2858 +AUX vmware-workstation-6.5.5.328052-installer.patch 2919 RMD160 7921285177ee1238501a95bbab78d100a307674d SHA1 df430803a06ef073a9725b2c86e210c3cc62ceed SHA256 ef63e8d642ae77bf10f22a586c4c37e5c387f76084d71350a9af418d1c5a2858 AUX vmware-workstation-6.5.rc 1444 RMD160 8d3cb79bdcb48fb944615279e741146c36792bc2 SHA1 bd2784708b998c894dfdf661295b3e1708ce47fa SHA256 4636d8dbcb4f263d49769f7fb7c7f8945355f0bb2e858f4fd4aa96dff87d3dd1 AUX vmware-workstation-7.0.0.203739-installer.patch 2967 RMD160 be8dbd5ef86df784c1e8d7c3cd8267cd48b3c849 SHA1 6d400351f435cc31f0ff1dd019868813ea388337 SHA256 3f4cfaa9785a8acfbf8bd7db3401d08360c65e0e08e5a49d55138eab40de1bf6 AUX vmware-workstation.desktop 605 RMD160 256b59a1e52b65279ef38b3dcf52c43a34090807 SHA1 8f8c1fded85070be0532e33f1bdc05425e33bfb1 SHA256 ae2f572200a16a1e1222e282268ae138588c0e7576045a584c1d17f54f379f3e @@ -25,12 +35,15 @@ AUX vmware-workstation.rc 1862 RMD160 000c71ee5c62edc27d3df3f23286e1fe8490516e S AUX vmware-workstation.xml 1592 RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e8c SHA1 02db2ee7ca0abb8b8793c9f56d858bb08c1c715f SHA256 56aafee80ad705e8d832f8853c36d763d37b87d1cb132a41c50eb63085ae854d DIST VMware-Workstation-6.5.3-185404.i386.bundle 411839182 RMD160 c7ff79655b286f133ca2bcb9b172828be8982ed9 SHA1 c0c6f9b56e70bd3ffdb5467ee176110e283a69e5 SHA256 ba72f94e89dddced55601ace23fa03db6e2eff075df5628be99a581110e9cf4c DIST VMware-Workstation-6.5.3-185404.x86_64.bundle 377656907 RMD160 6a8240a1b64422218425f228f6f94e006dd50e79 SHA1 8763f250a3ac5fc4698bd26319b93fecb498d542 SHA256 11484b6a759b7e1b73ccad27cdcbedb0bf3612baf40b4f3ac46b9a43d0777291 -DIST VMware-Workstation-Full-7.0.0-203739.i386.bundle 284417217 RMD160 21753b365c1fa2f48a42e4d341b9b9116f335bf3 SHA1 8319f92d99be12c806d1f86372ebbe7fdcb658a3 SHA256 28a26417faea471b16c481deb1714e12ae65639d16dc66c936b884d481671c80 -DIST VMware-Workstation-Full-7.0.0-203739.x86_64.bundle 290461614 RMD160 eb144192ba88fa2622db4d64d870435066a68b82 SHA1 d925e5fbcf6ce5265cfab8947f1d0b6b6ebab60b SHA256 528756909b91558912d67ed577f9fa3c7982a6b143f1f3976a0f763c6097f80b +DIST VMware-Workstation-6.5.4-246459.i386.bundle 430005590 RMD160 c868ce6691b6a4e8f81b959eb3ee49f1e1705cd3 SHA1 ec78099322b5fb2a737cd74a1978a5c07382dc8a SHA256 121db45e5252175967f7a5311a6306c4b5bada8060519cf3bc55e85a9d4dea0a +DIST VMware-Workstation-6.5.4-246459.x86_64.bundle 396337936 RMD160 c8af33a4ecc4b19496fb40859d7058f30b930973 SHA1 3c0f1efae0a64fa3a41be21b0bfc962f12e0e6d8 SHA256 dff23efefb8cbc6823cb4184e7f4b519fb1d337f453b7b5d61b6cd4f43ff34e7 +DIST VMware-Workstation-6.5.5-328052.i386.bundle 450181321 RMD160 b695a70c77bc8271287069cc888eac8b4e03883c SHA1 18a05e6f4f772b7f0563dbd17596b66d1db8e9fa SHA256 d2a895ae2bc38988e6426f81746c557a5d3154ca0282f9b61908dba3d1bbc1d0 +DIST VMware-Workstation-6.5.5-328052.x86_64.bundle 417733505 RMD160 d41cf7f5f24dfdee97243c7612e620a3d450aee4 SHA1 58ecb2a494d4c7cc663e2028cf76c13d458fecac SHA256 9d213dca51852ce8ca38ed0a140ff205fdecd29fbef7319f26a5e052362e3d51 DIST VMware-workstation-5.5.9-126128.tar.gz 111649803 RMD160 a5a867761d36c9a02821f8dd639a95b8c9ab38bc SHA1 eb8786111a74213ea4ec24636a4ba70b7f5dc741 SHA256 71a062e29480a48647c7323883e4e4b43a9365c1bb70000a23b768647db46444 DIST vmware-any-any-update115.tar.gz 493641 RMD160 56cabe56f70c01a22a7671e861cc5a2df19855c7 SHA1 ff9b6fdf6ca74495eb5f4822a1854fc91185377c SHA256 b1c14fa9514663b85c2efe8331407e71cce96e5a21a8b941fa570c960bbdcaa1 -EBUILD vmware-workstation-5.5.9.126128.ebuild 3250 RMD160 3b2bca708a25da65badac4df9ab22bddd3b942b2 SHA1 8b8c90fac9d18e5d6424007be0ac63ec61ef1855 SHA256 417d5c1dabc7cc974e0ca64f431b0bc659919e4cc4d2b04003430238bbfb3534 -EBUILD vmware-workstation-6.5.3.185404.ebuild 5180 RMD160 31f6540a8700afed794b145c078826d17fd6c4a9 SHA1 5ff271a40c4af9586273a8f68fbf7937481f8bdc SHA256 bf53438b04f227e2365596d708b98779953d58c52e56160b3e26dddbe06f7ec9 -EBUILD vmware-workstation-7.0.0.203739.ebuild 5185 RMD160 ab3c099615845d231bcb9f9ce85cdd8b1cee50e6 SHA1 b4b1363a75f56af55a9393308579ec3d6c56d1a1 SHA256 928ca36e98a528b8231c6a6e5612b750624f4f4962c70ebfa81917490455639e -MISC ChangeLog 34308 RMD160 f2913f3ab32bd51335f63fe3200449b7566e6db6 SHA1 5e99f1a76412f6d85004fe467478fd729b70ddf8 SHA256 718816509f60db2da9992fc76e6c6b9fa33de543f7b4f5f2da69aec20c1c1ed6 -MISC metadata.xml 411 RMD160 9fb8be5a3352b268de48cf19623718214480986b SHA1 0a7885fe742bfeb83800c827ac422f188d5bcead SHA256 3f22dc31fc12456d4c1e953ef3bc614638fa3efaf5edf18998a122a24a78f8c9 +EBUILD vmware-workstation-5.5.9.126128.ebuild 3230 RMD160 90fa4841796e680f1d965fddafa81960609743ea SHA1 8e9cb8d721a4de3d8d09bc3fbdd8405b94706272 SHA256 1d81b0e4cb6a221c11f162656c2bc3a86e27789c4f28572840e8ef1bd0a0609f +EBUILD vmware-workstation-6.5.3.185404.ebuild 5198 RMD160 7251cce2e1b73b178cb29c76a98ab6364a2d874e SHA1 6039a68569ca84cd58192a4c0f8fe6619413a299 SHA256 27652907c6a5de2abc7e0221789fb6e6c709356ee5fd1cd2e578e05f9b9d59fc +EBUILD vmware-workstation-6.5.4.246459.ebuild 5018 RMD160 db5e8a9faffc5d3b04fe51779dabda78867a06a1 SHA1 5274dcf0415764238e68fbd14cfa1dc123507e52 SHA256 c488cc5a3dabed5e4c16a7787cca10a791c3e9823372370148eb4b8f5be86779 +EBUILD vmware-workstation-6.5.5.328052.ebuild 5018 RMD160 cb07886f631be3b849a037771c041debc9865619 SHA1 023cba49acefa6915bf59564f03cfb0f3c1e5c23 SHA256 369bdbb715072c8d6b6c33bf84f68b84e0fa5336d2f141c5e227aeb0b4c0bffa +MISC ChangeLog 35201 RMD160 7802054ea1f70a51dc2c14b19f95b6ad116afff6 SHA1 31258ad1ed5368d4f04c18218c56a1ca6dc750c3 SHA256 2c84c768e3b8130c260e72b82474748381a89948d05d333f3d69c84690a6ae13 +MISC metadata.xml 347 RMD160 09578738c25495a3f945f97e2a8a51d649476a5b SHA1 89b8a5cd78b0acc29dc50ac1c890b1f67b0303e5 SHA256 2dadcb5e8783b7dad15087e3812a292a158779b3269e65e39c285228cf0b1710 diff --git a/app-emulation/vmware-workstation/files/6.5.4.246459/vmware-player-extras.py.patch b/app-emulation/vmware-workstation/files/6.5.4.246459/vmware-player-extras.py.patch new file mode 100644 index 0000000..eb9e723 --- /dev/null +++ b/app-emulation/vmware-workstation/files/6.5.4.246459/vmware-player-extras.py.patch @@ -0,0 +1,14 @@ +diff --git a/vmware-player-extras.py b/vmware-player-extras.py +index 21595b1..e8adf08 100644 +--- a/vmware-player-extras.py ++++ b/vmware-player-extras.py +@@ -6,7 +6,8 @@ VMware Player Extras component installer. + + DEST = LIBDIR/'vmware' + SETTINGS = { 'vmware.fullpath': BINDIR/'vmware', } +-CONF = DEST/'setup/vmware-config' ++import os ++CONF = path(os.environ['WORKDIR'])/'vmware-config.sh' + + + class PlayerExtras(Installer): diff --git a/app-emulation/vmware-workstation/files/6.5.4.246459/vmware-player.py.patch b/app-emulation/vmware-workstation/files/6.5.4.246459/vmware-player.py.patch new file mode 100644 index 0000000..49306c3 --- /dev/null +++ b/app-emulation/vmware-workstation/files/6.5.4.246459/vmware-player.py.patch @@ -0,0 +1,64 @@ +diff --git a/vmware-player.py b/vmware-player.py +index bee22df..d06cca9 100644 +--- a/vmware-player.py ++++ b/vmware-player.py +@@ -6,7 +6,8 @@ VMware Player component installer. + + GCONF_DEFAULTS = 'xml:readwrite:/etc/gconf/gconf.xml.defaults' + DEST = LIBDIR/'vmware' +-CONFIG = DEST/'setup/vmware-config' ++import os ++CONFIG = path(os.environ['WORKDIR'])/'vmware-config.sh' + CUPSLIBDIR = LIBDIR/'cups' + # XXX: LIBDIR should be properly calculated, to make this cleaner + if (PREFIX/'lib64/cups').exists(): +@@ -84,12 +85,12 @@ class Player(Installer): + ret, kvers = output('uname', '-r') + kvers = kvers.strip() + modules = ('vmmon', 'vmnet', 'vmblock', 'vmci', 'vsock') +- base = path('/lib/modules/%s/misc' % kvers) ++ base = path('/this/path/doesnt/exist/lib/modules/%s/misc' % kvers) + + for module in modules: + for ext in ('o', 'ko'): + mod = '%s.%s' % (module, ext) +- (base/mod).remove(ignore_errors=True) ++ # (base/mod).remove(ignore_errors=True) + + def PreUninstall(self, old, new, upgrade): + script = INITSCRIPTDIR/'vmware' +@@ -156,8 +157,8 @@ class Player(Installer): + def PostTransactionInstall(self, old, new, upgrade): + if ENV.get('VMWARE_SKIP_MODULES'): + log.info('Skipping kernel module installation') +- elif run(BINDIR/'vmware-modconfig', '--console', '--install-all') == 0: +- log.info('Successfully installed kernel modules') ++ # elif run(BINDIR/'vmware-modconfig', '--console', '--install-all') == 0: ++ # log.info('Successfully installed kernel modules') + else: + log.info('Unable to install kernel modules') + +@@ -189,8 +190,8 @@ class Player(Installer): + for handler in ('vm', 'vms'): + for gconfType, key, value in settings: + key = key % handler +- run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS, +- '--type', gconfType, '--set', key, value) ++ # run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS, ++ # '--type', gconfType, '--set', key, value) + + # Instruct all gconfd daemons to reload. + run('killall', '-HUP', 'gconfd-2') +@@ -200,9 +201,9 @@ class Player(Installer): + def _deconfigureVMStreamingHandlers(self): + """ Deconfigures the handlers for vm:// and vms:// used for VM streaming""" + def deconfigureGConf(): +- for handler in ('vm', 'vms'): +- run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS, +- '--recursive-unset', '/desktop/gnome/url-handlers/%s' % handler) ++ # for handler in ('vm', 'vms'): ++ # run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS, ++ # '--recursive-unset', '/desktop/gnome/url-handlers/%s' % handler) + + # Instruct all gconfd daemons to reload. + run('killall', '-HUP', 'gconfd-2') diff --git a/app-emulation/vmware-workstation/files/6.5.4.246459/vmware-vix.py.patch b/app-emulation/vmware-workstation/files/6.5.4.246459/vmware-vix.py.patch new file mode 100644 index 0000000..5984bdf --- /dev/null +++ b/app-emulation/vmware-workstation/files/6.5.4.246459/vmware-vix.py.patch @@ -0,0 +1,14 @@ +diff --git a/vmware-vix.py b/vmware-vix.py +index ac64dc5..8fdc2b2 100644 +--- a/vmware-vix.py ++++ b/vmware-vix.py +@@ -4,7 +4,8 @@ Copyright 2007 VMware, Inc. All rights reserved. -- VMware Confidential + VIX component installer. + """ + DEST = LIBDIR/'vmware-vix' +-conf = DEST/'setup/vmware-config' ++import os ++conf = path(os.environ['WORKDIR'])/'vmware-config.sh' + + class VIX(Installer): + def InitializeInstall(self, old, new, upgrade): diff --git a/app-emulation/vmware-workstation/files/6.5.4.246459/vmware-workstation.py.patch b/app-emulation/vmware-workstation/files/6.5.4.246459/vmware-workstation.py.patch new file mode 100644 index 0000000..da139bb --- /dev/null +++ b/app-emulation/vmware-workstation/files/6.5.4.246459/vmware-workstation.py.patch @@ -0,0 +1,23 @@ +diff --git a/vmware-workstation.py b/vmware-workstation.py +index 55476d9..8dd4c0a 100644 +--- a/vmware-workstation.py ++++ b/vmware-workstation.py +@@ -4,7 +4,8 @@ Copyright 2008 VMware, Inc. All rights reserved. -- VMware Confidential + VMware Workstation component installer. + """ + DEST = LIBDIR/'vmware' +-conf = DEST/'setup/vmware-config' ++import os ++conf = path(os.environ['WORKDIR'])/'vmware-config.sh' + + class Workstation(Installer): + def PreTransactionInstall(self, old, new, upgrade): +@@ -40,7 +41,7 @@ class Workstation(Installer): + self.AddPermission(DEST/'bin/*', BINARY) + + eclipse = config.Get('vmware-workstation.eclipse') +- eclipse and self.AddTarget(Link, DEST/'eclipse-ivd/com.vmware.bfg_1.0.0', ++ False and self.AddTarget(Link, DEST/'eclipse-ivd/com.vmware.bfg_1.0.0', + Destination(eclipse)/'plugins/com.vmware.bfg_1.0.0') + + def _vmwareMountRunnable(self, vmwareMount): diff --git a/app-emulation/vmware-workstation/files/6.5.5.328052/vmware-player-extras.py.patch b/app-emulation/vmware-workstation/files/6.5.5.328052/vmware-player-extras.py.patch new file mode 100644 index 0000000..eb9e723 --- /dev/null +++ b/app-emulation/vmware-workstation/files/6.5.5.328052/vmware-player-extras.py.patch @@ -0,0 +1,14 @@ +diff --git a/vmware-player-extras.py b/vmware-player-extras.py +index 21595b1..e8adf08 100644 +--- a/vmware-player-extras.py ++++ b/vmware-player-extras.py +@@ -6,7 +6,8 @@ VMware Player Extras component installer. + + DEST = LIBDIR/'vmware' + SETTINGS = { 'vmware.fullpath': BINDIR/'vmware', } +-CONF = DEST/'setup/vmware-config' ++import os ++CONF = path(os.environ['WORKDIR'])/'vmware-config.sh' + + + class PlayerExtras(Installer): diff --git a/app-emulation/vmware-workstation/files/6.5.5.328052/vmware-player.py.patch b/app-emulation/vmware-workstation/files/6.5.5.328052/vmware-player.py.patch new file mode 100644 index 0000000..49306c3 --- /dev/null +++ b/app-emulation/vmware-workstation/files/6.5.5.328052/vmware-player.py.patch @@ -0,0 +1,64 @@ +diff --git a/vmware-player.py b/vmware-player.py +index bee22df..d06cca9 100644 +--- a/vmware-player.py ++++ b/vmware-player.py +@@ -6,7 +6,8 @@ VMware Player component installer. + + GCONF_DEFAULTS = 'xml:readwrite:/etc/gconf/gconf.xml.defaults' + DEST = LIBDIR/'vmware' +-CONFIG = DEST/'setup/vmware-config' ++import os ++CONFIG = path(os.environ['WORKDIR'])/'vmware-config.sh' + CUPSLIBDIR = LIBDIR/'cups' + # XXX: LIBDIR should be properly calculated, to make this cleaner + if (PREFIX/'lib64/cups').exists(): +@@ -84,12 +85,12 @@ class Player(Installer): + ret, kvers = output('uname', '-r') + kvers = kvers.strip() + modules = ('vmmon', 'vmnet', 'vmblock', 'vmci', 'vsock') +- base = path('/lib/modules/%s/misc' % kvers) ++ base = path('/this/path/doesnt/exist/lib/modules/%s/misc' % kvers) + + for module in modules: + for ext in ('o', 'ko'): + mod = '%s.%s' % (module, ext) +- (base/mod).remove(ignore_errors=True) ++ # (base/mod).remove(ignore_errors=True) + + def PreUninstall(self, old, new, upgrade): + script = INITSCRIPTDIR/'vmware' +@@ -156,8 +157,8 @@ class Player(Installer): + def PostTransactionInstall(self, old, new, upgrade): + if ENV.get('VMWARE_SKIP_MODULES'): + log.info('Skipping kernel module installation') +- elif run(BINDIR/'vmware-modconfig', '--console', '--install-all') == 0: +- log.info('Successfully installed kernel modules') ++ # elif run(BINDIR/'vmware-modconfig', '--console', '--install-all') == 0: ++ # log.info('Successfully installed kernel modules') + else: + log.info('Unable to install kernel modules') + +@@ -189,8 +190,8 @@ class Player(Installer): + for handler in ('vm', 'vms'): + for gconfType, key, value in settings: + key = key % handler +- run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS, +- '--type', gconfType, '--set', key, value) ++ # run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS, ++ # '--type', gconfType, '--set', key, value) + + # Instruct all gconfd daemons to reload. + run('killall', '-HUP', 'gconfd-2') +@@ -200,9 +201,9 @@ class Player(Installer): + def _deconfigureVMStreamingHandlers(self): + """ Deconfigures the handlers for vm:// and vms:// used for VM streaming""" + def deconfigureGConf(): +- for handler in ('vm', 'vms'): +- run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS, +- '--recursive-unset', '/desktop/gnome/url-handlers/%s' % handler) ++ # for handler in ('vm', 'vms'): ++ # run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS, ++ # '--recursive-unset', '/desktop/gnome/url-handlers/%s' % handler) + + # Instruct all gconfd daemons to reload. + run('killall', '-HUP', 'gconfd-2') diff --git a/app-emulation/vmware-workstation/files/6.5.5.328052/vmware-vix.py.patch b/app-emulation/vmware-workstation/files/6.5.5.328052/vmware-vix.py.patch new file mode 100644 index 0000000..5984bdf --- /dev/null +++ b/app-emulation/vmware-workstation/files/6.5.5.328052/vmware-vix.py.patch @@ -0,0 +1,14 @@ +diff --git a/vmware-vix.py b/vmware-vix.py +index ac64dc5..8fdc2b2 100644 +--- a/vmware-vix.py ++++ b/vmware-vix.py +@@ -4,7 +4,8 @@ Copyright 2007 VMware, Inc. All rights reserved. -- VMware Confidential + VIX component installer. + """ + DEST = LIBDIR/'vmware-vix' +-conf = DEST/'setup/vmware-config' ++import os ++conf = path(os.environ['WORKDIR'])/'vmware-config.sh' + + class VIX(Installer): + def InitializeInstall(self, old, new, upgrade): diff --git a/app-emulation/vmware-workstation/files/6.5.5.328052/vmware-workstation.py.patch b/app-emulation/vmware-workstation/files/6.5.5.328052/vmware-workstation.py.patch new file mode 100644 index 0000000..da139bb --- /dev/null +++ b/app-emulation/vmware-workstation/files/6.5.5.328052/vmware-workstation.py.patch @@ -0,0 +1,23 @@ +diff --git a/vmware-workstation.py b/vmware-workstation.py +index 55476d9..8dd4c0a 100644 +--- a/vmware-workstation.py ++++ b/vmware-workstation.py +@@ -4,7 +4,8 @@ Copyright 2008 VMware, Inc. All rights reserved. -- VMware Confidential + VMware Workstation component installer. + """ + DEST = LIBDIR/'vmware' +-conf = DEST/'setup/vmware-config' ++import os ++conf = path(os.environ['WORKDIR'])/'vmware-config.sh' + + class Workstation(Installer): + def PreTransactionInstall(self, old, new, upgrade): +@@ -40,7 +41,7 @@ class Workstation(Installer): + self.AddPermission(DEST/'bin/*', BINARY) + + eclipse = config.Get('vmware-workstation.eclipse') +- eclipse and self.AddTarget(Link, DEST/'eclipse-ivd/com.vmware.bfg_1.0.0', ++ False and self.AddTarget(Link, DEST/'eclipse-ivd/com.vmware.bfg_1.0.0', + Destination(eclipse)/'plugins/com.vmware.bfg_1.0.0') + + def _vmwareMountRunnable(self, vmwareMount): diff --git a/app-emulation/vmware-workstation/files/vmware-workstation-6.5.4.246459-installer.patch b/app-emulation/vmware-workstation/files/vmware-workstation-6.5.4.246459-installer.patch new file mode 100644 index 0000000..80a301e --- /dev/null +++ b/app-emulation/vmware-workstation/files/vmware-workstation-6.5.4.246459-installer.patch @@ -0,0 +1,64 @@ +diff --git a/payload/install/vmware-installer/vmis/__init__.py b/payload/install/vmware-installer/vmis/__init__.py +index 7a46312..e1dbff1 100644 +--- a/payload/install/vmware-installer/vmis/__init__.py ++++ b/payload/install/vmware-installer/vmis/__init__.py +@@ -12,5 +12,5 @@ VERSION_INFO = (1,0) + VERSION = '.'.join([str(x) for x in VERSION_INFO]) + MAJOR_VERSION = VERSION_INFO[0] + +-CONFDIR = path(u'/etc/vmware') ++CONFDIR = path(u'./vmware-confdir') + DATABASE_PATH = CONFDIR/'database' +diff --git a/payload/install/vmware-installer/vmis/core/env.py b/payload/install/vmware-installer/vmis/core/env.py +index e7abc2e..81c4a2b 100644 +--- a/payload/install/vmware-installer/vmis/core/env.py ++++ b/payload/install/vmware-installer/vmis/core/env.py +@@ -66,6 +66,8 @@ def LoadInstaller(component, loadPath): + # Python will interrept as being a module separator + moduleName = component.name.replace('.', '') + fileObj, pathName, description = imp.find_module(moduleName, [loadPath]) ++ print output(os.path.join(env['ENV'].get('WORKDIR', './'), 'module_patcher.sh'), pathName)[1], ++ fileObj = file(pathName) + + try: + # XXX: db.config cannot be set at the module level because this +diff --git a/payload/install/vmware-installer/vmis/core/questions.py b/payload/install/vmware-installer/vmis/core/questions.py +index 2be10de..f92ecff 100644 +--- a/payload/install/vmware-installer/vmis/core/questions.py ++++ b/payload/install/vmware-installer/vmis/core/questions.py +@@ -139,6 +139,9 @@ class InitDir(Directory): + """ + super(InitDir, self).Validate(answer) + ++ ### GENTOO PATCH ### Finish early ++ return True ++ + rcdirs = ('rc0.d', 'rc1.d', 'rc2.d', 'rc3.d', 'rc4.d', 'rc5.d', 'rc6.d') + answer = path(answer) + +diff --git a/payload/install/vmware-installer/vmis/ui/console.py b/payload/install/vmware-installer/vmis/ui/console.py +index 525df75..abb81b3 100644 +--- a/payload/install/vmware-installer/vmis/ui/console.py ++++ b/payload/install/vmware-installer/vmis/ui/console.py +@@ -148,7 +148,7 @@ class Wizard(object): + wrapper = TextWrapper() + wrapper.width = 79 + wrapper.replace_whitespace = False # Needed to preserve paragraph spacing. +- Popen('more', stdin=PIPE).communicate(input=wrapper.fill(text)) ++ Popen('less', stdin=PIPE).communicate(input=wrapper.fill(text)) + except IOError: # RHEL4 appears to close stdin while we still expect it to be open + pass + +diff --git a/payload/install/vmware-installer/vmis/util/log.py b/payload/install/vmware-installer/vmis/util/log.py +index 4f609c4..b07b89d 100644 +--- a/payload/install/vmware-installer/vmis/util/log.py ++++ b/payload/install/vmware-installer/vmis/util/log.py +@@ -22,6 +22,8 @@ else: + # running a build) + LOG_FILE = '/tmp/vmware-installer.log' + ++LOG_FILE = './vmware-installer.log' ++ + if level <= logging.DEBUG: + MAX_BYTES = 0 + BACKUP_COUNT = 0 diff --git a/app-emulation/vmware-workstation/files/vmware-workstation-6.5.5.328052-installer.patch b/app-emulation/vmware-workstation/files/vmware-workstation-6.5.5.328052-installer.patch new file mode 100644 index 0000000..80a301e --- /dev/null +++ b/app-emulation/vmware-workstation/files/vmware-workstation-6.5.5.328052-installer.patch @@ -0,0 +1,64 @@ +diff --git a/payload/install/vmware-installer/vmis/__init__.py b/payload/install/vmware-installer/vmis/__init__.py +index 7a46312..e1dbff1 100644 +--- a/payload/install/vmware-installer/vmis/__init__.py ++++ b/payload/install/vmware-installer/vmis/__init__.py +@@ -12,5 +12,5 @@ VERSION_INFO = (1,0) + VERSION = '.'.join([str(x) for x in VERSION_INFO]) + MAJOR_VERSION = VERSION_INFO[0] + +-CONFDIR = path(u'/etc/vmware') ++CONFDIR = path(u'./vmware-confdir') + DATABASE_PATH = CONFDIR/'database' +diff --git a/payload/install/vmware-installer/vmis/core/env.py b/payload/install/vmware-installer/vmis/core/env.py +index e7abc2e..81c4a2b 100644 +--- a/payload/install/vmware-installer/vmis/core/env.py ++++ b/payload/install/vmware-installer/vmis/core/env.py +@@ -66,6 +66,8 @@ def LoadInstaller(component, loadPath): + # Python will interrept as being a module separator + moduleName = component.name.replace('.', '') + fileObj, pathName, description = imp.find_module(moduleName, [loadPath]) ++ print output(os.path.join(env['ENV'].get('WORKDIR', './'), 'module_patcher.sh'), pathName)[1], ++ fileObj = file(pathName) + + try: + # XXX: db.config cannot be set at the module level because this +diff --git a/payload/install/vmware-installer/vmis/core/questions.py b/payload/install/vmware-installer/vmis/core/questions.py +index 2be10de..f92ecff 100644 +--- a/payload/install/vmware-installer/vmis/core/questions.py ++++ b/payload/install/vmware-installer/vmis/core/questions.py +@@ -139,6 +139,9 @@ class InitDir(Directory): + """ + super(InitDir, self).Validate(answer) + ++ ### GENTOO PATCH ### Finish early ++ return True ++ + rcdirs = ('rc0.d', 'rc1.d', 'rc2.d', 'rc3.d', 'rc4.d', 'rc5.d', 'rc6.d') + answer = path(answer) + +diff --git a/payload/install/vmware-installer/vmis/ui/console.py b/payload/install/vmware-installer/vmis/ui/console.py +index 525df75..abb81b3 100644 +--- a/payload/install/vmware-installer/vmis/ui/console.py ++++ b/payload/install/vmware-installer/vmis/ui/console.py +@@ -148,7 +148,7 @@ class Wizard(object): + wrapper = TextWrapper() + wrapper.width = 79 + wrapper.replace_whitespace = False # Needed to preserve paragraph spacing. +- Popen('more', stdin=PIPE).communicate(input=wrapper.fill(text)) ++ Popen('less', stdin=PIPE).communicate(input=wrapper.fill(text)) + except IOError: # RHEL4 appears to close stdin while we still expect it to be open + pass + +diff --git a/payload/install/vmware-installer/vmis/util/log.py b/payload/install/vmware-installer/vmis/util/log.py +index 4f609c4..b07b89d 100644 +--- a/payload/install/vmware-installer/vmis/util/log.py ++++ b/payload/install/vmware-installer/vmis/util/log.py +@@ -22,6 +22,8 @@ else: + # running a build) + LOG_FILE = '/tmp/vmware-installer.log' + ++LOG_FILE = './vmware-installer.log' ++ + if level <= logging.DEBUG: + MAX_BYTES = 0 + BACKUP_COUNT = 0 diff --git a/app-emulation/vmware-workstation/metadata.xml b/app-emulation/vmware-workstation/metadata.xml index 6cb51a0..4f8e5f6 100644 --- a/app-emulation/vmware-workstation/metadata.xml +++ b/app-emulation/vmware-workstation/metadata.xml @@ -2,9 +2,6 @@ vmware - - vadimk@gentoo.org - VMWare Workstation is a virtual machine which can be used to install other operating systems in a virtual environment to run on top of Gentoo. diff --git a/app-emulation/vmware-workstation/vmware-workstation-5.5.9.126128.ebuild b/app-emulation/vmware-workstation/vmware-workstation-5.5.9.126128.ebuild index 7db87f1..a6ee809 100644 --- a/app-emulation/vmware-workstation/vmware-workstation-5.5.9.126128.ebuild +++ b/app-emulation/vmware-workstation/vmware-workstation-5.5.9.126128.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# 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/vmware-workstation-5.5.9.126128.ebuild,v 1.3 2009/01/12 21:46:40 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-5.5.9.126128.ebuild,v 1.4 2010/03/09 12:06:38 abcd Exp $ inherit vmware eutils versionator @@ -37,9 +37,9 @@ RDEPEND="sys-libs/glibc x11-libs/libXft ) !app-emulation/vmware-player !app-emulation/vmware-server - ~app-emulation/vmware-modules-1.0.0.15 - !=app-emulation/vmware-modules-1.0.0.16 + ~app-emulation/vmware-modules-138.9 + !app-emulation/vmware-modules-138.9 >=dev-lang/perl-5 sys-apps/pciutils" @@ -88,8 +88,8 @@ src_install() { doicon lib/share/pixmaps/vmware-player.png # Fix an ugly GCC error on start rm -f "${Ddir}lib/lib/libgcc_s.so.1/libgcc_s.so.1" - make_desktop_entry vmware "VMWare Workstation" ${PN}.png System - make_desktop_entry vmplayer "VMWare Player" vmware-player.png System + make_desktop_entry vmware "VMWare Workstation" ${PN} System + make_desktop_entry vmplayer "VMWare Player" vmware-player System } pkg_postinst() { diff --git a/app-emulation/vmware-workstation/vmware-workstation-6.5.3.185404.ebuild b/app-emulation/vmware-workstation/vmware-workstation-6.5.3.185404.ebuild index c4ad51b..9b2261e 100644 --- a/app-emulation/vmware-workstation/vmware-workstation-6.5.3.185404.ebuild +++ b/app-emulation/vmware-workstation/vmware-workstation-6.5.3.185404.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# 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/vmware-workstation-6.5.3.185404.ebuild,v 1.4 2009/09/25 10:38:14 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-6.5.3.185404.ebuild,v 1.5 2010/12/29 20:26:56 vadimk Exp $ EAPI="2" @@ -46,6 +46,7 @@ RDEPEND=" x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr + x11-libs/libXtst !!app-emulation/vmware-player !!app-emulation/vmware-server " diff --git a/app-emulation/vmware-workstation/vmware-workstation-7.0.0.203739.ebuild b/app-emulation/vmware-workstation/vmware-workstation-6.5.4.246459.ebuild similarity index 91% rename from app-emulation/vmware-workstation/vmware-workstation-7.0.0.203739.ebuild rename to app-emulation/vmware-workstation/vmware-workstation-6.5.4.246459.ebuild index 2bddd93..de6be5c 100644 --- a/app-emulation/vmware-workstation/vmware-workstation-7.0.0.203739.ebuild +++ b/app-emulation/vmware-workstation/vmware-workstation-6.5.4.246459.ebuild @@ -1,28 +1,24 @@ -# Copyright 1999-2009 Gentoo Foundation +# 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/vmware-workstation-6.5.3.185404.ebuild,v 1.4 2009/09/25 10:38:14 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-6.5.4.246459.ebuild,v 1.2 2010/12/29 20:26:56 vadimk Exp $ EAPI="2" inherit eutils versionator fdo-mime gnome2-utils -MY_PN="VMware-Workstation-Full-$(replace_version_separator 3 - $PV)" +MY_PN="VMware-Workstation-$(replace_version_separator 3 - $PV)" DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators" HOMEPAGE="http://www.vmware.com/products/desktop/ws_features.html" DOWNLOAD_URL="http://www.vmware.com/download/ws/" SRC_URI=" - x86? ( - mirror://vmware/software/wkst/${MY_PN}.i386.bundle - http://download.softpedia.ro/linux/${MY_PN}.i386.bundle ) - amd64? ( - mirror://vmware/software/wkst/${MY_PN}.x86_64.bundle - http://download.softpedia.ro/linux/${MY_PN}.x86_64.bundle ) + x86? ( ${MY_PN}.i386.bundle ) + amd64? ( ${MY_PN}.x86_64.bundle ) " LICENSE="vmware" SLOT="0" -KEYWORDS="-* amd64 x86" +KEYWORDS="-* ~amd64 ~x86" IUSE="" RESTRICT="strip fetch binchecks" PROPERTIES="interactive" @@ -46,6 +42,7 @@ RDEPEND=" x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr + x11-libs/libXtst !!app-emulation/vmware-player !!app-emulation/vmware-server " diff --git a/app-emulation/vmware-workstation/vmware-workstation-6.5.5.328052.ebuild b/app-emulation/vmware-workstation/vmware-workstation-6.5.5.328052.ebuild new file mode 100644 index 0000000..ca94f69 --- /dev/null +++ b/app-emulation/vmware-workstation/vmware-workstation-6.5.5.328052.ebuild @@ -0,0 +1,175 @@ +# 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/vmware-workstation-6.5.5.328052.ebuild,v 1.2 2010/12/29 20:26:56 vadimk Exp $ + +EAPI="2" + +inherit eutils versionator fdo-mime gnome2-utils + +MY_PN="VMware-Workstation-$(replace_version_separator 3 - $PV)" + +DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators" +HOMEPAGE="http://www.vmware.com/products/desktop/ws_features.html" +DOWNLOAD_URL="http://www.vmware.com/download/ws/" +SRC_URI=" + x86? ( ${MY_PN}.i386.bundle ) + amd64? ( ${MY_PN}.x86_64.bundle ) + " + +LICENSE="vmware" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +IUSE="" +RESTRICT="strip fetch binchecks" +PROPERTIES="interactive" + +# vmware-workstation should not use virtual/libc as this is a +# precompiled binary package thats linked to glibc. +DEPEND=">=dev-lang/python-2.5[sqlite,ncurses] + dev-python/lxml" +RDEPEND=" + ~app-emulation/vmware-modules-1.0.0.25 + dev-cpp/cairomm + dev-cpp/libgnomecanvasmm + dev-cpp/libsexymm + sys-apps/pciutils + sys-fs/fuse + sys-libs/glibc + >=x11-libs/libview-0.6.2 + x11-libs/libgksu + x11-libs/libXcursor + x11-libs/libXft + x11-libs/libXi + x11-libs/libXinerama + x11-libs/libXrandr + x11-libs/libXtst + !!app-emulation/vmware-player + !!app-emulation/vmware-server + " + +S=${WORKDIR}/vmware-distrib +VM_INSTALL_DIR="/opt/vmware/workstation" + +pkg_setup() { + if use x86; then + MY_P="${MY_PN}.i386" + elif use amd64; then + MY_P="${MY_PN}.x86_64" + fi + + if [ "$(python -c "import curses; curses.setupterm(); print curses.tigetstr('hpa')")" == "None" ]; then + die "Please emerge this package using a different terminal (e.g. not within screen)." + fi +} + +pkg_nofetch() { + if use x86; then + MY_P="${MY_PN}.i386" + elif use amd64; then + MY_P="${MY_PN}.x86_64" + fi + + einfo "Please download the ${MY_P}.bundle from" + einfo "${DOWNLOAD_URL}" + einfo "and place it in ${DISTDIR}" +} + +src_unpack() { + # Unbundle the bundle + cp "${FILESDIR}"/helpers/* "${WORKDIR}" + chmod a+x "${WORKDIR}"/*.sh + "${WORKDIR}"/unbundler.sh "${DISTDIR}/${MY_P}".bundle +} + +src_prepare() { + # Patch up the installer + epatch "${FILESDIR}/${P}-installer.patch" + + mkdir "${WORKDIR}/vmware-confdir" +} + +src_install() { + dodir /etc/init.d + + #Run the installer + local INSTALLER="${WORKDIR}/payload/install/vmware-installer" + local PYOPTS="-W ignore::DeprecationWarning" + export VMWARE_SKIP_NETWORKING="true" + python ${PYOPTS} "${INSTALLER}/vmware-installer.py" \ + --set-setting vmware-installer.libconf "${INSTALLER}/lib/libconf" \ + --set-setting initdir "${T}" \ + --set-setting initscriptdir "${D}/etc/init.d" \ + --set-setting prefix "${D}${VM_INSTALL_DIR}" \ + --set-setting sysconfdir "${D}/etc" \ + --install-component "${INSTALLER}" \ + --install-bundle "${DISTDIR}/${MY_P}.bundle" \ + --console --required + + rm -fr "${D}${VM_INSTALL_DIR}/lib/vmware/modules/binary" + + if [ ! -e "${WORKDIR}"/vmware-confdir/bootstrap ]; then + eerror "VMware installation seems to have rolled back." + eerror "Please include the contents of ${WORKDIR}/vmware-installer.log" + eerror "in any bug reports you file." + die "VMware installation rolled back." + fi + + # Redirect all the ${D} paths to / paths" + sed -i -e "s:${D}::" "${WORKDIR}"/vmware-confdir/bootstrap + + # Fix up icons/mime/desktop handlers + dodir /usr/share/ + mv "${D}${VM_INSTALL_DIR}"/share/applications "${D}"/usr/share/ + rm -f "${D}${VM_INSTALL_DIR}"/share/icons/hicolor/{icon-theme.cache,index.theme} + mv "${D}${VM_INSTALL_DIR}"/share/icons "${D}"/usr/share/ + dodir /usr/share/mime + mv "${D}${VM_INSTALL_DIR}"/share/mime/packages "${D}"/usr/share/mime + sed -i -e "s:${D}::" "${D}"/usr/share/applications/*.desktop + + # Copy across the temporary /etc/vmware directory + dodir /etc/vmware/init.d + cp -r "${WORKDIR}"/vmware-confdir/* "${D}/etc/vmware" + mv "${D}"/etc/init.d/* "${D}/etc/vmware/init.d" + sed -i -e "s:/sbin/lsmod:/bin/lsmod:" "${D}"/etc/vmware/init.d/vmware + newinitd "${FILESDIR}/${PN}"-6.5.rc vmware + touch "${D}"/etc/vmware/networking + + # Setup the path environment + insinto /etc/env.d + doins "${FILESDIR}/90${PN}" + + # Fix some paths to allow included gtk to work + for i in "/etc/pango/pangorc" \ + "/etc/pango/pango.modules" \ + "/etc/gtk-2.0/gtk.immodules" \ + "/etc/gtk-2.0/gdk-pixbuf.loaders" ; do + sed -i -e "s:${D}::" "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf${i} ; + sed -i -e "s:${D}::" "${D}${VM_INSTALL_DIR}"/lib/vmware/installer/lib/libconf${i} ; + done +} + +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 "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 ${product_name} for safe unmerge" + /etc/init.d/vmware stop +} + +pkg_postrm() { + fdo-mime_desktop_database_update + gnome2_icon_cache_update +}