vmware worsattion ebuild and pactches subbmitted be Michael Zanetta. Bug 291241.

svn path=/trunk/; revision=379

17 files changed, 697 insertions, 228 deletions

diff --git a/app-emulation/vmware-workstation/ChangeLog b/app-emulation/vmware-workstation/ChangeLog
index 28f27fd..f24be11 100644
--- a/app-emulation/vmware-workstation/ChangeLog
+++ b/app-emulation/vmware-workstation/ChangeLog
@@ -1,7 +1,20 @@
 # ChangeLog for app-emulation/vmware-workstation
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*vmware-workstation-7.0.1.227600 (01 Mar 2010)
+
+  01 Mar 2010; Vadim Kuznetsov <vadimk@gentoo.org> -files/5.5.9.126128,
+  -vmware-workstation-5.5.9.126128.ebuild,
+  +files/7.0.1.227600/vmware-player.py.patch,
+  +vmware-workstation-7.0.1.227600.ebuild,
+  +files/7.0.1.227600/vmware-player-app.py.patch,
+  +files/vmware-workstation-7.0.1.227600-installer.patch,
+  +files/7.0.1.227600/vmware-player-extras.py.patch,
+  +files/vmware-workstation-7.0.rc, +files/7.0.1.227600/vmware-vix.py.patch,
+  +files/7.0.1.227600/vmware-workstation.py.patch:
+  ebuild and patches subbmitted by Michael Zanetta. Bug 291241.
+
   25 Mar 2009; Mike Auty <ikelos@gentoo.org>
   vmware-workstation-6.5.1.126130.ebuild:
   gtkmm's accessibility is now always enabled (see bug #247249)
diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
index b72ccbc..a4264bc 100644
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@@ -1,27 +1,20 @@
-AUX 5.5.9.126128/000_all_initd-location.patch 1131 RMD160 3ab69d825994cc3bb177143d27091fc292cec46a SHA1 14264460c8500f1ead267059e2b9b9a5dc8c057f SHA256 b4055370b0092e71a2b2b0f27edeb7bc063ad265f95ab4530e52c3ab3167ad62
-AUX 5.5.9.126128/001_all_fix-permissions.patch 647 RMD160 0f25f7dd60dfcb5a72b1f7b9cf344d6f431143a9 SHA1 cabd3dd071ef62d4c70f52d1a3e02334ec7f3a73 SHA256 41492cde60da6d449c0f427ac7bd65598838ec17ac0e3a5f545feeb1d29ea391
-AUX 5.5.9.126128/002_all_pagebreak-detection-fix.patch 800 RMD160 f21a51e552d025a5120519d6dcd41efc3835a432 SHA1 06133c332b6b1f57476b1154de108a9dfc35435d SHA256 d327d7cb2166b9ef4c8c286568c3a7eb64542212164d58b8a7a3c5e51e19ed6d
-AUX 5.5.9.126128/004_all_do-not-build-modules.patch 589 RMD160 b2153579c65a232de9c2e6dbd9bbe108d85f95e5 SHA1 394a67a30f1f29084836183303641915ce982bfd SHA256 916754b0616ea330490b9572be1a9216bb7dd441ba328b1e01e777b29fac4e1e
-AUX 5.5.9.126128/007_all_use-modprobe-over-insmod.patch 445 RMD160 186ab443a733276a702dea16a23c04f7deed9d13 SHA1 c7113cd3f7f91527397f6fb07797d4e9c5c6f011 SHA256 bcf4930fae4812c8fbb2eb58b200f1da9441d97cd0c74b8ee6250cf097a28630
-AUX 5.5.9.126128/009_all_init.d-modules-warning.patch 991 RMD160 6205e976db47cd3361b5eca8593414d411a2ab8d SHA1 3742749baa606a57d447931f0af791696a49e660 SHA256 5fbc9f101abb3816a732f64a75e90ce7fcb6783c3cd7bae521d8785e88634498
-AUX 6.5.2.156735/vmware-player-extras.py.patch 426 RMD160 458d95094d2e47726221ab427486b263b87e4297 SHA1 e41c36cfe150380aceafd1768e9e159fb4e1813f SHA256 1047cdc79d4bc138deaf809f191bdde69c4a5a8ed6ab5b595457a341ecb68abb
-AUX 6.5.2.156735/vmware-player.py.patch 2936 RMD160 6b9957799b3571f5382975c4d78bc3db7d16e666 SHA1 b32f9e4c2d2213872a7d8f88754a8552b113567f SHA256 fa711634a038d313769cf5d5180ca96bfb3ba18f392f6c0dd0672a4b4f7d6c9c
-AUX 6.5.2.156735/vmware-vix.py.patch 439 RMD160 88e318b81efa5340830f1d9a65112ce2d23d0335 SHA1 ca84dacd405f675f31f2da5bea7cdf5d7d988739 SHA256 ad41ae4a4a580fa3b6f7ebd1d04d6e7885c3fb5695d5675ed168ce29925dbded
-AUX 6.5.2.156735/vmware-workstation.py.patch 948 RMD160 5ee87ba02c4bb50af44eb495ab72e1f148ff84ae SHA1 33b32bdbba9ec6115ea5d44080682ed789a7766b SHA256 4e9a01f8072a1294c0d5631daee703ea183e5a8edb6400f49deddd2b96bb2dc2
+AUX 7.0.1.227600/vmware-player-app.py.patch 2868 RMD160 b3a57a54dacb2cd82b951eafd5bce3b1126dad54 SHA1 41ce4f8788b43ea955f70faf121f75cbecee0467 SHA256 ae669b8799a0eb726b1a8345c5854dfc4758aca5c932c404e1fccd51d6faf818
+AUX 7.0.1.227600/vmware-player-extras.py.patch 426 RMD160 458d95094d2e47726221ab427486b263b87e4297 SHA1 e41c36cfe150380aceafd1768e9e159fb4e1813f SHA256 1047cdc79d4bc138deaf809f191bdde69c4a5a8ed6ab5b595457a341ecb68abb
+AUX 7.0.1.227600/vmware-player.py.patch 2936 RMD160 6b9957799b3571f5382975c4d78bc3db7d16e666 SHA1 b32f9e4c2d2213872a7d8f88754a8552b113567f SHA256 fa711634a038d313769cf5d5180ca96bfb3ba18f392f6c0dd0672a4b4f7d6c9c
+AUX 7.0.1.227600/vmware-vix.py.patch 795 RMD160 d230fd802e3f41afd1946aaf13637806923ee860 SHA1 bb3d166726512cd5d8515a87426968b682b342e5 SHA256 34be7416e10ceed19845b4f45756c7e99d1905967ac716b8a8e9e61d5270f4fa
+AUX 7.0.1.227600/vmware-workstation.py.patch 3194 RMD160 29ad4872c9269836efe43c3a2b41562d315d9ff9 SHA1 9b2fe24f045d695bb6afa55fb2dae407e39b5662 SHA256 0cd03b9b415cf1289b2da57d76cf96485c77b05204c722094277cba24571c734
 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
 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.2.156735-installer.patch 2919 RMD160 7921285177ee1238501a95bbab78d100a307674d SHA1 df430803a06ef073a9725b2c86e210c3cc62ceed SHA256 ef63e8d642ae77bf10f22a586c4c37e5c387f76084d71350a9af418d1c5a2858
 AUX vmware-workstation-6.5.rc 1440 RMD160 aeadd25e4dcbd9716997ebf78b63ab1f579811c1 SHA1 18b316147c8611aa6c7f6cf552fa38d1c8170fdb SHA256 10c4e9b24c1af66abf3a2962467699bf36982822b911eeb36c45a8ed84e93854
