Clear out old/masked versions and bump to 5.5.8 and 6.0.5.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 i686

24 files changed, 51 insertions, 498 deletions

diff --git a/app-emulation/vmware-workstation/ChangeLog b/app-emulation/vmware-workstation/ChangeLog
index ccc28c2faf6c..5bd472c69b13 100644
--- a/app-emulation/vmware-workstation/ChangeLog
+++ b/app-emulation/vmware-workstation/ChangeLog
@@ -1,6 +1,50 @@
 # 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.182 2008/07/03 12:34:10 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.183 2008/09/30 16:44:18 ikelos Exp $
+
+*vmware-workstation-6.0.5.109488 (30 Sep 2008)
+*vmware-workstation-5.5.8.108000 (30 Sep 2008)
+
+  30 Sep 2008; Mike Auty <ikelos@gentoo.org>
+  -files/4.5.3.19414/000_all_initd-location.patch,
+  -files/4.5.3.19414/000_all_librarypath.patch,
+  -files/4.5.3.19414/001_all_fix-permissions.patch,
+  -files/4.5.3.19414/002_all_pagebreak-detection-fix.patch,
+  -files/4.5.3.19414/004_all_do-not-build-modules.patch,
+  -files/4.5.3.19414/007_all_use-modprobe-over-insmod.patch,
+  -files/4.5.3.19414/009_all_init.d-modules-warning.patch,
+  -files/5.5.6.80404/000_all_initd-location.patch,
+  -files/5.5.6.80404/001_all_fix-permissions.patch,
+  -files/5.5.6.80404/002_all_pagebreak-detection-fix.patch,
+  -files/5.5.6.80404/004_all_do-not-build-modules.patch,
+  -files/5.5.6.80404/007_all_use-modprobe-over-insmod.patch,
+  -files/5.5.6.80404/009_all_init.d-modules-warning.patch,
+  +files/5.5.8.108000/000_all_initd-location.patch,
+  +files/5.5.8.108000/001_all_fix-permissions.patch,
+  +files/5.5.8.108000/002_all_pagebreak-detection-fix.patch,
+  +files/5.5.8.108000/004_all_do-not-build-modules.patch,
+  +files/5.5.8.108000/007_all_use-modprobe-over-insmod.patch,
+  +files/5.5.8.108000/009_all_init.d-modules-warning.patch,
+  -files/6.0.3.80004/000_all_initd-location.patch,
+  -files/6.0.3.80004/001_all_fix-permissions.patch,
+  -files/6.0.3.80004/002_all_pagebreak-detection-fix.patch,
+  -files/6.0.3.80004/004_all_do-not-build-modules.patch,
+  -files/6.0.3.80004/007_all_use-modprobe-over-insmod.patch,
+  -files/6.0.3.80004/009_all_init.d-modules-warning.patch,
+  -files/6.0.3.80004/011_all_legit-modules-only.patch,
+  +files/6.0.5.109488/000_all_initd-location.patch,
+  +files/6.0.5.109488/001_all_fix-permissions.patch,
+  +files/6.0.5.109488/002_all_pagebreak-detection-fix.patch,
+  +files/6.0.5.109488/004_all_do-not-build-modules.patch,
+  +files/6.0.5.109488/007_all_use-modprobe-over-insmod.patch,
+  +files/6.0.5.109488/009_all_init.d-modules-warning.patch,
+  +files/6.0.5.109488/011_all_legit-modules-only.patch,
+  -vmware-workstation-4.5.3.19414-r7.ebuild,
+  -vmware-workstation-5.5.6.80404.ebuild,
+  +vmware-workstation-5.5.8.108000.ebuild,
+  -vmware-workstation-6.0.3.80004.ebuild,
+  +vmware-workstation-6.0.5.109488.ebuild:
+  Clear out old/masked versions and bump to 5.5.8 and 6.0.5.
 
   03 Jul 2008; Christian Faulhammer <opfer@gentoo.org>
   vmware-workstation-5.5.7.91707.ebuild:
