diff options
9 files changed, 381 insertions, 13 deletions
diff --git a/app-emulation/vmware-player/Manifest b/app-emulation/vmware-player/Manifest index aa1afbdba60a..4b2390d6188f 100644 --- a/app-emulation/vmware-player/Manifest +++ b/app-emulation/vmware-player/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX 1.0.9.126128/000_all_initd-location.patch 1131 RMD160 3ab69d825994cc3bb177143d27091fc292cec46a SHA1 14264460c8500f1ead267059e2b9b9a5dc8c057f SHA256 b4055370b0092e71a2b2b0f27edeb7bc063ad265f95ab4530e52c3ab3167ad62 AUX 1.0.9.126128/001_all_fix-permissions.patch 647 RMD160 0f25f7dd60dfcb5a72b1f7b9cf344d6f431143a9 SHA1 cabd3dd071ef62d4c70f52d1a3e02334ec7f3a73 SHA256 41492cde60da6d449c0f427ac7bd65598838ec17ac0e3a5f545feeb1d29ea391 AUX 1.0.9.126128/002_all_pagebreak-detection-fix.patch 800 RMD160 f21a51e552d025a5120519d6dcd41efc3835a432 SHA1 06133c332b6b1f57476b1154de108a9dfc35435d SHA256 d327d7cb2166b9ef4c8c286568c3a7eb64542212164d58b8a7a3c5e51e19ed6d @@ -9,26 +6,25 @@ AUX 1.0.9.126128/007_all_use-modprobe-over-insmod.patch 445 RMD160 186ab443a7332 AUX 1.0.9.126128/009_all_init.d-modules-warning.patch 991 RMD160 6205e976db47cd3361b5eca8593414d411a2ab8d SHA1 3742749baa606a57d447931f0af791696a49e660 SHA256 5fbc9f101abb3816a732f64a75e90ce7fcb6783c3cd7bae521d8785e88634498 AUX 2.5.4.246459/vmware-player-extras.py.patch 426 RMD160 458d95094d2e47726221ab427486b263b87e4297 SHA1 e41c36cfe150380aceafd1768e9e159fb4e1813f SHA256 1047cdc79d4bc138deaf809f191bdde69c4a5a8ed6ab5b595457a341ecb68abb AUX 2.5.4.246459/vmware-player.py.patch 2936 RMD160 6b9957799b3571f5382975c4d78bc3db7d16e666 SHA1 b32f9e4c2d2213872a7d8f88754a8552b113567f SHA256 fa711634a038d313769cf5d5180ca96bfb3ba18f392f6c0dd0672a4b4f7d6c9c +AUX 2.5.5.328052/vmware-player-extras.py.patch 426 RMD160 458d95094d2e47726221ab427486b263b87e4297 SHA1 e41c36cfe150380aceafd1768e9e159fb4e1813f SHA256 1047cdc79d4bc138deaf809f191bdde69c4a5a8ed6ab5b595457a341ecb68abb +AUX 2.5.5.328052/vmware-player.py.patch 2936 RMD160 6b9957799b3571f5382975c4d78bc3db7d16e666 SHA1 b32f9e4c2d2213872a7d8f88754a8552b113567f SHA256 fa711634a038d313769cf5d5180ca96bfb3ba18f392f6c0dd0672a4b4f7d6c9c AUX 90vmware-player 91 RMD160 025ff93348f5a838183e4f6108d7030168ca5ed5 SHA1 54c316adaafce41771eb26513c960dabbed61ce9 SHA256 9aee16313163bd9e161e81ef2876d086fb8972489100c4f8f0a4695ff16578f9 AUX helpers/module_patcher.sh 174 RMD160 0b2d1ee14443ec188546b090ae2c5e6efd132026 SHA1 f00ea5d03430be4969834bda822ed2865ef6e079 SHA256 1e63240f7e21e119c8e0b083f540fdde83fc22d781f3abe43927713a464898ea AUX helpers/unbundler.sh 1828 RMD160 d5bb43628d105c4372fa1fe7e7ebac29300fa91f SHA1 ed4b2645369b63e1cb6e322d412eb2ede1cbbdcd SHA256 4e71dd96f5136c1eb98be5e1184b9ec48ed9ac7935fa1defd94d501cef05eb78 AUX helpers/vmware-config.sh 497 RMD160 04addab6d99bf2c984f855a97b935ca8e0e584d8 SHA1 935eb3f565cebdca806d20e852a4bc75c7bc420b SHA256 72712959b26b22bfe8118561cd7b0751973d2a9dd8c2b15379cd42dc8a4ac246 AUX vmware-player-2.5.4.246459-installer.patch 2919 RMD160 7921285177ee1238501a95bbab78d100a307674d SHA1 df430803a06ef073a9725b2c86e210c3cc62ceed SHA256 ef63e8d642ae77bf10f22a586c4c37e5c387f76084d71350a9af418d1c5a2858 +AUX vmware-player-2.5.5.328052-installer.patch 2919 RMD160 7921285177ee1238501a95bbab78d100a307674d SHA1 df430803a06ef073a9725b2c86e210c3cc62ceed SHA256 ef63e8d642ae77bf10f22a586c4c37e5c387f76084d71350a9af418d1c5a2858 AUX vmware-player-2.5.rc 1434 RMD160 7bcf047a381e553cab882db6ab42b28903f972f9 SHA1 c668713f6d1fc61c226207b7176f106ac692454e SHA256 ef245385f56b2863580c0c6c00e470118ddc4cf364c818092568891ebba75429 AUX vmware-player.rc 1852 RMD160 e3cc563af38ef690b16bfbdcc0080156af2eab37 SHA1 5436cfd0e75ab842b86826b0abc298a2b9433963 SHA256 ef77428df2608613860cd79683648a45d99657150e7c901d7f449b8df4528fee AUX vmware-player.xml 1592 RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e8c SHA1 02db2ee7ca0abb8b8793c9f56d858bb08c1c715f SHA256 56aafee80ad705e8d832f8853c36d763d37b87d1cb132a41c50eb63085ae854d DIST VMware-Player-2.5.4-246459.i386.bundle 101120072 RMD160 81fcf4489f790865644457fffd88cfc27e65cf2c SHA1 4c4412c5807ecd00e66886e0e7c43ed61b62aab7 SHA256 c2fe8d107ba28d355e5a5d8604c985c0a4f795ea367b0e9652b4251c474a8f69 DIST VMware-Player-2.5.4-246459.x86_64.bundle 64397672 RMD160 a5ff1b6382d23cccb3dd3785dfce52ca9c4eb2b6 SHA1 bf7acfdcb44bf345d58f79ad1bcb04816f262d22 SHA256 c2f374a92026893f0b07044c4da51427079064cae17f0eb8681f8e01b8a54e3d +DIST VMware-Player-2.5.5-328052.i386.bundle 101121177 RMD160 15291894947d07ba932f7a6fadd3aeb1c7494be7 SHA1 abfdeaf2cac83c630662607e7b95439367376abf SHA256 a3662b50485b5e49264b354e7b289291c18fe55aa7784efc46a6fda90a3ac85e +DIST VMware-Player-2.5.5-328052.x86_64.bundle 64398262 RMD160 19fe46c8249b79552d3de26b4bf15080307bcfa6 SHA1 ff6eccba3125229e8adbc1cb96764c2f116d89c5 SHA256 4dc60c9391d5feac8f064fbf8d6f9982f20db7feab34eaa0b9bd7338fe88dcf4 DIST VMware-player-1.0.9-126128.tar.gz 38963760 RMD160 ed54df1e097894f11b7bbce8215d1f314df03217 SHA1 701ca338ec52dcb60db26908de8e0b5bfd981fb7 SHA256 3fae981892437ec1804a2171b701ca33000405fbd799fb06112fd70c939d8d75 DIST vmware-any-any-update115.tar.gz 493641 RMD160 56cabe56f70c01a22a7671e861cc5a2df19855c7 SHA1 ff9b6fdf6ca74495eb5f4822a1854fc91185377c SHA256 b1c14fa9514663b85c2efe8331407e71cce96e5a21a8b941fa570c960bbdcaa1 EBUILD vmware-player-1.0.9.126128.ebuild 2648 RMD160 acee4b2456d7e19939fa8d947096d16b20d35ac4 SHA1 e4e629df918b8f09fce898ef6dc7f5b6194bb344 SHA256 173a52b3ca1e774f863ad3dd3404a92f48a7da5255ed51c629c9e817058c563a EBUILD vmware-player-2.5.4.246459.ebuild 5149 RMD160 4a4588a87ba3878fbc3a7ac0beac6c8c838b399c SHA1 0813c9da792db6854bbe41a8b827a3bf88c4799b SHA256 e893da785e0750401f95ba78ec614bc46a0da6fd6ed6bf893a5dd7102f3f7de4 -MISC ChangeLog 26757 RMD160 425f7515552cd2c8b09204f5b9922b79acdca018 SHA1 2c94666f6b54c16544cd3358766a64caf48911ea SHA256 f4cb6e646fcfdeab69b07687704fd6211cce62cc54775147ef9df3f43b4fc4e0 +EBUILD vmware-player-2.5.5.328052.ebuild 5170 RMD160 d69071096e2170fe8706a6ddb791288d720d6502 SHA1 c398ef45f6679a003da30d0e9b69c1f3437ceca8 SHA256 05173ead3b323e2b557cb5a6f4db9da61056567762aa9e1d35203bec394de3f7 +MISC ChangeLog 27070 RMD160 5137dafda58e8dc179755a70b34f7a26267463b2 SHA1 89403169ae8120aad70572d63be0579262dc63ea SHA256 122de39e4e09f643cf8713acab62adf7014e225a2faed0d84895c424b6d018c0 MISC metadata.xml 567 RMD160 c0ff8ce9582a8a5a47328014a8d2f0856e40ab34 SHA1 2f687280a7f0fa6c3a83da165e84e2e553b6cce2 SHA256 4cfc81f281a4cdd8d9f75ad60006eed098dabb66bb035f9920ac344d4780151f ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.15 (GNU/Linux) - -iEYEARECAAYFAkwrYKkACgkQNQqtfCuFnePzAgCghJvWNuZgt3yUYBOvC3Vro4oH -w7UAoI/6rJXvi/PzYPasNWpPUubB8NhP -=jtQ8 ------END PGP SIGNATURE----- diff --git a/app-emulation/vmware-workstation/ChangeLog b/app-emulation/vmware-workstation/ChangeLog index e08e838e09f0..35abc0c4350e 100644 --- a/app-emulation/vmware-workstation/ChangeLog +++ b/app-emulation/vmware-workstation/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for app-emulation/vmware-workstation # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.213 2010/09/15 13:10:35 vadimk Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.214 2010/12/29 20:08:47 vadimk Exp $ + +*vmware-workstation-6.5.5.328052 (29 Dec 2010) + + 29 Dec 2010; Vadim Kuznetsov <vadimk@gentoo.org> + +files/vmware-workstation-6.5.5.328052-installer.patch, + +files/6.5.5.328052/vmware-player.py.patch, + +files/6.5.5.328052/vmware-player-extras.py.patch, + +files/6.5.5.328052/vmware-vix.py.patch, + +files/6.5.5.328052/vmware-workstation.py.patch, + +vmware-workstation-6.5.5.328052.ebuild: + Version bump. Bugs 350073, 345377 *vmware-workstation-6.5.4.246459 (15 Sep 2010) diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest index beb9df769fb6..fad655d7c82f 100644 --- a/app-emulation/vmware-workstation/Manifest +++ b/app-emulation/vmware-workstation/Manifest @@ -12,6 +12,10 @@ AUX 6.5.4.246459/vmware-player-extras.py.patch 426 RMD160 458d95094d2e47726221ab 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 90vmware-workstation 106 RMD160 471fb03d54bb48c651d4543f1c8ece1bb9b40c0a SHA1 3db7ec2a3b37a84328bf3d481a58b42499ef520b SHA256 c8f7143551f516b901143e60fc74e822ca3d235477d1c2a135bb36cbc639cf1e AUX helpers/module_patcher.sh 174 RMD160 0b2d1ee14443ec188546b090ae2c5e6efd132026 SHA1 f00ea5d03430be4969834bda822ed2865ef6e079 SHA256 1e63240f7e21e119c8e0b083f540fdde83fc22d781f3abe43927713a464898ea AUX helpers/unbundler.sh 1828 RMD160 d5bb43628d105c4372fa1fe7e7ebac29300fa91f SHA1 ed4b2645369b63e1cb6e322d412eb2ede1cbbdcd SHA256 4e71dd96f5136c1eb98be5e1184b9ec48ed9ac7935fa1defd94d501cef05eb78 @@ -19,6 +23,7 @@ AUX helpers/vmware-config.sh 497 RMD160 04addab6d99bf2c984f855a97b935ca8e0e584d8 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.desktop 605 RMD160 256b59a1e52b65279ef38b3dcf52c43a34090807 SHA1 8f8c1fded85070be0532e33f1bdc05425e33bfb1 SHA256 ae2f572200a16a1e1222e282268ae138588c0e7576045a584c1d17f54f379f3e AUX vmware-workstation.rc 1862 RMD160 000c71ee5c62edc27d3df3f23286e1fe8490516e SHA1 cf1db60598d0d2fe44260f7387537ec1babf3a52 SHA256 76e6ea8c199a4dced79a75a0346360714941ef192b61e4610c6229e071d64782 @@ -27,10 +32,13 @@ DIST VMware-Workstation-6.5.3-185404.i386.bundle 411839182 RMD160 c7ff79655b286f DIST VMware-Workstation-6.5.3-185404.x86_64.bundle 377656907 RMD160 6a8240a1b64422218425f228f6f94e006dd50e79 SHA1 8763f250a3ac5fc4698bd26319b93fecb498d542 SHA256 11484b6a759b7e1b73ccad27cdcbedb0bf3612baf40b4f3ac46b9a43d0777291 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 3240 RMD160 125c6ea7b44b293a87c17142e471af58dac144ac SHA1 b8944cabdb8803b21b6c90240ca81e40710a2cf1 SHA256 f5de4f8ea21a0e872b65781d44de879a0d2110cd051d43eb9cfb06bf3e4ae355 EBUILD vmware-workstation-6.5.3.185404.ebuild 5180 RMD160 31f6540a8700afed794b145c078826d17fd6c4a9 SHA1 5ff271a40c4af9586273a8f68fbf7937481f8bdc SHA256 bf53438b04f227e2365596d708b98779953d58c52e56160b3e26dddbe06f7ec9 EBUILD vmware-workstation-6.5.4.246459.ebuild 5000 RMD160 5aeae3b02f3ab61f13b79c5a1d140c9ef5580a0b SHA1 a821f54361ac56626a1702784d289ccde3133ba1 SHA256 7152937cc0a34c19756f3c144d210fdac0564bfe2446ac2682d1295e7fd50f61 -MISC ChangeLog 34973 RMD160 481e810d4b2e7a221fd4c483f39b6387bb137227 SHA1 a84eab19b4833288b962b6fc5c1fd15c76f6777a SHA256 00af96e79a5cf320b16e99d1f0ad9424e13b8ca041214d0ffcae3466a0535575 +EBUILD vmware-workstation-6.5.5.328052.ebuild 5000 RMD160 d0bd9e6c353eff39bb811fa80f7eb4a2b651ed4a SHA1 a752c7834507a4219fc665cebbd7c911e0c61145 SHA256 a64d333e8b6050fe95f24c3cda560f5bed51b541784bf76d049bfc2a059b1bb6 +MISC ChangeLog 35403 RMD160 a132ede8eac3b99ef371f2ea38b241478e9797e5 SHA1 101dc5523265363595f2ed8846ef8b3c1831b75f SHA256 4ca0b5c07ec234a98644656616bd0f6c8ea641dba205081a42bc5645c3f14d59 MISC metadata.xml 347 RMD160 09578738c25495a3f945f97e2a8a51d649476a5b SHA1 89b8a5cd78b0acc29dc50ac1c890b1f67b0303e5 SHA256 2dadcb5e8783b7dad15087e3812a292a158779b3269e65e39c285228cf0b1710 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 000000000000..eb9e723058cb --- /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 000000000000..49306c33f42e --- /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 000000000000..5984bdff95ad --- /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 000000000000..da139bbb1318 --- /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.5.328052-installer.patch b/app-emulation/vmware-workstation/files/vmware-workstation-6.5.5.328052-installer.patch new file mode 100644 index 000000000000..80a301e5c183 --- /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/vmware-workstation-6.5.5.328052.ebuild b/app-emulation/vmware-workstation/vmware-workstation-6.5.5.328052.ebuild new file mode 100644 index 000000000000..21d24edb572b --- /dev/null +++ b/app-emulation/vmware-workstation/vmware-workstation-6.5.5.328052.ebuild @@ -0,0 +1,174 @@ +# Copyright 1999-2010 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.1 2010/12/29 20:08:47 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 + !!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 +} |