Fix up bugs 219076 and 123665, remove old ebuild and fix minor QA issues.

Package-Manager: portage-2.1.5_rc6

16 files changed, 96 insertions, 319 deletions

diff --git a/app-emulation/vmware-workstation/ChangeLog b/app-emulation/vmware-workstation/ChangeLog
index b8a11246dd0b..7a18ccb4b473 100644
--- a/app-emulation/vmware-workstation/ChangeLog
+++ b/app-emulation/vmware-workstation/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for app-emulation/vmware-workstation
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.174 2008/04/04 01:44:06 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.175 2008/04/26 16:29:15 ikelos Exp $
+
+  26 Apr 2008; Mike Auty <ikelos@gentoo.org>
+  -files/6.0.1.55017/000_all_initd-location.patch,
+  -files/6.0.1.55017/002_all_pagebreak-detection-fix.patch,
+  -files/6.0.1.55017/001_all_fix-permissions.patch,
+  -files/6.0.1.55017/004_all_do-not-build-modules.patch,
+  -files/6.0.1.55017/007_all_use-modprobe-over-insmod.patch,
+  -files/6.0.1.55017/009_all_init.d-modules-warning.patch,
+  -files/6.0.1.55017/011_all_legit-modules-only.patch,
+  +files/vmware-player.desktop, +files/vmware-workstation.desktop,
+  vmware-workstation-5.5.6.80404.ebuild,
+  -vmware-workstation-6.0.1.55017.ebuild,
+  vmware-workstation-6.0.2.59824.ebuild,
+  vmware-workstation-6.0.3.80004.ebuild:
+  Fix up bugs 219076 and 123665, remove old ebuild and fix minor QA issues.
 
 *vmware-workstation-5.5.6.80404 (04 Apr 2008)
 
diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
index f3b8822e2432..f628098206bd 100644
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@@ -20,13 +20,6 @@ AUX 5.5.6.80404/002_all_pagebreak-detection-fix.patch 800 RMD160 f21a51e552d025a
 AUX 5.5.6.80404/004_all_do-not-build-modules.patch 589 RMD160 b2153579c65a232de9c2e6dbd9bbe108d85f95e5 SHA1 394a67a30f1f29084836183303641915ce982bfd SHA256 916754b0616ea330490b9572be1a9216bb7dd441ba328b1e01e777b29fac4e1e
 AUX 5.5.6.80404/007_all_use-modprobe-over-insmod.patch 448 RMD160 136dfcfe2df7a7ebf2844749f473a6c6d0bb3084 SHA1 0ad152b3cb738521296322b56e9f247926690e67 SHA256 9497f8ad6acb2460e27bd5430670e79129ec2ffbf6f5b8dae62084e5e56059ee
 AUX 5.5.6.80404/009_all_init.d-modules-warning.patch 991 RMD160 6205e976db47cd3361b5eca8593414d411a2ab8d SHA1 3742749baa606a57d447931f0af791696a49e660 SHA256 5fbc9f101abb3816a732f64a75e90ce7fcb6783c3cd7bae521d8785e88634498