diff --git a/app-emulation/vmware-workstation/files/4.5.3.19414/000_all_initd-location.patch b/app-emulation/vmware-workstation/files/4.5.3.19414/000_all_initd-location.patch
deleted file mode 100644
index 7e13eb4dceb6..000000000000
--- a/app-emulation/vmware-workstation/files/4.5.3.19414/000_all_initd-location.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- vmware-distrib/bin/vmware-config.pl.ori	2006-09-29 09:14:36.000000000 -0400
-+++ vmware-distrib/bin/vmware-config.pl	2006-09-29 09:20:06.000000000 -0400
-@@ -3738,7 +3738,7 @@
-       internal_sed($mouse_file . $cBackupExtension,
-                    $mouse_file, 0, \%p);
-       if (!$gOption{'skipstopstart'}) {
--        system(shell_string(db_get_answer('INITSCRIPTSDIR') . '/gpm')
-+        system(shell_string('/etc/init.d/gpm')
-                . ' restart');
-       }
-     }
-@@ -5425,7 +5425,7 @@
- 
- # Restart the inetd service
- sub restart_inetd {
--  my $inetd_restart = db_get_answer('INITSCRIPTSDIR') . '/inetd';
-+  my $inetd_restart = '/etc/init.d/inetd';
-   if (-e $inetd_restart) {
-     if (!system(shell_string($inetd_restart) . ' restart')) {
-       return;
-@@ -5532,7 +5532,7 @@
- 
- #Restart xinetd
- sub restart_xinetd {
--  my $xinetd_restart = db_get_answer('INITSCRIPTSDIR') . '/xinetd';
-+  my $xinetd_restart = '/etc/init.d/xinetd';
-   if (-e $xinetd_restart) {
-     if (!system(shell_string($xinetd_restart) . ' restart')) {
-       return;
-@@ -7383,7 +7383,7 @@
-           . 'a /proc/vmware directory.' . "\n\n");
-   }
-   if (!$gOption{'skipstopstart'} &&
--      system(shell_string(db_get_answer('INITSCRIPTSDIR') . '/vmware')
-+      system(shell_string('/etc/init.d/vmware')
-              . ' stop')) {
-     error('Unable to stop services for ' . vmware_product_name() . "\n\n");
-   }
-@@ -7473,7 +7473,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/4.5.3.19414/000_all_librarypath.patch b/app-emulation/vmware-workstation/files/4.5.3.19414/000_all_librarypath.patch
deleted file mode 100644
index a1eb4cbb94f7..000000000000
--- a/app-emulation/vmware-workstation/files/4.5.3.19414/000_all_librarypath.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- vmware/bin/vmware	2004-12-02 07:12:26.268618096 +0900
-+++ vmware/bin/vmware	2004-12-02 07:34:31.684433747 +0900
-@@ -169,15 +169,23 @@
-    local lib
-    local dummy
-    local status
-+   local newpath
- 
-    path=''
-    while read -r lib dummy status; do
-       if [ "$status" = 'not found' ]; then
-+         newpath="$vm_db_answer_LIBDIR"'/lib/'"$lib"
-          if [ "$path" = '' ]; then
--            path="$vm_db_answer_LIBDIR"'/lib/'"$lib"
-+	    path="$newpath"
-          else
--            path="$path"':'"$vm_db_answer_LIBDIR"'/lib/'"$lib"
-+            path="$path"':'"$newpath"
-          fi
-+	 for x in "$newpath/"*.so; do
-+	    if [ -f "$x" ]
-+	    then
-+	       path="$path"':'`LD_LIBRARY_PATH="$path" LANGUAGE=C LANG=C ldd "$x" | vm_append_libs`
-+            fi
-+         done
-       fi
-    done
- 
diff --git a/app-emulation/vmware-workstation/files/4.5.3.19414/001_all_fix-permissions.patch b/app-emulation/vmware-workstation/files/4.5.3.19414/001_all_fix-permissions.patch
deleted file mode 100644
index e646b7b2da5c..000000000000
--- a/app-emulation/vmware-workstation/files/4.5.3.19414/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/4.5.3.19414/002_all_pagebreak-detection-fix.patch b/app-emulation/vmware-workstation/files/4.5.3.19414/002_all_pagebreak-detection-fix.patch
deleted file mode 100644
index f700f5df9d32..000000000000
--- a/app-emulation/vmware-workstation/files/4.5.3.19414/002_all_pagebreak-detection-fix.patch
+++ /dev/null
@@ -1,12 +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
-@@ -1969,7 +1969,7 @@
-     . ' -E - | ' . shell_string($gHelper{'grep'}) . ' '
-     . shell_string($pattern));
-   chomp($header_page_offset);
--  $header_page_offset =~ s/^$pattern \(?0x([0-9a-fA-F]{8,}).*$/$1/;
-+  $header_page_offset =~ s/^$pattern \(?(\([^)]*\))?\)?0x([0-9a-fA-F]{8,}).*$/$2/;
-   if ($header_page_offset =~ /[0-9a-fA-F]{8,}/) {
-     # We found a valid page offset
-     if (defined($gSystem{'page_offset'}) and
diff --git a/app-emulation/vmware-workstation/files/4.5.3.19414/004_all_do-not-build-modules.patch b/app-emulation/vmware-workstation/files/4.5.3.19414/004_all_do-not-build-modules.patch
deleted file mode 100644
index 2144f412f09d..000000000000
--- a/app-emulation/vmware-workstation/files/4.5.3.19414/004_all_do-not-build-modules.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- vmware-distrib/bin/vmware-config.pl.ori	2006-09-29 09:33:55.000000000 -0400
-+++ vmware-distrib/bin/vmware-config.pl	2006-09-29 09:38:07.000000000 -0400
-@@ -5980,9 +5980,9 @@
-   # Get this set up even if the user doesn't want networking.  The
-   # reason is that samba may turn on networking and it needs this
-   # module to use networking.
--  if (configure_module('vmnet') eq 'no') {
--    module_error();
--  }
-+#  if (configure_module('vmnet') eq 'no') {
-+#    module_error();
-+#  }
- 
-   # Fix for bug 15842.  Always regenerate the network settings because an
-   # upgrade leaves us in an inconsistent state.  The database will have
-@@ -7410,9 +7410,9 @@
-   }
-   if (vmware_product() eq 'server') {
-     configure_vmkernel();
--  } else {
--    configure_mon();
--    configure_pp();
-+#  } else {
-+#    configure_mon();
-+#    configure_pp();
-   }
-   configure_net();
-   # Create the directory for the UNIX domain sockets
diff --git a/app-emulation/vmware-workstation/files/4.5.3.19414/007_all_use-modprobe-over-insmod.patch b/app-emulation/vmware-workstation/files/4.5.3.19414/007_all_use-modprobe-over-insmod.patch
deleted file mode 100644
index c29a87e8f226..000000000000
--- a/app-emulation/vmware-workstation/files/4.5.3.19414/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/4.5.3.19414/009_all_init.d-modules-warning.patch b/app-emulation/vmware-workstation/files/4.5.3.19414/009_all_init.d-modules-warning.patch
deleted file mode 100644
index 4eab043af8dc..000000000000
--- a/app-emulation/vmware-workstation/files/4.5.3.19414/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/5.5.6.80404/000_all_initd-location.patch b/app-emulation/vmware-workstation/files/5.5.6.80404/000_all_initd-location.patch
deleted file mode 100644
index 1d864f7e0dd7..000000000000
--- a/app-emulation/vmware-workstation/files/5.5.6.80404/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.6.80404/001_all_fix-permissions.patch b/app-emulation/vmware-workstation/files/5.5.6.80404/001_all_fix-permissions.patch
deleted file mode 100644
index e646b7b2da5c..000000000000
--- a/app-emulation/vmware-workstation/files/5.5.6.80404/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.6.80404/002_all_pagebreak-detection-fix.patch b/app-emulation/vmware-workstation/files/5.5.6.80404/002_all_pagebreak-detection-fix.patch
deleted file mode 100644
index fd3fc76ca679..000000000000
--- a/app-emulation/vmware-workstation/files/5.5.6.80404/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.6.80404/004_all_do-not-build-modules.patch b/app-emulation/vmware-workstation/files/5.5.6.80404/004_all_do-not-build-modules.patch
deleted file mode 100644
index cec3b3ee4c1d..000000000000
--- a/app-emulation/vmware-workstation/files/5.5.6.80404/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.6.80404/007_all_use-modprobe-over-insmod.patch b/app-emulation/vmware-workstation/files/5.5.6.80404/007_all_use-modprobe-over-insmod.patch
deleted file mode 100644
index c29a87e8f226..000000000000
--- a/app-emulation/vmware-workstation/files/5.5.6.80404/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/5.5.6.80404/009_all_init.d-modules-warning.patch b/app-emulation/vmware-workstation/files/5.5.6.80404/009_all_init.d-modules-warning.patch
deleted file mode 100644
index 4eab043af8dc..000000000000
--- a/app-emulation/vmware-workstation/files/5.5.6.80404/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.3.80004/000_all_initd-location.patch b/app-emulation/vmware-workstation/files/6.0.3.80004/000_all_initd-location.patch
deleted file mode 100644
index 6eb6619d2b8e..000000000000
--- a/app-emulation/vmware-workstation/files/6.0.3.80004/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.3.80004/001_all_fix-permissions.patch b/app-emulation/vmware-workstation/files/6.0.3.80004/001_all_fix-permissions.patch
deleted file mode 100644
index e646b7b2da5c..000000000000
--- a/app-emulation/vmware-workstation/files/6.0.3.80004/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.3.80004/002_all_pagebreak-detection-fix.patch b/app-emulation/vmware-workstation/files/6.0.3.80004/002_all_pagebreak-detection-fix.patch
deleted file mode 100644
index fd3fc76ca679..000000000000
--- a/app-emulation/vmware-workstation/files/6.0.3.80004/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.3.80004/004_all_do-not-build-modules.patch b/app-emulation/vmware-workstation/files/6.0.3.80004/004_all_do-not-build-modules.patch
deleted file mode 100644
index e2649c0af27b..000000000000
--- a/app-emulation/vmware-workstation/files/6.0.3.80004/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.3.80004/007_all_use-modprobe-over-insmod.patch b/app-emulation/vmware-workstation/files/6.0.3.80004/007_all_use-modprobe-over-insmod.patch
deleted file mode 100644
index c29a87e8f226..000000000000
--- a/app-emulation/vmware-workstation/files/6.0.3.80004/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.3.80004/009_all_init.d-modules-warning.patch b/app-emulation/vmware-workstation/files/6.0.3.80004/009_all_init.d-modules-warning.patch
deleted file mode 100644
index 4eab043af8dc..000000000000
--- a/app-emulation/vmware-workstation/files/6.0.3.80004/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.3.80004/011_all_legit-modules-only.patch b/app-emulation/vmware-workstation/files/6.0.3.80004/011_all_legit-modules-only.patch
deleted file mode 100644
index 9e453ed1e2ee..000000000000
--- a/app-emulation/vmware-workstation/files/6.0.3.80004/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/vmware-workstation-4.5.3.19414-r7.ebuild b/app-emulation/vmware-workstation/vmware-workstation-4.5.3.19414-r7.ebuild
deleted file mode 100644
index f3c16ce96134..000000000000
--- a/app-emulation/vmware-workstation/vmware-workstation-4.5.3.19414-r7.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# 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.8 2008/04/26 16:29:15 ikelos Exp $
-
-# Alter ebuild so that the metadata cache is invalidated.
-
-inherit eutils vmware
-
-MY_P="VMware-workstation-4.5.3-19414"
-
-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="mirror://vmware/software/wkst/${MY_P}.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
-	http://dev.gentoo.org/~wolf31o2/sources/dump/vmware-libssl.so.0.9.7l.tar.bz2
-	mirror://gentoo/vmware-libssl.so.0.9.7l.tar.bz2
-	http://dev.gentoo.org/~wolf31o2/sources/dump/vmware-libcrypto.so.0.9.7l.tar.bz2
-	mirror://gentoo/vmware-libcrypto.so.0.9.7l.tar.bz2
-	mirror://gentoo/vmware.png"
-
-LICENSE="vmware"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-RESTRICT="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
-		virtual/xft )
-	!app-emulation/vmware-player
-	!app-emulation/vmware-server
-	~app-emulation/vmware-modules-1.0.0.11
-	>=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
-	# 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} \
-		|| 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.8.108000.ebuild
index 13b50a2c241f..2cf0fc9f3860 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-5.5.6.80404.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-5.5.8.108000.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.4 2008/05/12 15:45:42 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-5.5.8.108000.ebuild,v 1.1 2008/09/30 16:44:18 ikelos Exp $
 
 inherit vmware eutils versionator
 
@@ -20,7 +20,7 @@ SRC_URI="mirror://vmware/software/wkst/${MY_P}.tar.gz
 
 LICENSE="vmware"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 RESTRICT="fetch strip"
 
diff --git a/app-emulation/vmware-workstation/vmware-workstation-6.0.3.80004.ebuild b/app-emulation/vmware-workstation/vmware-workstation-6.0.5.109488.ebuild
index 13413cbf8dfc..02f0fd7ab133 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-6.0.3.80004.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-6.0.5.109488.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-6.0.3.80004.ebuild,v 1.3 2008/06/30 20:50:11 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-6.0.5.109488.ebuild,v 1.1 2008/09/30 16:44:18 ikelos Exp $
 
 inherit vmware eutils versionator fdo-mime gnome2-utils
 
@@ -37,9 +37,9 @@ RDEPEND="sys-libs/glibc
 	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
+	~app-emulation/vmware-modules-1.0.0.22
+	!<app-emulation/vmware-modules-1.0.0.22
+	!>=app-emulation/vmware-modules-1.0.0.23
 	>=dev-lang/perl-5
 	sys-apps/pciutils"