+AUX vmware-workstation-7.0.1.227600-installer.patch 8007 RMD160 6db58cf39b1fd35074cc305b809740efd8ba6dd0 SHA1 5f085b257d6db09266c6bc9099c7fd29d41b3753 SHA256 ce7bbcdd1e802d8f964301cd10ba29a90aa07e709388d659587516c258abb163
+AUX vmware-workstation-7.0.rc 1444 RMD160 cfc983d5606fba3972c89e9094f0f6af89a7a2fb SHA1 fc0ed37ffa96106febb6d7e86e886cbd451481af SHA256 86af02f8d8da8c6acc7a190eef5368782455bc520be1cf3d4fd18d5d312d4bab
 AUX vmware-workstation.desktop 605 RMD160 256b59a1e52b65279ef38b3dcf52c43a34090807 SHA1 8f8c1fded85070be0532e33f1bdc05425e33bfb1 SHA256 ae2f572200a16a1e1222e282268ae138588c0e7576045a584c1d17f54f379f3e
 AUX vmware-workstation.rc 1862 RMD160 000c71ee5c62edc27d3df3f23286e1fe8490516e SHA1 cf1db60598d0d2fe44260f7387537ec1babf3a52 SHA256 76e6ea8c199a4dced79a75a0346360714941ef192b61e4610c6229e071d64782
 AUX vmware-workstation.xml 1592 RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e8c SHA1 02db2ee7ca0abb8b8793c9f56d858bb08c1c715f SHA256 56aafee80ad705e8d832f8853c36d763d37b87d1cb132a41c50eb63085ae854d