-AUX 6.0.1.55017/000_all_initd-location.patch 1133 RMD160 63a226ee89922fc7d1cc4de75e80ee0befb13bb2 SHA1 64d7d8e7218fa34e798ea1e9cdafe0085bbee0fa SHA256 f5a9aab71e5cd04292d0a37812505e08f0d7860399ab0dd35cccae9bfbb665be
-AUX 6.0.1.55017/001_all_fix-permissions.patch 647 RMD160 0f25f7dd60dfcb5a72b1f7b9cf344d6f431143a9 SHA1 cabd3dd071ef62d4c70f52d1a3e02334ec7f3a73 SHA256 41492cde60da6d449c0f427ac7bd65598838ec17ac0e3a5f545feeb1d29ea391
-AUX 6.0.1.55017/002_all_pagebreak-detection-fix.patch 800 RMD160 f21a51e552d025a5120519d6dcd41efc3835a432 SHA1 06133c332b6b1f57476b1154de108a9dfc35435d SHA256 d327d7cb2166b9ef4c8c286568c3a7eb64542212164d58b8a7a3c5e51e19ed6d
-AUX 6.0.1.55017/004_all_do-not-build-modules.patch 654 RMD160 dd279f8043ab99b033b6ce74b2cbfc31cf6c1578 SHA1 19052ac7558b101616cecb05bf7fcae23251ea03 SHA256 694f953e64972fd81804748d7c2736934169c75e4454d3862f0a948db48ba284
-AUX 6.0.1.55017/007_all_use-modprobe-over-insmod.patch 448 RMD160 136dfcfe2df7a7ebf2844749f473a6c6d0bb3084 SHA1 0ad152b3cb738521296322b56e9f247926690e67 SHA256 9497f8ad6acb2460e27bd5430670e79129ec2ffbf6f5b8dae62084e5e56059ee
-AUX 6.0.1.55017/009_all_init.d-modules-warning.patch 991 RMD160 6205e976db47cd3361b5eca8593414d411a2ab8d SHA1 3742749baa606a57d447931f0af791696a49e660 SHA256 5fbc9f101abb3816a732f64a75e90ce7fcb6783c3cd7bae521d8785e88634498
-AUX 6.0.1.55017/011_all_legit-modules-only.patch 646 RMD160 484d15ebc05fb93d69866987cf805afdbba019c9 SHA1 f36a8b4b7153cfe213ee7cd1e82c871f3c9efa90 SHA256 b66a534d93ae7dc76b54631cbbaccc751691941ab704a9c1e566a9c866b15729
 AUX 6.0.2.59824/000_all_initd-location.patch 1133 RMD160 63a226ee89922fc7d1cc4de75e80ee0befb13bb2 SHA1 64d7d8e7218fa34e798ea1e9cdafe0085bbee0fa SHA256 f5a9aab71e5cd04292d0a37812505e08f0d7860399ab0dd35cccae9bfbb665be
 AUX 6.0.2.59824/001_all_fix-permissions.patch 647 RMD160 0f25f7dd60dfcb5a72b1f7b9cf344d6f431143a9 SHA1 cabd3dd071ef62d4c70f52d1a3e02334ec7f3a73 SHA256 41492cde60da6d449c0f427ac7bd65598838ec17ac0e3a5f545feeb1d29ea391
 AUX 6.0.2.59824/002_all_pagebreak-detection-fix.patch 800 RMD160 f21a51e552d025a5120519d6dcd41efc3835a432 SHA1 06133c332b6b1f57476b1154de108a9dfc35435d SHA256 d327d7cb2166b9ef4c8c286568c3a7eb64542212164d58b8a7a3c5e51e19ed6d
@@ -42,13 +35,13 @@ AUX 6.0.3.80004/007_all_use-modprobe-over-insmod.patch 448 RMD160 136dfcfe2df7a7
 AUX 6.0.3.80004/009_all_init.d-modules-warning.patch 991 RMD160 6205e976db47cd3361b5eca8593414d411a2ab8d SHA1 3742749baa606a57d447931f0af791696a49e660 SHA256 5fbc9f101abb3816a732f64a75e90ce7fcb6783c3cd7bae521d8785e88634498
 AUX 6.0.3.80004/011_all_legit-modules-only.patch 646 RMD160 484d15ebc05fb93d69866987cf805afdbba019c9 SHA1 f36a8b4b7153cfe213ee7cd1e82c871f3c9efa90 SHA256 b66a534d93ae7dc76b54631cbbaccc751691941ab704a9c1e566a9c866b15729
 AUX 90vmware-workstation 106 RMD160 471fb03d54bb48c651d4543f1c8ece1bb9b40c0a SHA1 3db7ec2a3b37a84328bf3d481a58b42499ef520b SHA256 c8f7143551f516b901143e60fc74e822ca3d235477d1c2a135bb36cbc639cf1e
+AUX vmware-player.desktop 599 RMD160 a5a9897671da69c4706ba412d9a041edfd13a9b7 SHA1 12af70f7039b19838e298d1949df28b1b8d407a6 SHA256 b967f2e6dba531613498a2dea130f557fc366e869876aa63ba3ae97f5ff59c54
+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-4.5.3-19414.tar.gz 42444031 RMD160 0f0b7a2249a12b75c9d81b8906efb2e85e04878b SHA1 f277dd75d9050b90d339b7f126a8575188791fb3 SHA256 6873ff04a317e6d0cbf31d4dd2ffcacd99cd335fb329e47f2c5f924376ffdcd6
 DIST VMware-workstation-5.5.5-56455.tar.gz 111516196 RMD160 a239464792fec9f7d420ad7e7854b3c23aa88692 SHA1 1a60e707076ce7f4e66c40c19331b3ebc1b907f6 SHA256 e7d906008160ec89f4a07f15b065f2ede6a31038a666f8e0bd30919bfe5f3c23
 DIST VMware-workstation-5.5.6-80404.tar.gz 111601609 RMD160 d1adf7ca27e607f13dff20f6bb95c0d3ec460b47 SHA1 04fcbeef15293e3e21d4a2dd39d2cdb579e8f392 SHA256 8e3b6944bba44877e9cca228101d4459291cee92eb9695e1fed28c5265519381
-DIST VMware-workstation-6.0.1-55017.i386.tar.gz 219089234 RMD160 e33d271019ee897dfee47dd3edce9ca6b2467bcf SHA1 6f76f0a1bcd420df7b53a2c2e5ee5261e5bc885b SHA256 7fd0279754075c09699abeb780fda8d5420490d43eca0fb33107e9987a1e838a
-DIST VMware-workstation-6.0.1-55017.x86_64.tar.gz 196577425 RMD160 6ae105b93e2434a3909adcc1a93545c51b2a855e SHA1 5361042412d3745f7f2d5e005dcc1f361a25bf81 SHA256 3e2c102eaedb652291c44fafd3e022c90cc8eca9f591d06e625f20f04f7015ff
 DIST VMware-workstation-6.0.2-59824.i386.tar.gz 219077421 RMD160 4e0f9aff3507cb3a9695172c9875d374c0dbab1d SHA1 aff0553ced9687176f6e4eb4db2f00f4bce8a91b SHA256 506fc1c8215b6a606a2d47231c1eed830acf98b2f79240c6ec7cb4e13370880f
 DIST VMware-workstation-6.0.2-59824.x86_64.tar.gz 196567485 RMD160 a7625f679b36d22f88f0b3d9d8c9e9f064015dc5 SHA1 5e014cdd5cf0d70cd4c78175ca7db5ce3c0fe9c0 SHA256 d656421e596f79fc872771ac63bd19c834c8ae98cb95a948bdf2090597393a95
 DIST VMware-workstation-6.0.3-80004.i386.tar.gz 222622982 RMD160 84aec387b91442774aa00dda959db2370fcca9e6 SHA1 be21aaa0961f863067e640c5ebb0479115acb7c4 SHA256 6be2c2d92c47d371b0c533b7edbcebc61a19279fa24905df3bf3f762d14e2885
@@ -57,18 +50,17 @@ DIST vmware-any-any-update115.tar.gz 493641 RMD160 56cabe56f70c01a22a7671e861cc5
 DIST vmware-libcrypto.so.0.9.7l.tar.bz2 412159 RMD160 89282ae9fc6e8921a47704bc9cd23cf70a6870e8 SHA1 f86c4cb076fe1764975e9243dc0fae763f2b589a SHA256 fae52acf61415959cca763a715a2b61ec49f161a416d418d6a1faffce531db12
 DIST vmware-libssl.so.0.9.7l.tar.bz2 78244 RMD160 195dd4808e60f81621e6ed12b843ded49c0fa747 SHA1 5fe729a1e49e77afd83b408845833174e1296e39 SHA256 3e1e13196066dc5b77d3ef6b5df55a29156eba1f39661e40cd617b538220d089
 DIST vmware.png 470 RMD160 759a5530b3bb605e6bc2c1e203490163d320485d SHA1 2262b25fb3ec66ed7b209ff5205fb9b289ca1afc SHA256 9bec91ecc32fa913141ca303abf1abec988ebc7fb4f27389f173bf3493bffb9b