-DIST VMware-Workstation-6.5.2-156735.i386.bundle 352992724 RMD160 0ad7fb8c037046ffd2192670a270f519ab6df328 SHA1 d508111adf479d82049c323b1d0b82200c0ab4dd SHA256 89f3330fd208382f41f30bf335e3205f256447d8baf2bdb3bf67ae79bbff4220
-DIST VMware-Workstation-6.5.2-156735.x86_64.bundle 356786849 RMD160 13d31a25a1a8008964df65ea2fd722226bca19e1 SHA1 04aa442a2b9bf2c67d6266a410b20ef146b93bef SHA256 aa11e961519488254a4df2287aaba6183c9db711663de36fa7efe64b789febec
-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 3249 RMD160 e461d58c5db3491d948b6b7d7dbd138f3ff9732e SHA1 1f261c9bbf3cd040334677d145502c8462f55335 SHA256 4c1791dbcbaa4184b2eb6ba41b94e40dcbfb42ce31ed141abc0ed7730dde17fd
-EBUILD vmware-workstation-6.5.2.156735.ebuild 5348 RMD160 c4da7e3e76cf192c017f8d7c61ae4961960752b7 SHA1 56a966963ffb4f4807d4e94338f934823a086da0 SHA256 1349b1c4f671b932f33dc0a8da3cfdfc6b30bb0c82d10885156fb93b727465e4
-MISC ChangeLog 470 RMD160 809cc8a38408b82f2871713959a03955282389fa SHA1 3bb269911ae541db864f7074ab052f70987a999f SHA256 5c48eb39ce34eb1acc1e2d1f8e30e3a6222aa02b5e9bfd7c8186a40ea031694e
+DIST VMware-Workstation-Full-7.0.1-227600.i386.bundle 286244988 RMD160 9db7f06a3662b4b474cddb61675e36071eb16711 SHA1 f6d0789afa7927ca154973a071603a0bd098e697 SHA256 cc003ff5a811ace83172712e435047d41f0e883320d7d0798e69940389e31d57
+DIST VMware-Workstation-Full-7.0.1-227600.x86_64.bundle 292113593 RMD160 ac519500f4b3cfc2849c8a3f5ba4ddd02db0f9a3 SHA1 a901c45a2a02678b0d1722e8f27152c3af12a7ac SHA256 e188381d0569e8cc1f652df8d12f4572e207e40dd9c726af02d09c42503551d3
+EBUILD vmware-workstation-7.0.1.227600.ebuild 5583 RMD160 9ba2a1698c4618d95bed0ca6e42cb4aaf38c8762 SHA1 496b309df90cd5fae119e2cf94d1bcbdc29049f6 SHA256 409e2c21cc2b7a37bab75faec73aa87c402888bf91b3bb2c5d849a651e178a07
+MISC ChangeLog 470 RMD160 858026a2ba35bea7a9e1879813fc6e7fea5c4b7e SHA1 e53c03df563a8b9d59c7ce5acd280dea2e0148ff SHA256 b391f0ea5538f9a79a2c8c3d2fa7b7d41541d9024b0212f34348ead260265073
diff --git a/app-emulation/vmware-workstation/files/5.5.9.126128/000_all_initd-location.patch b/app-emulation/vmware-workstation/files/5.5.9.126128/000_all_initd-location.patch
deleted file mode 100644
index 1d864f7..0000000
--- a/app-emulation/vmware-workstation/files/5.5.9.126128/000_all_initd-location.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- vmware-distrib/bin/vmware-config.pl.ori	2005-11-09 01:45:08.000000000 +0000
-+++ vmware-distrib/bin/vmware-config.pl	2005-11-09 01:48:21.000000000 +0000
-@@ -8433,7 +8433,7 @@
-          error('Please shut down any running VMs and run this script again.' .
-                "\n\n");
-       } else {
--         if (system(shell_string(db_get_answer('INITSCRIPTSDIR') . '/vmware')
-+         if (system(shell_string('/etc/init.d' . '/vmware')
-                     . ' stop')) {
-             error('Unable to stop services for ' . vmware_product_name() .
-                   "\n\n");
-@@ -8463,8 +8463,8 @@
-   }
-   if (vmware_product() ne 'server') {
-     configure_gtk2();
--    createMimePackageFile();
--    configureDesktopFiles();
-+#   createMimePackageFile();
-+#   configureDesktopFiles();
-     configure_mon();
-     configure_pp();
-     configure_net();
-@@ -8532,7 +8532,7 @@
-   db_save();
-   # Then start VMware's services
-   if (!$gOption{'skipstopstart'}) {
--    system(shell_string(db_get_answer('INITSCRIPTSDIR') . '/vmware') . ' start');
-+    system(shell_string('/etc/init.d' . '/vmware') . ' start');
-     print "\n";
-   }
- 
diff --git a/app-emulation/vmware-workstation/files/5.5.9.126128/001_all_fix-permissions.patch b/app-emulation/vmware-workstation/files/5.5.9.126128/001_all_fix-permissions.patch
deleted file mode 100644
index e646b7b..0000000
--- a/app-emulation/vmware-workstation/files/5.5.9.126128/001_all_fix-permissions.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -urN vmware-distrib.orig/bin/vmware-config.pl vmware-distrib/bin/vmware-config.pl
---- vmware-distrib.orig/bin/vmware-config.pl	2005-12-16 00:51:03.000000000 -0500
-+++ vmware-distrib/bin/vmware-config.pl	2005-12-21 14:34:03.000000000 -0500
-@@ -7327,7 +7327,10 @@
-     error('Unable to write configuration file "' . $name . '".' . "\n\n");
-   }
-   db_add_file($name, 0x1);
--  safe_chmod(0644, $name);
-+  safe_chmod(0664, $name);
-+  my $gid = (getgrnam('vmware'))[2];
-+  my $uid = (stat($name))[4];
-+  safe_chown($uid,$gid,$name);
- 
-   # Append the promotional configuration if it exists
-   $promoconfig = $libdir . '/configurator/PROMOCONFIG';
diff --git a/app-emulation/vmware-workstation/files/5.5.9.126128/002_all_pagebreak-detection-fix.patch b/app-emulation/vmware-workstation/files/5.5.9.126128/002_all_pagebreak-detection-fix.patch
deleted file mode 100644
index fd3fc76..0000000
--- a/app-emulation/vmware-workstation/files/5.5.9.126128/002_all_pagebreak-detection-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ur vmware-distrib.orig/bin/vmware-config.pl vmware-distrib/bin/vmware-config.pl
---- vmware-distrib.orig/bin/vmware-config.pl	2006-03-24 23:13:05.000000000 +0100
-+++ vmware-distrib/bin/vmware-config.pl	2006-03-24 23:26:40.000000000 +0100
-@@ -2015,9 +2015,9 @@
-       . shell_string($pattern));
-     chomp($header_page_offset);
-     # Ignore PAGE_OFFSET if we cannot parse it.
--    if ($header_page_offset =~ /^$pattern \(?0x([0-9a-fA-F]{8,})/) {
-+    if ($header_page_offset =~ /^$pattern \(?(\([^)]*\))?\)?0x([0-9a-fA-F]{8,}).*$/) {
-       # We found a valid page offset
--      $header_page_offset = $1;
-+      $header_page_offset = $2;
-       if (defined($gSystem{'page_offset'}) and
-           not (lc($header_page_offset) eq lc($gSystem{'page_offset'}))) {
-         if ($source eq 'user') {
diff --git a/app-emulation/vmware-workstation/files/5.5.9.126128/004_all_do-not-build-modules.patch b/app-emulation/vmware-workstation/files/5.5.9.126128/004_all_do-not-build-modules.patch
deleted file mode 100644
index cec3b3e..0000000
--- a/app-emulation/vmware-workstation/files/5.5.9.126128/004_all_do-not-build-modules.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -uNr vmware-server-distrib.orig/bin/vmware-config.pl vmware-server-distrib/bin/vmware-config.pl
---- vmware-server-distrib.orig/bin/vmware-config.pl	2006-02-18 18:12:26.000000000 +0000
-+++ vmware-server-distrib/bin/vmware-config.pl	2006-02-18 18:14:17.000000000 +0000
-@@ -8571,10 +8571,10 @@
-     configure_gtk2();
- #   createMimePackageFile();
- #   configureDesktopFiles();
--    configure_mon();
--    configure_pp();
-+#   configure_mon();
-+#   configure_pp();
-     configure_net();
--    build_vmnet();
-+#    build_vmnet();
-   }
- 
-   # Create the directory for the UNIX domain sockets
diff --git a/app-emulation/vmware-workstation/files/5.5.9.126128/007_all_use-modprobe-over-insmod.patch b/app-emulation/vmware-workstation/files/5.5.9.126128/007_all_use-modprobe-over-insmod.patch
deleted file mode 100644
index 5509d24..0000000
--- a/app-emulation/vmware-workstation/files/5.5.9.126128/007_all_use-modprobe-over-insmod.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr vmware-server-distrib/installer/services.sh vmware-server-distrib.new/installer/services.sh
---- vmware-server-distrib/installer/services.sh	2006-02-05 00:21:25.000000000 +0000
-+++ vmware-server-distrib.new/installer/services.sh	2006-02-20 23:48:07.000000000 +0000
-@@ -538,7 +538,7 @@
- }
- 
- vmware_load_module() {
--   /sbin/insmod -s -f "/lib/modules/`uname -r`/misc/$1.o" || exit 1
-+   /sbin/modprobe -s "$1" || exit 1
-    exit 0
- }
- 
diff --git a/app-emulation/vmware-workstation/files/5.5.9.126128/009_all_init.d-modules-warning.patch b/app-emulation/vmware-workstation/files/5.5.9.126128/009_all_init.d-modules-warning.patch
deleted file mode 100644
index 4eab043..0000000
--- a/app-emulation/vmware-workstation/files/5.5.9.126128/009_all_init.d-modules-warning.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -uNr vmware-server-distrib.orig/installer/services.sh vmware-server-distrib/installer/services.sh
---- vmware-server-distrib.orig/installer/services.sh	2006-07-01 03:14:16.000000000 +0000
-+++ vmware-server-distrib/installer/services.sh	2006-07-14 11:59:28.000000000 +0000
-@@ -606,8 +606,13 @@
-    start)
-       if [ -e "$vmware_etc_dir"/not_configured ]; then
-          echo "`vmware_product_name`"' is installed, but it has not been (correctly) configured'
--         echo 'for the running kernel. To (re-)configure it, invoke the'
--         echo 'following command: '"$vmdb_answer_BINDIR"'/vmware-config.pl.'
-+         echo 'for the running kernel.'
-+         echo 
-+         echo 'Please ensure that the modules have been compiled for this kernel:'
-+         echo '  emerge --oneshot vmware-modules'
-+         echo
-+         echo 'Also ensure '"`vmware_product_name`"' has been configured:'
-+         echo '  '"$vmdb_answer_BINDIR"'/vmware-config.pl'
-          echo
- 
-          exit 1
diff --git a/app-emulation/vmware-workstation/files/7.0.1.227600/vmware-player-app.py.patch b/app-emulation/vmware-workstation/files/7.0.1.227600/vmware-player-app.py.patch
new file mode 100644
index 0000000..b3d97a2
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/7.0.1.227600/vmware-player-app.py.patch
@@ -0,0 +1,70 @@
+--- vmware-player-app.py.orig	2010-02-04 19:50:15.000000000 +0100
++++ vmware-player-app.py	2010-02-27 21:05:08.000000000 +0100
+@@ -6,7 +6,8 @@
+ 
+ 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'
+ SETTINGS = \
+     { 'libdir': DEST,
+@@ -25,7 +26,7 @@
+ 
+ # Player and Workstation both depend on some configuration living
+ # in /etc/vmware
+-ETCDIR = Destination('/etc/vmware')
++ETCDIR = SYSCONFDIR/'vmware'
+ 
+ class PlayerApp(Installer):
+    def PreTransactionInstall(self, old, new, upgrade):
+@@ -106,13 +107,14 @@
+       not themeIndex.exists() and self.AddTarget('File', 'files/index.theme', themeIndex)
+ 
+       # Services
+-      self.RegisterService(name='vmware', src='etc/init.d/services.sh', start=19, stop=8)
++      self.AddTarget('File', 'etc/init.d/services.sh', ETCDIR/'init.d/vmware')
++      # self.RegisterService(name='vmware', src='etc/init.d/services.sh', start=19, stop=8)
+ 
+       # modprobe.d script.  Only install this on systems where modprobe.d
+       # exists.
+       if path('/etc/modprobe.d').exists():
+          self.AddTarget('File', 'etc/modprobe.d/modprobe-vmware-fuse.conf',
+-                        '/etc/modprobe.d/vmware-fuse.conf')
++                        SYSCONFDIR/'modprobe.d/vmware-fuse.conf')
+ 
+    def _scriptRunnable(self, script):
+       """ Returns True if the script exists and is in a runnable state """
+@@ -178,7 +180,7 @@
+       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)
+ 
+       # Make sure we kill all processes that should not be running!
+       self._killVMwareProcesses()
+@@ -228,9 +230,10 @@
+       for key, val in SETTINGS.items():
+          self.RunCommand(CONFIG, '-s', key, val)
+ 
+-      bootstrap = ETCDIR/'bootstrap'
++      import os
++      bootstrap = path(os.environ['WORKDIR'])/'vmware-confdir/bootstrap'
+       # Create the bootstrap file.
+-      bootstrap.unlink(ignore_errors=True)
++      #bootstrap.unlink(ignore_errors=True)
+       # Fill it.
+       for i in ('PREFIX', 'BINDIR', 'SBINDIR', 'LIBDIR', 'DATADIR',
+                 'SYSCONFDIR', 'DOCDIR', 'MANDIR', 'INCLUDEDIR', 'INITDIR',
+@@ -343,7 +346,8 @@
+ 
+    def _isGConfUsable(self):
+       """ Return True if GConf settings can be configured, otherwise False """
+-      return self.RunCommand('gconftool-2', '--help', ignoreErrors=True, noLogging=True).retCode == 0
++      return False
++#      return self.RunCommand('gconftool-2', '--help', ignoreErrors=True, noLogging=True).retCode == 0
+ 
+    def _configureVMStreamingHandlers(self):
+       """ Configures handlers for vm:// and vms:// used for VM streaming """
diff --git a/app-emulation/vmware-workstation/files/7.0.1.227600/vmware-player-extras.py.patch b/app-emulation/vmware-workstation/files/7.0.1.227600/vmware-player-extras.py.patch
new file mode 100644
index 0000000..eb9e723
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/7.0.1.227600/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/7.0.1.227600/vmware-player.py.patch b/app-emulation/vmware-workstation/files/7.0.1.227600/vmware-player.py.patch
new file mode 100644
index 0000000..49306c3
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/7.0.1.227600/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/7.0.1.227600/vmware-vix.py.patch b/app-emulation/vmware-workstation/files/7.0.1.227600/vmware-vix.py.patch
new file mode 100644
index 0000000..beb2586
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/7.0.1.227600/vmware-vix.py.patch
@@ -0,0 +1,21 @@
+--- vmware-vix.py.orig	2010-02-04 19:50:56.000000000 +0100
++++ vmware-vix.py	2010-02-05 02:17:54.000000000 +0100
+@@ -6,7 +6,8 @@
+ DEST = LIBDIR/'vmware-vix'
+ SETTINGS = { 'vmware.fullpath': BINDIR/'vmware',
+              'vix.libdir': DEST, }
+-CONF = DEST/'setup/vmware-config'
++import os
++CONF = path(os.environ['WORKDIR'])/'vmware-config.sh'
+ 
+ class VIX(Installer):
+    def PreTransactionInstall(self, old, new, upgrade):
+@@ -29,7 +30,7 @@
+       for key, val in SETTINGS.items():
+          self.RunCommand(CONF, '-s', key, val)
+       # Add link to deprecated uninstall mechanism to catch downgrades
+-      self.AddUninstallLinks('vix')
++      # self.AddUninstallLinks('vix')
+ 
+    def PreUninstall(self, old, new, upgrade):
+       # XXX: VIX may have been removed out from underneath us if
diff --git a/app-emulation/vmware-workstation/files/7.0.1.227600/vmware-workstation.py.patch b/app-emulation/vmware-workstation/files/7.0.1.227600/vmware-workstation.py.patch
new file mode 100644
index 0000000..766e86e
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/7.0.1.227600/vmware-workstation.py.patch
@@ -0,0 +1,79 @@
+--- vmware-workstation.py.orig	2010-02-04 18:50:30.000000000 +0000
++++ vmware-workstation.py	2010-02-25 18:25:37.000000000 +0000
+@@ -4,11 +4,12 @@
+ VMware Workstation component installer.
+ """
+ DEST = LIBDIR/'vmware'
+-conf = DEST/'setup/vmware-config'
++import os
++conf = path(os.environ['WORKDIR'])/'vmware-config.sh'
+ 
+-LIMITSFILE = Destination('/etc/security/limits.conf')
++LIMITSFILE = SYSCONFDIR/'security/limits.conf'
+ NOFILE_MINIMUM = 4096
+-PAMLOGINFILE = Destination('/etc/pam.d/login')
++PAMLOGINFILE = SYSCONFDIR/'pam.d/login'
+ 
+ vmwareSentinel = '# Automatically generated by the VMware Installer - DO NOT REMOVE\n'
+ pamLoginLine = 'session    required   pam_limits.so\n'
+@@ -109,7 +110,7 @@
+       self.SetPermission(DEST/'bin/*', BINARY)
+ 
+       eclipse = self.GetAnswer('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 _killVMwareProcesses(self):
+@@ -179,13 +180,13 @@
+       # Player is still installed though, so we want to be
+       # sure to restart the services for Player.
+       script = INITSCRIPTDIR/'vmware'
+-      if script.exists():
++      if False:
+          self.RunCommand(script, 'stop', ignoreErrors=True)
+          self.RunCommand(script, 'start')
+ 
+    def _ClearVMwareEclipseINI(self):
+       eclipse = self.GetAnswer('eclipse')
+-      if eclipse:
++      if False:
+          try:
+             # Check if our section already exists at the beginning
+             # of the file.  If it does clear it.
+@@ -202,7 +203,7 @@
+    def _ModifyEclipseINI(self):
+       eclipse = self.GetAnswer('eclipse')
+       log.Debug('ModifyINI: Eclipse is: %s', eclipse)
+-      if eclipse:
++      if False:
+          log.Debug('ModifyINI: Eclipse path was found at %s', eclipse)
+          # Modify the eclipse.ini file to include the lines:
+          # -vm
+@@ -234,7 +235,7 @@
+       missingFeatures = []
+       pluginDir = DEST/'eclipse-ng'
+       xmlfile = pluginDir/'feature.xml'
+-      if xmlfile.exists():
++      if False:
+          text = xmlfile.bytes()
+          req = str(re.findall('<requires>.*</requires>', text, re.DOTALL))
+          reqPlugins = re.findall('import plugin="(.*?)"', str(req), re.DOTALL)
+@@ -284,7 +285,7 @@
+       eclipse = self.GetAnswer('eclipse')
+       eclipseCCPP = self.GetAnswer('eclipseCCPP')
+       log.Debug('Eclipse(C/C++): Eclipse is: %s', eclipse)
+-      if eclipse and eclipseCCPP.lower() == 'yes':
++      if False and eclipseCCPP.lower() == 'yes':
+          success=False
+          pluginPath = DEST/'eclipse-ng'
+          configFile = pluginPath/'vmware-eclipse-update-site.config'
+@@ -459,7 +460,7 @@
+       # to check.
+       nofileHL = self.GetAnswer('nofileHardLimit')
+       if nofileHL and (self.hardLimit != int(nofileHL)):
+-         limitsFile = Destination('/etc/security/limits.conf')
++         limitsFile = LIMITSFILE
+          if limitsFile.exists():
+             self._ClearVMwareLimitsConf(limitsFile, restoreEntry=False)
+             log.Debug('Modifying /etc/security/limits.conf hard limit from '
diff --git a/app-emulation/vmware-workstation/files/vmware-workstation-7.0.1.227600-installer.patch b/app-emulation/vmware-workstation/files/vmware-workstation-7.0.1.227600-installer.patch
new file mode 100644
index 0000000..cb51ef2
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/vmware-workstation-7.0.1.227600-installer.patch
@@ -0,0 +1,163 @@
+diff -Naur payload.orig/install/vmware-installer/.installer/1.1/vmware-installer.py payload/install/vmware-installer/.installer/1.1/vmware-installer.py
+--- payload.orig/install/vmware-installer/.installer/1.1/vmware-installer.py	2010-02-04 19:50:58.000000000 +0100
++++ payload/install/vmware-installer/.installer/1.1/vmware-installer.py	2010-02-24 00:05:53.000000000 +0100
+@@ -10,7 +10,7 @@
+ 
+ # The 1.0 Installer looks in very specific locations for existing installs
+ # (/etc/vmware and /etc/vmware-vix)
+-OLDCONFDIR = Destination('/etc/vmware')
++OLDCONFDIR = SYSCONFDIR/'vmware'
+ OLDBOOTSTRAPS = ['/etc/vmware', '/etc/vmware-vix']
+ 
+ installerLinks = ['vmware-installer', 'vmware-uninstall',
+@@ -149,7 +149,8 @@
+          path(bin/'vmware-installer').symlink(str(BINDIR/'vmware-installer'))
+ 
+          # Create necessary bootstrap files
+-         bootstrap = CONFDIR/'bootstrap'
++         import os
++         bootstrap = path(os.environ['WORKDIR'])/'vmware-confdir/bootstrap'
+          bootstrap.write_bytes('VMWARE_INSTALLER="%s"\n\n' % DEST, append=False)
+          bootstrap.write_bytes('VERSION="%s"\n' % '1.1', append=True)
+          bootstrap.write_bytes('VMISPYVERSION="%s"\n' % PYTHON_VERSION, append=True)
+@@ -159,7 +160,7 @@
+          # don't already exist
+          for bstrap in OLDBOOTSTRAPS:
+             bootstrap = path(bstrap)/'bootstrap'
+-            if not bootstrap.exists():
++            if False:
+                try:
+                   path(bstrap).makedirs()
+                except OSError:
+@@ -228,7 +229,7 @@
+          # don't clean up the bootstrap files.
+          for suffix in ['', '-vix']:
+             oldfile = path('/etc/vmware%s/bootstrap' % suffix)
+-            if oldfile.exists():
++            if False:
+                text = oldfile.bytes()
+                if text.find('VERSION="1.0"') != -1:
+                   bstraps.remove('/etc/vmware%s' % suffix)
+diff -Naur payload.orig/install/vmware-installer/vmis/core/common.py payload/install/vmware-installer/vmis/core/common.py
+--- payload.orig/install/vmware-installer/vmis/core/common.py	2010-02-04 19:50:58.000000000 +0100
++++ payload/install/vmware-installer/vmis/core/common.py	2010-02-05 17:31:31.000000000 +0100
+@@ -247,4 +247,3 @@
+ # nonexistant DB.
+ SYSTEM_BOOTSTRAP = path('/etc/vmware-installer/bootstrap')
+ SYSTEM_DATABASE = path('/etc/vmware-installer/database')
+-
+diff -Naur payload.orig/install/vmware-installer/vmis/core/dependency.py payload/install/vmware-installer/vmis/core/dependency.py
+--- payload.orig/install/vmware-installer/vmis/core/dependency.py	2010-02-04 19:50:58.000000000 +0100
++++ payload/install/vmware-installer/vmis/core/dependency.py	2010-02-04 19:57:42.000000000 +0100
+@@ -291,7 +291,7 @@
+                      log.debug('  found match: %s' % possibleDep)
+                      node.addDependency(possibleDep, dependency.optional)
+                      matched = True
+-               if not matched and not dependency.optional and not force:
++               if False:
+                   exception = UnsatisfiedDependency('Component %s has unsatisfied '
+                                               'dependency: %s' % (node.component,
+                                               dependency))
+diff -Naur payload.orig/install/vmware-installer/vmis/core/env.py payload/install/vmware-installer/vmis/core/env.py
+--- payload.orig/install/vmware-installer/vmis/core/env.py	2010-02-04 19:50:58.000000000 +0100
++++ payload/install/vmware-installer/vmis/core/env.py	2010-02-04 19:56:51.000000000 +0100
+@@ -305,6 +305,8 @@
+    # Python will interpret 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)
+ 
+    componentCoreVersion = component.coreVersion
+    if component.name == 'vmware-installer': # XXX: HARDCODE - Fix this.
+diff -Naur payload.orig/install/vmware-installer/vmis/core/files.py payload/install/vmware-installer/vmis/core/files.py
+--- payload.orig/install/vmware-installer/vmis/core/files.py	2010-02-04 19:50:58.000000000 +0100
++++ payload/install/vmware-installer/vmis/core/files.py	2010-02-09 00:09:20.000000000 +0100
+@@ -17,7 +17,8 @@
+    Check to see if VMIS_COMPONENT_ONLY is defined.  Return true if it is,
+    false otherwise.
+    """
+-   return 'VMIS_COMPONENT_ONLY' in globals()
++   return False
++#   return 'VMIS_COMPONENT_ONLY' in globals()
+ 
+ 
+ # XXX: This could be handled better.
+@@ -196,6 +197,7 @@
+    id = 0
+ 
+    def Install(self, component, dest, precopy=None):
++
+       if self.IsRelative():
+          entries = list(component.Glob(self))
+ 
+diff -Naur payload.orig/install/vmware-installer/vmis/core/questions.py payload/install/vmware-installer/vmis/core/questions.py
+--- payload.orig/install/vmware-installer/vmis/core/questions.py	2010-02-04 19:50:58.000000000 +0100
++++ payload/install/vmware-installer/vmis/core/questions.py	2010-02-04 19:56:51.000000000 +0100
+@@ -199,6 +199,9 @@
+       """
+       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 -Naur payload.orig/install/vmware-installer/vmis/db.py payload/install/vmware-installer/vmis/db.py
+--- payload.orig/install/vmware-installer/vmis/db.py	2010-02-04 19:50:58.000000000 +0100
++++ payload/install/vmware-installer/vmis/db.py	2010-02-04 21:23:04.000000000 +0100
+@@ -569,7 +569,7 @@
+ 
+             if row:
+                coreID = row['id'];
+-            else:
++            elif False:
+                cur = self._db.execute(u'SELECT id, name, version FROM components WHERE name="vmware-installer"')
+                rows = cur.fetchone();
+                cur.close();
+diff -Naur payload.orig/install/vmware-installer/vmis/__init__.py payload/install/vmware-installer/vmis/__init__.py
+--- payload.orig/install/vmware-installer/vmis/__init__.py	2010-02-04 19:50:58.000000000 +0100
++++ payload/install/vmware-installer/vmis/__init__.py	2010-02-04 19:56:51.000000000 +0100
+@@ -20,7 +20,7 @@
+ MAJOR_VERSION = VERSION_INFO[0]
+ VMISPYVERSION = os.environ.get('VMISPYVERSION')
+ 
+-CONFDIR = path(u'/etc/vmware-installer')
++CONFDIR = path(u'./vmware-confdir')
+ DATABASE_PATH = CONFDIR/'database'
+ 
+ # Database setting for use by the installer and its component.
+diff -Naur payload.orig/install/vmware-installer/vmis/util/log.py payload/install/vmware-installer/vmis/util/log.py
+--- payload.orig/install/vmware-installer/vmis/util/log.py	2010-02-04 19:50:58.000000000 +0100
++++ payload/install/vmware-installer/vmis/util/log.py	2010-02-04 19:56:51.000000000 +0100
+@@ -24,12 +24,13 @@
+    username = pwd.getpwuid(os.getuid())[0]
+    dirname = '/tmp/vmware-%s' % username
+    LOG_FILE = '%s/vmware-installer.log' % dirname
++LOG_FILE = './vmware-installer.log'
+    # Make sure this directory exists.  Assuming /tmp exists.
+-   try:
+-      os.mkdir(dirname)
+-   except OSError:
++#   try:
++#      os.mkdir(dirname)
++#   except OSError:
+       # It's okay if it already exists
+-      pass
++#      pass
+ 
+ if level <= logging.DEBUG:
+    MAX_BYTES = 0
+diff -Naur payload.orig/install/vmware-installer/vmware-installer.py payload/install/vmware-installer/vmware-installer.py
+--- payload.orig/install/vmware-installer/vmware-installer.py	2010-02-04 19:50:58.000000000 +0100
++++ payload/install/vmware-installer/vmware-installer.py	2010-02-09 00:09:45.000000000 +0100
+@@ -200,7 +200,7 @@
+       # if it exists and continue with installation.
+       dbase = SYSTEM_DATABASE
+       if dbase.exists():
+-         dbase.remove(ignore_errors=True);
++#         dbase.remove(ignore_errors=True);
+          log.error('Bootstrap file was missing, but database file exists.  '
+                    'Installer system state is corrupted.  Removing '
+                    '%s and starting with an empty installer database.'
diff --git a/app-emulation/vmware-workstation/files/vmware-workstation-7.0.rc b/app-emulation/vmware-workstation/files/vmware-workstation-7.0.rc
new file mode 100644
index 0000000..6231014
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/vmware-workstation-7.0.rc
@@ -0,0 +1,74 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/files/vmware-workstation-6.5.rc,v 1.1 2008/11/09 20:56:55 ikelos Exp $
+
+depend() {
+	need localmount hald
+	use logger net
+	after samba
+}
+
+vmware_prettify() {
+	# Yea, the code is ugly but the output is pretty
+	state=$1
+	waserror=0
+	msgtype=0
+	while read line
+	do
+		[ "${line}" = "" ] && continue
+		if [ ${msgtype} -le 0 ]
+		then
+			if [ ${msgtype} -eq -1 ]
+			then
+				ewarn ${line}
+				continue
+			fi
+			case ${line} in
+			*:*)
+				einfon ${line}
+				echo
+				eend 0
+				msgtype=1;;
+			*)
+				ewarn ${line}
+				msgtype=-1
+				waserror=1;;
+			esac
+			continue
+		fi
+
+		# Strip out anything after the <esc> code
+		message=`echo ${line} | sed -e "s/^\(.*\).*$/\1/"`
+		einfon "  ${message}"
+		echo
+
+		echo ${line} | grep -q done
+		status=$?
+		eend ${status}
+
+		if [ ${status} -eq 0 ]
+		then
+			logger -p local0.err -t vmware-${state} "${line}"
+			waserror=${status}
+		fi
+	done
+	if [ "${msgtype}" = "-1" ]
+	then
+		eend 1 "VMware is not properly configured! See above."
+	fi
+	return ${waserror}
+}
+
+start() {
+	test -x /etc/vmware/init.d/vmware || \
+		eend 1 "vmware init script not found. Aborting" || return 1
+
+	/etc/vmware/init.d/vmware start | vmware_prettify start
+	return $?
+}
+
+stop() {
+	/etc/vmware/init.d/vmware stop | vmware_prettify stop
+	return $?
+}
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
deleted file mode 100644
index a428b8a..0000000
--- a/app-emulation/vmware-workstation/vmware-workstation-5.5.9.126128.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2009 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.6.80404.ebuild,v 1.2 2008/04/26 16:29:15 ikelos Exp $
-
-inherit vmware eutils versionator
-
-MY_P="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/download/ws/ws5.html"
-SRC_URI="mirror://vmware/software/wkst/${MY_P}.tar.gz
-	http://download.softpedia.ro/linux/${MY_P}.tar.gz
-	mirror://gentoo/${ANY_ANY}.tar.gz
-	http://platan.vc.cvut.cz/ftp/pub/vmware/${ANY_ANY}.tar.gz
-	http://platan.vc.cvut.cz/ftp/pub/vmware/obsolete/${ANY_ANY}.tar.gz
-	http://ftp.cvut.cz/vmware/${ANY_ANY}.tar.gz
-	http://ftp.cvut.cz/vmware/obsolete/${ANY_ANY}.tar.gz
-	http://knihovny.cvut.cz/ftp/pub/vmware/${ANY_ANY}.tar.gz
-	http://knihovny.cvut.cz/ftp/pub/vmware/obsolete/${ANY_ANY}.tar.gz"
-
-LICENSE="vmware"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-RESTRICT="fetch strip"
-
-# vmware-workstation should not use virtual/libc as this is a
-# precompiled binary package thats linked to glibc.
-RDEPEND="sys-libs/glibc
-	amd64? (
-		app-emulation/emul-linux-x86-gtklibs )
-	x86? (
-		x11-libs/libXrandr
-		x11-libs/libXcursor
-		x11-libs/libXinerama
-		x11-libs/libXi
-		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.15
-	!>=app-emulation/vmware-modules-1.0.0.16
-	>=dev-lang/perl-5
-	sys-apps/pciutils"
-
-S=${WORKDIR}/vmware-distrib
-
-RUN_UPDATE="no"
-
-dir=/opt/vmware/workstation
-Ddir=${D}/${dir}
-
-QA_TEXTRELS_x86="${dir:1}/lib/lib/libgdk-x11-2.0.so.0/libgdk-x11-2.0.so.0"
-QA_EXECSTACK_x86="${dir:1}/bin/vmnet-bridge
-	${dir:1}/bin/vmnet-dhcpd
-	${dir:1}/bin/vmnet-natd
-	${dir:1}/bin/vmnet-netifup
-	${dir:1}/bin/vmnet-sniffer
-	${dir:1}/bin/vmware-loop
-	${dir:1}/bin/vmware-ping
-	${dir:1}/bin/vmware-vdiskmanager
-	${dir:1}/lib/bin/vmware
-	${dir:1}/lib/bin/vmware-vmx
-	${dir:1}/lib/bin/vmrun
-	${dir:1}/lib/bin/vmplayer
-	${dir:1}/lib/bin-debug/vmware-vmx
-	${dir:1}/lib/lib/libpixops.so.2.0.1/libpixops.so.2.0.1"
-
-QA_TEXTRELS_amd64="${dir:1}/lib/lib/libgdk-x11-2.0.so.0/libgdk-x11-2.0.so.0"
-QA_EXECSTACK_amd64="${dir:1}/bin/vmnet-bridge
-	${dir:1}/bin/vmnet-dhcpd
-	${dir:1}/bin/vmnet-natd
-	${dir:1}/bin/vmnet-netifup
-	${dir:1}/bin/vmnet-sniffer
-	${dir:1}/bin/vmware-loop
-	${dir:1}/bin/vmware-ping
-	${dir:1}/bin/vmware-vdiskmanager
-	${dir:1}/lib/bin/vmware
-	${dir:1}/lib/bin/vmware-vmx
-	${dir:1}/lib/bin/vmrun
-	${dir:1}/lib/bin/vmplayer
-	${dir:1}/lib/bin-debug/vmware-vmx
-	${dir:1}/lib/lib/libpixops.so.2.0.1/libpixops.so.2.0.1"
-
-src_install() {
-	vmware_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
-}
-
-pkg_postinst() {
-	vmware_pkg_postinst
-	ewarn "Vmware Workstation has issues on systems with hal installed but"
-	ewarn "not running. If you experience trouble with VMware loading, try"
-	ewarn "starting the hal daemon."
-}
diff --git a/app-emulation/vmware-workstation/vmware-workstation-7.0.1.227600.ebuild b/app-emulation/vmware-workstation/vmware-workstation-7.0.1.227600.ebuild
new file mode 100644
index 0000000..bb421fc
--- /dev/null
+++ b/app-emulation/vmware-workstation/vmware-workstation-7.0.1.227600.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: Exp $
+
+EAPI="2"
+
+inherit eutils versionator fdo-mime gnome2-utils
+
+MY_PN="VMware-Workstation-Full-$(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 )
+	"
+
+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.26
+	dev-cpp/cairomm
+	dev-cpp/libgnomecanvasmm
+	dev-cpp/libsexymm
+	sys-apps/pciutils
+	sys-apps/hal
+	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"
+	export VMWARE_SKIP_SERVICES="true"
+#	python ${PYOPTS} "${INSTALLER}/vmware-installer.py" \
+	export VMWARE_BOOTSTRAP="${INSTALLER}/bootstrap"
+	sed -e "s#@@VMWARE_INSTALLER@@#${INSTALLER}#" -i "${VMWARE_BOOTSTRAP}"
+	"${INSTALLER}/vmware-installer" \
+		--set-setting vmware-installer prefix "${D}${VM_INSTALL_DIR}" \
+		--set-setting vmware-installer vmware-installer.libconf "${INSTALLER}/lib/libconf" \
+		--set-setting vmware-installer initdir "${T}" \
+		--set-setting vmware-installer initscriptdir "${D}/etc/init.d" \
+		--set-setting vmware-installer 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
+
+	# Redirect all the /etc/vmware-installer to /etc/vmware
+	sed -i -e '/ETCDIR/ s/-installer//' "${D}"/opt/vmware/workstation/bin/vmware-modconfig
+	sed -i -e '/ETCDIR/ s/-installer//' "${D}"/opt/vmware/workstation/bin/vmware-installer
+
+	# 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"
+	chmod +x "${D}/etc/vmware/init.d/vmware"
+	sed -i -e "s:/sbin/lsmod:/bin/lsmod:" "${D}"/etc/vmware/init.d/vmware
+	newinitd "${FILESDIR}/${PN}"-7.0.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
+}