-EBUILD vmware-workstation-4.5.3.19414-r7.ebuild 3213 RMD160 83e65f05d2bddac0164b54620903d1f15400a45d SHA1 1dd064c619b5370481dc7b452c3f0d7ad3026081 SHA256 a4b3d9da290b971667093166ada29e94827eff786e3aeb3477b014aef9404916
+EBUILD vmware-workstation-4.5.3.19414-r7.ebuild 3213 RMD160 9eb3cd996ecaf5400db90da09d1c11c46005a81a SHA1 317b0fa058e2d0f7491bace2d9116dbecc90ea5b SHA256 882a4f4876397a83e1b3ce3e01530043b68a29b34f5c2ecf7d703626e1bd0d7f
 EBUILD vmware-workstation-5.5.5.56455.ebuild 3096 RMD160 c60e664a6bd748250c8bb98ad3b3638a1f409325 SHA1 5240e326dd74dc15ad3291faa19898fdb825fada SHA256 6392e9a41d599096742f4ffa55b0e81508dddd80cb9d2d4dc2e65394c07cce22
-EBUILD vmware-workstation-5.5.6.80404.ebuild 3212 RMD160 281b06fb396a6644b7e1ddc8a53944a75cbbe02a SHA1 0dbf98d079a4602956cdfc71b1113148b0fdbdad SHA256 57daea440eb5d666eddd4876738186c97763d83fa97d1c638ef2d49e760e78de
-EBUILD vmware-workstation-6.0.1.55017.ebuild 4069 RMD160 3f8a506169ec0682772b15ea295be3eb0b84e0f1 SHA1 f9b946a24f4d22570741a64da7031dbe0266194e SHA256 5e0518b3519ef9ae36d7967f626ebbbcfe1750a282e5728a8c18d9cdab6c1aed
-EBUILD vmware-workstation-6.0.2.59824.ebuild 4069 RMD160 b1d79f0ffd803f9c6d8b0669d9abaca7bbc66996 SHA1 ebebedb6f44e3152cbf5d05f8f8a620b3ee3fdf4 SHA256 141d279b01acff8b722c03afaa75687c29cd75462af7f9c553c2cbdc9836ce0b
-EBUILD vmware-workstation-6.0.3.80004.ebuild 3735 RMD160 aeae5e9d1e8409b8e3fa42c4111000121f164e66 SHA1 adb1faccb248dd62fcccb9912117a51aa840efb4 SHA256 57e87716146de1137586cbc0be5d3aaa7b5fdb653f6ce6b0a0c0316573a5eef2
-MISC ChangeLog 20951 RMD160 6b97eb8cc556bce8875b1d71d716ce88dbea82e2 SHA1 a400da3c57d91c7fb5f6771ccc76334e5d615272 SHA256 123623197352733e6ecbf134334723058c92d28b6fa1f97be6b8fd2f9d7182ec
+EBUILD vmware-workstation-5.5.6.80404.ebuild 3247 RMD160 a619054c3c4318362f30e6ca10047b54c0dd6f6a SHA1 053e1cfd70208934063fbaab49581f7907381b5f SHA256 6470238fc76ab279dfb01ee2b13a4d32ff29d4f96aa9c5d094a09a786de4a214
+EBUILD vmware-workstation-6.0.2.59824.ebuild 3696 RMD160 d75355ce8192732598af51a33936c60642925178 SHA1 24eee570a61a7e913fb54f570844e004b2eebe70 SHA256 4f9f38f681a2d04c475070159ace1c491df7cb9ff1c09a5440201118c1bfe72d
+EBUILD vmware-workstation-6.0.3.80004.ebuild 4047 RMD160 815e6ae211e17e9be7740c34ef09e61468ff3569 SHA1 bfe83f4dd2f223f9c1fe605565dfc8767956ead7 SHA256 786c8fec63a60c2e1124f58fa6db45a83c85c84a2edb7bdd6c1c1c8b74ea61f1
+MISC ChangeLog 21698 RMD160 41ae480d8c3abcabdb61209fe436b3322077d7ac SHA1 399d5b2c59a14eadc82668d9cbdd6431d42ed6dc SHA256 691d6d4739a5077ba5d0c65b473b309028cc85ac9ca447bea5f79f7dc44d8315
 MISC metadata.xml 339 RMD160 9f4931e525280fd376eb7ac3e42c369acd23a33e SHA1 3948dcc9a9b7dc585f1783e0419b313084a231c0 SHA256 bb60a871a58964feaa59ec824a5d511455054461f0394a57a8c9ca019a0f4593
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFH9YfjkT4lNIS36YERAnBEAJ4hYA2iBd3XYf7klRk2nWCTIQrTWwCfVcba
-3XndxwTjeZ9MXrMZW8kgg1s=
-=7mXF
+iEYEARECAAYFAkgTWN8ACgkQu7rWomwgFXqKmwCcDyeaJQGrwd1z196MJePsb2m7
+4tkAnRWPUE++fgmgnyu9OE9/RCxPtEfc
+=hodC
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/vmware-workstation/files/6.0.1.55017/000_all_initd-location.patch b/app-emulation/vmware-workstation/files/6.0.1.55017/000_all_initd-location.patch
deleted file mode 100644
index 6eb6619d2b8e..000000000000
--- a/app-emulation/vmware-workstation/files/6.0.1.55017/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{'skip-stop-start'}) {
--    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/6.0.1.55017/001_all_fix-permissions.patch b/app-emulation/vmware-workstation/files/6.0.1.55017/001_all_fix-permissions.patch
deleted file mode 100644
index e646b7b2da5c..000000000000
--- a/app-emulation/vmware-workstation/files/6.0.1.55017/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/6.0.1.55017/002_all_pagebreak-detection-fix.patch b/app-emulation/vmware-workstation/files/6.0.1.55017/002_all_pagebreak-detection-fix.patch
deleted file mode 100644
index fd3fc76ca679..000000000000
--- a/app-emulation/vmware-workstation/files/6.0.1.55017/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/6.0.1.55017/004_all_do-not-build-modules.patch b/app-emulation/vmware-workstation/files/6.0.1.55017/004_all_do-not-build-modules.patch
deleted file mode 100644
index e2649c0af27b..000000000000
--- a/app-emulation/vmware-workstation/files/6.0.1.55017/004_all_do-not-build-modules.patch
+++ /dev/null
@@ -1,21 +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
-@@ -10158,13 +10158,13 @@
-     configure_gtk2();
- #   createMimePackageFile();
- #   configureDesktopFiles();
--    configure_mon();
-+#   configure_mon();
-     if (isDesktopProduct()) {
--      build_vmblock();
-+#     build_vmblock();
-     }
--    configure_pp();
-+#   configure_pp();
-     configure_net();
--    build_vmnet();
-+#   build_vmnet();
-   }
- 
-    configure_eclipse_plugin();
diff --git a/app-emulation/vmware-workstation/files/6.0.1.55017/007_all_use-modprobe-over-insmod.patch b/app-emulation/vmware-workstation/files/6.0.1.55017/007_all_use-modprobe-over-insmod.patch
deleted file mode 100644
index c29a87e8f226..000000000000
--- a/app-emulation/vmware-workstation/files/6.0.1.55017/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 -f "$1" || exit 1
-    exit 0
- }
- 
diff --git a/app-emulation/vmware-workstation/files/6.0.1.55017/009_all_init.d-modules-warning.patch b/app-emulation/vmware-workstation/files/6.0.1.55017/009_all_init.d-modules-warning.patch
deleted file mode 100644
index 4eab043af8dc..000000000000
--- a/app-emulation/vmware-workstation/files/6.0.1.55017/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/6.0.1.55017/011_all_legit-modules-only.patch b/app-emulation/vmware-workstation/files/6.0.1.55017/011_all_legit-modules-only.patch
deleted file mode 100644
index 9e453ed1e2ee..000000000000
--- a/app-emulation/vmware-workstation/files/6.0.1.55017/011_all_legit-modules-only.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr vmware-distrib.orig/bin/vmware-config.pl vmware-distrib/bin/vmware-config.pl
---- vmware-distrib.orig/bin/vmware-config.pl	2007-08-22 02:58:41.000000000 +0100
-+++ vmware-distrib/bin/vmware-config.pl	2007-09-19 20:04:57.000000000 +0100
-@@ -10127,7 +10127,7 @@
-    }
- 
-    my @modules = non_vmware_modules_installed();
--   if (scalar(@modules) > 0) {
-+   if (scalar(@modules) < 0) {
-       error("The following VMware kernel modules have been found on your system that " .
-             "were not installed by the VMware Installer.  Please remove them then run " .
-             "this installer again.\n\n" . join("\n", @modules) . "\n\n");
diff --git a/app-emulation/vmware-workstation/files/vmware-player.desktop b/app-emulation/vmware-workstation/files/vmware-player.desktop
new file mode 100644
index 000000000000..755ac187e8f6
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/vmware-player.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Name=VMWare Player
+Type=Application
+Comment=Emulate a complete PC on your PC without the usual performance overhead of most emulators
+MimeType=application/x-vmware-vm-legacy;application/x-vmware-team;application/x-vmware-vm-clone;application/x-vmware-vm;application/x-vmware-vm-clone;application/x-vmware-vm;application/x-vmware-vm-clone;application/x-vmware-vm;application/x-vmware-vmdisk;application/x-vmware-team;application/x-vmware-vmfoundry;application/x-vmware-vm;application/x-vmware-snapshot;
+Exec=vmplayer
+TryExec=vmplayer
+Icon=vmware-player
+Categories=System;
diff --git a/app-emulation/vmware-workstation/files/vmware-workstation.desktop b/app-emulation/vmware-workstation/files/vmware-workstation.desktop
new file mode 100644
index 000000000000..dc6d1164c870
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/vmware-workstation.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Name=VMWare Workstation
+Type=Application
+Comment=Emulate a complete PC on your PC without the usual performance overhead of most emulators
+MimeType=application/x-vmware-vm-legacy;application/x-vmware-team;application/x-vmware-vm-clone;application/x-vmware-vm;application/x-vmware-vm-clone;application/x-vmware-vm;application/x-vmware-vm-clone;application/x-vmware-vm;application/x-vmware-vmdisk;application/x-vmware-team;application/x-vmware-vmfoundry;application/x-vmware-vm;application/x-vmware-snapshot;
+Exec=vmware
+TryExec=vmware
+Icon=vmware-workstation
+Categories=System;
diff --git a/app-emulation/vmware-workstation/vmware-workstation-4.5.3.19414-r7.ebuild b/app-emulation/vmware-workstation/vmware-workstation-4.5.3.19414-r7.ebuild
index 438dd8bf4edf..f3c16ce96134 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-4.5.3.19414-r7.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-4.5.3.19414-r7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-4.5.3.19414-r7.ebuild,v 1.7 2007/07/13 00:36:15 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-4.5.3.19414-r7.ebuild,v 1.8 2008/04/26 16:29:15 ikelos Exp $
 
 # Alter ebuild so that the metadata cache is invalidated.
 
@@ -89,7 +89,7 @@ src_install() {
 	vmware_src_install
 	# We remove the rpath libgdk_pixbuf stuff, to resolve bug #81344.
 	perl -pi -e 's#/tmp/rrdharan/out#/opt/vmware/null/#sg' \
-		${Ddir}/lib/lib/libgdk_pixbuf.so.2/lib{gdk_pixbuf.so.2,pixbufloader-{xpm,png}.so.1.0.0} \
+		"${Ddir}"/lib/lib/libgdk_pixbuf.so.2/lib{gdk_pixbuf.so.2,pixbufloader-{xpm,png}.so.1.0.0} \
 		|| die "Removing rpath"
 
 	make_desktop_entry vmware "VMware Workstation" ${PN}.png
diff --git a/app-emulation/vmware-workstation/vmware-workstation-5.5.6.80404.ebuild b/app-emulation/vmware-workstation/vmware-workstation-5.5.6.80404.ebuild
index 79621457fbf9..128cbb352dce 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-5.5.6.80404.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-5.5.6.80404.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.1 2008/04/04 01:44:06 wolf31o2 Exp $
+# $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
 
@@ -10,6 +10,7 @@ DESCRIPTION="Emulate a complete PC on your PC without the usual performance over
 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
@@ -86,7 +87,7 @@ 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
+	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
 }
diff --git a/app-emulation/vmware-workstation/vmware-workstation-6.0.1.55017.ebuild b/app-emulation/vmware-workstation/vmware-workstation-6.0.1.55017.ebuild
deleted file mode 100644
index 4f23760b7182..000000000000
--- a/app-emulation/vmware-workstation/vmware-workstation-6.0.1.55017.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2007 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.0.1.55017.ebuild,v 1.1 2007/10/14 09:03:41 ikelos Exp $
-
-inherit vmware eutils versionator
-
-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"
-SRC_URI="
-	x86? (
-		mirror://vmware/software/wkst/${MY_PN}.i386.tar.gz
-		http://download.softpedia.ro/linux/${MY_PN}.i386.tar.gz )
-	amd64? (
-		mirror://vmware/software/wkst/${MY_PN}.x86_64.tar.gz
-		http://download.softpedia.ro/linux/${MY_PN}.x86_64.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="strip fetch"
-
-# vmware-workstation should not use virtual/libc as this is a
-# precompiled binary package thats linked to glibc.
-RDEPEND="sys-libs/glibc
-	amd64? (
-		x11-libs/libXrandr
-		x11-libs/libXcursor
-		x11-libs/libXinerama
-		x11-libs/libXi
-		x11-libs/libview
-		dev-cpp/libsexymm
-		dev-cpp/cairomm
-		dev-cpp/libgnomecanvasmm
-		virtual/xft )
-	x86? (
-		x11-libs/libXrandr
-		x11-libs/libXcursor
-		x11-libs/libXinerama
-		x11-libs/libXi
-		x11-libs/libview
-		dev-cpp/libsexymm
-		virtual/xft )
-	!app-emulation/vmware-player
-	!app-emulation/vmware-server
-	~app-emulation/vmware-modules-1.0.0.17
-	!<app-emulation/vmware-modules-1.0.0.17
-	!>=app-emulation/vmware-modules-1.0.0.18
-	>=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"
-
-pkg_setup() {
-	if use x86; then
-		MY_P="${MY_PN}.i386"
-	elif use amd64; then
-		MY_P="${MY_PN}.x86_64"
-	fi
-
-	if ! built_with_use ">=dev-cpp/gtkmm-2.4" accessibility ; then
-		eerror "Rebuild dev-cpp/gtkmm with USE=\"accessibility\""
-		die "VMware workstation only works with gtkmm built with USE=\"accessibility\"."
-	fi
-
-	vmware_pkg_setup
-}
-
-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}.tar.gz at ${HOMEPAGE}"
-	einfo "${ANY_ANY}.tar.gz is also necessary for compilation"
-	einfo "but should already have been fetched."
-}
-
-src_install() {
-	vmware_src_install
-
-	ICONDIR=/opt/vmware/workstation/lib/share/icons/hicolor/scalable/apps/
-	make_desktop_entry vmware "VMWare Workstation" ${ICONDIR}/${PN}.svg System
-	make_desktop_entry vmplayer "VMWare Player" ${ICONDIR}/vmware-player.svg System
-
-	# Nasty hack to ensure the EULA is included
-	insinto /opt/vmware/workstation/lib/share
-	newins doc/EULA EULA.txt
-}
diff --git a/app-emulation/vmware-workstation/vmware-workstation-6.0.2.59824.ebuild b/app-emulation/vmware-workstation/vmware-workstation-6.0.2.59824.ebuild
index 1b8fd90d9a45..22e079d02318 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-6.0.2.59824.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-6.0.2.59824.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.0.2.59824.ebuild,v 1.1 2007/11/25 12:50:31 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-6.0.2.59824.ebuild,v 1.2 2008/04/26 16:29:15 ikelos Exp $
 
 inherit vmware eutils versionator
 
@@ -15,13 +15,7 @@ SRC_URI="
 	amd64? (
 		mirror://vmware/software/wkst/${MY_PN}.x86_64.tar.gz
 		http://download.softpedia.ro/linux/${MY_PN}.x86_64.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"
@@ -60,6 +54,7 @@ RDEPEND="sys-libs/glibc
 
 S=${WORKDIR}/vmware-distrib
 
+ANY_ANY=""
 RUN_UPDATE="no"
 
 dir=/opt/vmware/workstation
diff --git a/app-emulation/vmware-workstation/vmware-workstation-6.0.3.80004.ebuild b/app-emulation/vmware-workstation/vmware-workstation-6.0.3.80004.ebuild
index 373598a30dc8..78f0dd1d2a5a 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-6.0.3.80004.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-6.0.3.80004.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 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.0.3.80004.ebuild,v 1.1 2008/03/22 09:39:38 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-6.0.3.80004.ebuild,v 1.2 2008/04/26 16:29:15 ikelos Exp $
 
-inherit vmware eutils versionator
+inherit vmware eutils versionator fdo-mime gnome2-utils
 
 MY_PN="VMware-workstation-$(replace_version_separator 3 - $PV)"
 
@@ -26,24 +26,15 @@ RESTRICT="strip fetch"
 # vmware-workstation should not use virtual/libc as this is a
 # precompiled binary package thats linked to glibc.
 RDEPEND="sys-libs/glibc
-	amd64? (
-		x11-libs/libXrandr
-		x11-libs/libXcursor
-		x11-libs/libXinerama
-		x11-libs/libXi
-		x11-libs/libview
-		dev-cpp/libsexymm
-		dev-cpp/cairomm
-		dev-cpp/libgnomecanvasmm
-		virtual/xft )
-	x86? (
-		x11-libs/libXrandr
-		x11-libs/libXcursor
-		x11-libs/libXinerama
-		x11-libs/libXi
-		x11-libs/libview
-		dev-cpp/libsexymm
-		virtual/xft )
+	x11-libs/libXrandr
+	x11-libs/libXcursor
+	x11-libs/libXinerama
+	x11-libs/libXi
+	x11-libs/libview
+	dev-cpp/libsexymm
+	dev-cpp/cairomm
+	dev-cpp/libgnomecanvasmm
+	virtual/xft
 	!app-emulation/vmware-player
 	!app-emulation/vmware-server
 	~app-emulation/vmware-modules-1.0.0.17
@@ -124,11 +115,36 @@ pkg_nofetch() {
 src_install() {
 	vmware_src_install
 
-	ICONDIR=/opt/vmware/workstation/lib/share/icons/hicolor/scalable/apps/
-	make_desktop_entry vmware "VMWare Workstation" ${ICONDIR}/${PN}.svg System
-	make_desktop_entry vmplayer "VMWare Player" ${ICONDIR}/vmware-player.svg System
+	# move the icons into a location where DEs will find it:
+	ICONDIR=/opt/vmware/workstation/lib/share/icons/hicolor
+	rm "${D}${ICONDIR}/index.theme"
+	mkdir -p "${D}/usr/share/icons"
+	mv "${D}${ICONDIR}" "${D}/usr/share/icons"
+	ln -s /usr/share/icons/hicolor "${D}${ICONSDIR}"
+
+	# install .desktop files:
+	insinto /usr/share/applications
+	doins "${FILESDIR}/vmware-workstation.desktop"
+	doins "${FILESDIR}/vmware-player.desktop"
 
 	# Nasty hack to ensure the EULA is included
 	insinto /opt/vmware/workstation/lib/share
 	newins doc/EULA EULA.txt
 }
+
+pkg_preinst() {
+	vmware_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	vmware_pkg_postinst
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	vmware_pkg_postrm
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}