Clear out old insecure versions of vmware-workstation (bug 245941).

(Portage version: 2.2_rc23/cvs/Linux i686)

36 files changed, 39 insertions, 1262 deletions

diff --git a/app-emulation/vmware-workstation/ChangeLog b/app-emulation/vmware-workstation/ChangeLog
index 40c775846a2b..b4699c8d8fc9 100644
--- a/app-emulation/vmware-workstation/ChangeLog
+++ b/app-emulation/vmware-workstation/ChangeLog
@@ -1,6 +1,44 @@
 # ChangeLog for app-emulation/vmware-workstation
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.195 2009/02/14 01:21:18 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.196 2009/02/22 23:10:06 ikelos Exp $
+
+  22 Feb 2009; Mike Auty <ikelos@gentoo.org>
+  -files/6.5.0.118166/vmware-player.py.patch,
+  -files/6.5.0.118166/vmware-workstation.py.patch,
+  -files/6.5.0.118166/vmware-vix.py.patch,
+  -files/5.5.7.91707/000_all_initd-location.patch,
+  -files/5.5.7.91707/001_all_fix-permissions.patch,
+  -files/5.5.7.91707/002_all_pagebreak-detection-fix.patch,
+  -files/5.5.7.91707/004_all_do-not-build-modules.patch,
+  -files/5.5.7.91707/007_all_use-modprobe-over-insmod.patch,
+  -files/5.5.7.91707/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.4.93057/000_all_initd-location.patch,
+  -files/6.0.4.93057/001_all_fix-permissions.patch,
+  -files/6.0.4.93057/002_all_pagebreak-detection-fix.patch,
+  -files/6.0.4.93057/004_all_do-not-build-modules.patch,
+  -files/6.0.4.93057/007_all_use-modprobe-over-insmod.patch,
+  -files/6.0.4.93057/009_all_init.d-modules-warning.patch,
+  -files/6.0.4.93057/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,
+  -files/6.5.0.118166/vmware-player-extras.py.patch,
+  -vmware-workstation-5.5.7.91707.ebuild,
+  -vmware-workstation-5.5.8.108000.ebuild,
+  -vmware-workstation-6.0.4.93057.ebuild,
+  -vmware-workstation-6.0.5.109488.ebuild,
+  -vmware-workstation-6.5.0.118166.ebuild:
+  Clear out old insecure versions of vmware-workstation (bug 245941).
 
   14 Feb 2009; Mike Auty <ikelos@gentoo.org>
   vmware-workstation-6.5.1.126130.ebuild:
diff --git a/app-emulation/vmware-workstation/files/5.5.7.91707/000_all_initd-location.patch b/app-emulation/vmware-workstation/files/5.5.7.91707/000_all_initd-location.patch
deleted file mode 100644
index 1d864f7e0dd7..000000000000
--- a/app-emulation/vmware-workstation/files/5.5.7.91707/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.7.91707/001_all_fix-permissions.patch b/app-emulation/vmware-workstation/files/5.5.7.91707/001_all_fix-permissions.patch
deleted file mode 100644
index e646b7b2da5c..000000000000
--- a/app-emulation/vmware-workstation/files/5.5.7.91707/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.7.91707/002_all_pagebreak-detection-fix.patch b/app-emulation/vmware-workstation/files/5.5.7.91707/002_all_pagebreak-detection-fix.patch
deleted file mode 100644
index fd3fc76ca679..000000000000
--- a/app-emulation/vmware-workstation/files/5.5.7.91707/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.7.91707/004_all_do-not-build-modules.patch b/app-emulation/vmware-workstation/files/5.5.7.91707/004_all_do-not-build-modules.patch
deleted file mode 100644
index cec3b3ee4c1d..000000000000
--- a/app-emulation/vmware-workstation/files/5.5.7.91707/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.7.91707/007_all_use-modprobe-over-insmod.patch b/app-emulation/vmware-workstation/files/5.5.7.91707/007_all_use-modprobe-over-insmod.patch
deleted file mode 100644
index c29a87e8f226..000000000000
--- a/app-emulation/vmware-workstation/files/5.5.7.91707/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.7.91707/009_all_init.d-modules-warning.patch b/app-emulation/vmware-workstation/files/5.5.7.91707/009_all_init.d-modules-warning.patch
deleted file mode 100644
index 4eab043af8dc..000000000000
--- a/app-emulation/vmware-workstation/files/5.5.7.91707/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.8.108000/000_all_initd-location.patch b/app-emulation/vmware-workstation/files/5.5.8.108000/000_all_initd-location.patch
deleted file mode 100644
index 1d864f7e0dd7..000000000000
--- a/app-emulation/vmware-workstation/files/5.5.8.108000/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.8.108000/001_all_fix-permissions.patch b/app-emulation/vmware-workstation/files/5.5.8.108000/001_all_fix-permissions.patch
deleted file mode 100644
index e646b7b2da5c..000000000000
--- a/app-emulation/vmware-workstation/files/5.5.8.108000/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.8.108000/002_all_pagebreak-detection-fix.patch b/app-emulation/vmware-workstation/files/5.5.8.108000/002_all_pagebreak-detection-fix.patch
deleted file mode 100644
index fd3fc76ca679..000000000000
--- a/app-emulation/vmware-workstation/files/5.5.8.108000/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.8.108000/004_all_do-not-build-modules.patch b/app-emulation/vmware-workstation/files/5.5.8.108000/004_all_do-not-build-modules.patch
deleted file mode 100644
index cec3b3ee4c1d..000000000000
--- a/app-emulation/vmware-workstation/files/5.5.8.108000/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.8.108000/007_all_use-modprobe-over-insmod.patch b/app-emulation/vmware-workstation/files/5.5.8.108000/007_all_use-modprobe-over-insmod.patch
deleted file mode 100644
index 5509d249f19a..000000000000
--- a/app-emulation/vmware-workstation/files/5.5.8.108000/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.8.108000/009_all_init.d-modules-warning.patch b/app-emulation/vmware-workstation/files/5.5.8.108000/009_all_init.d-modules-warning.patch
deleted file mode 100644
index 4eab043af8dc..000000000000
--- a/app-emulation/vmware-workstation/files/5.5.8.108000/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.4.93057/000_all_initd-location.patch b/app-emulation/vmware-workstation/files/6.0.4.93057/000_all_initd-location.patch
deleted file mode 100644
index 6eb6619d2b8e..000000000000
--- a/app-emulation/vmware-workstation/files/6.0.4.93057/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.4.93057/001_all_fix-permissions.patch b/app-emulation/vmware-workstation/files/6.0.4.93057/001_all_fix-permissions.patch
deleted file mode 100644
index e646b7b2da5c..000000000000
--- a/app-emulation/vmware-workstation/files/6.0.4.93057/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.4.93057/002_all_pagebreak-detection-fix.patch b/app-emulation/vmware-workstation/files/6.0.4.93057/002_all_pagebreak-detection-fix.patch
deleted file mode 100644
index fd3fc76ca679..000000000000
--- a/app-emulation/vmware-workstation/files/6.0.4.93057/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.4.93057/004_all_do-not-build-modules.patch b/app-emulation/vmware-workstation/files/6.0.4.93057/004_all_do-not-build-modules.patch
deleted file mode 100644
index e2649c0af27b..000000000000
--- a/app-emulation/vmware-workstation/files/6.0.4.93057/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.4.93057/007_all_use-modprobe-over-insmod.patch b/app-emulation/vmware-workstation/files/6.0.4.93057/007_all_use-modprobe-over-insmod.patch
deleted file mode 100644
index c29a87e8f226..000000000000
--- a/app-emulation/vmware-workstation/files/6.0.4.93057/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.4.93057/009_all_init.d-modules-warning.patch b/app-emulation/vmware-workstation/files/6.0.4.93057/009_all_init.d-modules-warning.patch
deleted file mode 100644
index 4eab043af8dc..000000000000
--- a/app-emulation/vmware-workstation/files/6.0.4.93057/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.4.93057/011_all_legit-modules-only.patch b/app-emulation/vmware-workstation/files/6.0.4.93057/011_all_legit-modules-only.patch
deleted file mode 100644
index 9e453ed1e2ee..000000000000
--- a/app-emulation/vmware-workstation/files/6.0.4.93057/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/6.0.5.109488/000_all_initd-location.patch b/app-emulation/vmware-workstation/files/6.0.5.109488/000_all_initd-location.patch
deleted file mode 100644
index 6eb6619d2b8e..000000000000
--- a/app-emulation/vmware-workstation/files/6.0.5.109488/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.5.109488/001_all_fix-permissions.patch b/app-emulation/vmware-workstation/files/6.0.5.109488/001_all_fix-permissions.patch
deleted file mode 100644
index e646b7b2da5c..000000000000
--- a/app-emulation/vmware-workstation/files/6.0.5.109488/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.5.109488/002_all_pagebreak-detection-fix.patch b/app-emulation/vmware-workstation/files/6.0.5.109488/002_all_pagebreak-detection-fix.patch
deleted file mode 100644
index fd3fc76ca679..000000000000
--- a/app-emulation/vmware-workstation/files/6.0.5.109488/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.5.109488/004_all_do-not-build-modules.patch b/app-emulation/vmware-workstation/files/6.0.5.109488/004_all_do-not-build-modules.patch
deleted file mode 100644
index e2649c0af27b..000000000000
--- a/app-emulation/vmware-workstation/files/6.0.5.109488/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.5.109488/007_all_use-modprobe-over-insmod.patch b/app-emulation/vmware-workstation/files/6.0.5.109488/007_all_use-modprobe-over-insmod.patch
deleted file mode 100644
index 5509d249f19a..000000000000
--- a/app-emulation/vmware-workstation/files/6.0.5.109488/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/6.0.5.109488/009_all_init.d-modules-warning.patch b/app-emulation/vmware-workstation/files/6.0.5.109488/009_all_init.d-modules-warning.patch
deleted file mode 100644
index 4eab043af8dc..000000000000
--- a/app-emulation/vmware-workstation/files/6.0.5.109488/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.5.109488/011_all_legit-modules-only.patch b/app-emulation/vmware-workstation/files/6.0.5.109488/011_all_legit-modules-only.patch
deleted file mode 100644
index 9e453ed1e2ee..000000000000
--- a/app-emulation/vmware-workstation/files/6.0.5.109488/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/6.5.0.118166/vmware-player-extras.py.patch b/app-emulation/vmware-workstation/files/6.5.0.118166/vmware-player-extras.py.patch
deleted file mode 100644
index eb9e723058cb..000000000000
--- a/app-emulation/vmware-workstation/files/6.5.0.118166/vmware-player-extras.py.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/vmware-player-extras.py b/vmware-player-extras.py
-index 21595b1..e8adf08 100644
---- a/vmware-player-extras.py
-+++ b/vmware-player-extras.py
-@@ -6,7 +6,8 @@ VMware Player Extras component installer.
- 
- DEST = LIBDIR/'vmware'
- SETTINGS = { 'vmware.fullpath': BINDIR/'vmware', }
--CONF = DEST/'setup/vmware-config'
-+import os
-+CONF = path(os.environ['WORKDIR'])/'vmware-config.sh'
- 
- 
- class PlayerExtras(Installer):
diff --git a/app-emulation/vmware-workstation/files/6.5.0.118166/vmware-player.py.patch b/app-emulation/vmware-workstation/files/6.5.0.118166/vmware-player.py.patch
deleted file mode 100644
index 49306c33f42e..000000000000
--- a/app-emulation/vmware-workstation/files/6.5.0.118166/vmware-player.py.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff --git a/vmware-player.py b/vmware-player.py
-index bee22df..d06cca9 100644
---- a/vmware-player.py
-+++ b/vmware-player.py
-@@ -6,7 +6,8 @@ VMware Player component installer.
- 
- GCONF_DEFAULTS = 'xml:readwrite:/etc/gconf/gconf.xml.defaults'
- DEST = LIBDIR/'vmware'
--CONFIG = DEST/'setup/vmware-config'
-+import os
-+CONFIG = path(os.environ['WORKDIR'])/'vmware-config.sh'
- CUPSLIBDIR = LIBDIR/'cups'
- # XXX: LIBDIR should be properly calculated, to make this cleaner
- if (PREFIX/'lib64/cups').exists():
-@@ -84,12 +85,12 @@ class Player(Installer):
-       ret, kvers = output('uname', '-r')
-       kvers = kvers.strip()
-       modules = ('vmmon', 'vmnet', 'vmblock', 'vmci', 'vsock')
--      base = path('/lib/modules/%s/misc' % kvers)
-+      base = path('/this/path/doesnt/exist/lib/modules/%s/misc' % kvers)
- 
-       for module in modules:
-          for ext in ('o', 'ko'):
-             mod = '%s.%s' % (module, ext)
--            (base/mod).remove(ignore_errors=True)
-+            # (base/mod).remove(ignore_errors=True)
- 
-    def PreUninstall(self, old, new, upgrade):
-       script = INITSCRIPTDIR/'vmware'
-@@ -156,8 +157,8 @@ class Player(Installer):
-    def PostTransactionInstall(self, old, new, upgrade):
-       if ENV.get('VMWARE_SKIP_MODULES'):
-          log.info('Skipping kernel module installation')
--      elif run(BINDIR/'vmware-modconfig', '--console', '--install-all') == 0:
--         log.info('Successfully installed kernel modules')
-+      # elif run(BINDIR/'vmware-modconfig', '--console', '--install-all') == 0:
-+      #    log.info('Successfully installed kernel modules')
-       else:
-          log.info('Unable to install kernel modules')
- 
-@@ -189,8 +190,8 @@ class Player(Installer):
-          for handler in ('vm', 'vms'):
-             for gconfType, key, value in settings:
-                key = key % handler
--               run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
--                   '--type', gconfType, '--set', key, value)
-+               # run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
-+               #     '--type', gconfType, '--set', key, value)
- 
-          # Instruct all gconfd daemons to reload.
-          run('killall', '-HUP', 'gconfd-2')
-@@ -200,9 +201,9 @@ class Player(Installer):
-    def _deconfigureVMStreamingHandlers(self):
-       """ Deconfigures the handlers for vm:// and vms:// used for VM streaming"""
-       def deconfigureGConf():
--         for handler in ('vm', 'vms'):
--            run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
--                '--recursive-unset', '/desktop/gnome/url-handlers/%s' % handler)
-+         # for handler in ('vm', 'vms'):
-+         #    run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
-+         #       '--recursive-unset', '/desktop/gnome/url-handlers/%s' % handler)
- 
-          # Instruct all gconfd daemons to reload.
-          run('killall', '-HUP', 'gconfd-2')
diff --git a/app-emulation/vmware-workstation/files/6.5.0.118166/vmware-vix.py.patch b/app-emulation/vmware-workstation/files/6.5.0.118166/vmware-vix.py.patch
deleted file mode 100644
index 5984bdff95ad..000000000000
--- a/app-emulation/vmware-workstation/files/6.5.0.118166/vmware-vix.py.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/vmware-vix.py b/vmware-vix.py
-index ac64dc5..8fdc2b2 100644
---- a/vmware-vix.py
-+++ b/vmware-vix.py
-@@ -4,7 +4,8 @@ Copyright 2007 VMware, Inc.  All rights reserved. -- VMware Confidential
- VIX component installer.
- """
- DEST = LIBDIR/'vmware-vix'
--conf = DEST/'setup/vmware-config'
-+import os
-+conf = path(os.environ['WORKDIR'])/'vmware-config.sh'
- 
- class VIX(Installer):
-    def InitializeInstall(self, old, new, upgrade):
diff --git a/app-emulation/vmware-workstation/files/6.5.0.118166/vmware-workstation.py.patch b/app-emulation/vmware-workstation/files/6.5.0.118166/vmware-workstation.py.patch
deleted file mode 100644
index da139bbb1318..000000000000
--- a/app-emulation/vmware-workstation/files/6.5.0.118166/vmware-workstation.py.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/vmware-workstation.py b/vmware-workstation.py
-index 55476d9..8dd4c0a 100644
---- a/vmware-workstation.py
-+++ b/vmware-workstation.py
-@@ -4,7 +4,8 @@ Copyright 2008 VMware, Inc.  All rights reserved. -- VMware Confidential
- VMware Workstation component installer.
- """
- DEST = LIBDIR/'vmware'
--conf = DEST/'setup/vmware-config'
-+import os
-+conf = path(os.environ['WORKDIR'])/'vmware-config.sh'
- 
- class Workstation(Installer):
-    def PreTransactionInstall(self, old, new, upgrade):
-@@ -40,7 +41,7 @@ class Workstation(Installer):
-       self.AddPermission(DEST/'bin/*', BINARY)
- 
-       eclipse = config.Get('vmware-workstation.eclipse')
--      eclipse and self.AddTarget(Link, DEST/'eclipse-ivd/com.vmware.bfg_1.0.0',
-+      False and self.AddTarget(Link, DEST/'eclipse-ivd/com.vmware.bfg_1.0.0',
-                                  Destination(eclipse)/'plugins/com.vmware.bfg_1.0.0')
- 
-    def _vmwareMountRunnable(self, vmwareMount):
diff --git a/app-emulation/vmware-workstation/vmware-workstation-5.5.7.91707.ebuild b/app-emulation/vmware-workstation/vmware-workstation-5.5.7.91707.ebuild
deleted file mode 100644
index 70bd82715a2c..000000000000
--- a/app-emulation/vmware-workstation/vmware-workstation-5.5.7.91707.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.7.91707.ebuild,v 1.4 2009/01/04 22:29:49 ulm 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-5.5.8.108000.ebuild b/app-emulation/vmware-workstation/vmware-workstation-5.5.8.108000.ebuild
deleted file mode 100644
index 83114cf4392d..000000000000
--- a/app-emulation/vmware-workstation/vmware-workstation-5.5.8.108000.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.8.108000.ebuild,v 1.3 2009/01/11 22:05:21 maekke 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-6.0.4.93057.ebuild b/app-emulation/vmware-workstation/vmware-workstation-6.0.4.93057.ebuild
deleted file mode 100644
index 28cb0fef8f96..000000000000
--- a/app-emulation/vmware-workstation/vmware-workstation-6.0.4.93057.ebuild
+++ /dev/null
@@ -1,150 +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-6.0.4.93057.ebuild,v 1.3 2009/01/04 22:29:49 ulm Exp $
-
-inherit vmware eutils versionator fdo-mime gnome2-utils
-
-MY_PN="VMware-workstation-$(replace_version_separator 3 - $PV)"
-
-DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
-HOMEPAGE="http://www.vmware.com/products/desktop/ws_features.html"
-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 )
-	"
-
-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
-	x11-libs/libXrandr
-	x11-libs/libXcursor
-	x11-libs/libXinerama
-	x11-libs/libXi
-	x11-libs/libXft
-	x11-libs/libview
-	dev-cpp/libsexymm
-	dev-cpp/cairomm
-	dev-cpp/libgnomecanvasmm
-	!app-emulation/vmware-player
-	!app-emulation/vmware-server
-	~app-emulation/vmware-modules-1.0.0.20
-	!<app-emulation/vmware-modules-1.0.0.20
-	!>=app-emulation/vmware-modules-1.0.0.21
-	>=dev-lang/perl-5
-	sys-apps/pciutils"
-
-S=${WORKDIR}/vmware-distrib
-
-ANY_ANY=""
-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}"
-	if [ "${ANY_ANY}" != "" ]; then
-		einfo "${ANY_ANY}.tar.gz is also necessary for compilation"
-		einfo "but should already have been fetched."
-	fi
-}
-
-src_install() {
-	vmware_src_install
-
-	# 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}${ICONDIR}"
-
-	# 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
-}
diff --git a/app-emulation/vmware-workstation/vmware-workstation-6.0.5.109488.ebuild b/app-emulation/vmware-workstation/vmware-workstation-6.0.5.109488.ebuild
deleted file mode 100644
index 1b85948c6291..000000000000
--- a/app-emulation/vmware-workstation/vmware-workstation-6.0.5.109488.ebuild
+++ /dev/null
@@ -1,150 +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-6.0.5.109488.ebuild,v 1.2 2009/01/04 22:29:49 ulm Exp $
-
-inherit vmware eutils versionator fdo-mime gnome2-utils
-
-MY_PN="VMware-workstation-$(replace_version_separator 3 - $PV)"
-
-DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
-HOMEPAGE="http://www.vmware.com/products/desktop/ws_features.html"
-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 )
-	"
-
-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
-	x11-libs/libXrandr
-	x11-libs/libXcursor
-	x11-libs/libXinerama
-	x11-libs/libXi
-	x11-libs/libXft
-	x11-libs/libview
-	dev-cpp/libsexymm
-	dev-cpp/cairomm
-	dev-cpp/libgnomecanvasmm
-	!app-emulation/vmware-player
-	!app-emulation/vmware-server
-	~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"
-
-S=${WORKDIR}/vmware-distrib
-
-ANY_ANY=""
-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}"
-	if [ "${ANY_ANY}" != "" ]; then
-		einfo "${ANY_ANY}.tar.gz is also necessary for compilation"
-		einfo "but should already have been fetched."
-	fi
-}
-
-src_install() {
-	vmware_src_install
-
-	# 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}${ICONDIR}"
-
-	# 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
-}
diff --git a/app-emulation/vmware-workstation/vmware-workstation-6.5.0.118166.ebuild b/app-emulation/vmware-workstation/vmware-workstation-6.5.0.118166.ebuild
deleted file mode 100644
index 0902e680b3fb..000000000000
--- a/app-emulation/vmware-workstation/vmware-workstation-6.5.0.118166.ebuild
+++ /dev/null
@@ -1,178 +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-6.5.0.118166.ebuild,v 1.7 2009/01/04 22:29:49 ulm Exp $
-
-inherit eutils versionator fdo-mime gnome2-utils
-
-MY_PN="VMware-Workstation-$(replace_version_separator 3 - $PV)"
-
-DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
-HOMEPAGE="http://www.vmware.com/products/desktop/ws_features.html"
-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="-* ~x86 ~amd64"
-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
-		dev-python/lxml"
-RDEPEND="sys-libs/glibc
-	x11-libs/libXrandr
-	x11-libs/libXcursor
-	x11-libs/libXinerama
-	x11-libs/libXi
-	x11-libs/libXft
-	>=x11-libs/libview-0.6.2
-	dev-cpp/libsexymm
-	dev-cpp/cairomm
-	dev-cpp/libgnomecanvasmm
-	!app-emulation/vmware-player
-	!app-emulation/vmware-server
-	~app-emulation/vmware-modules-1.0.0.23
-	!<app-emulation/vmware-modules-1.0.0.23
-	!>=app-emulation/vmware-modules-1.0.0.24
-	sys-apps/pciutils"
-
-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 ! 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
-
-	if ! built_with_use -a '>=dev-lang/python-2.5' sqlite ncurses; then
-		eerror "You need to build dev-lang/python with \"sqlite ncurses\" USE flags!"
-		die "Please rebuild dev-lang/python with sqlite and ncurses USE flags!"
-	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 ${HOMEPAGE}"
-}
-
-src_unpack() {
-	# Unbundle the bundle
-	cp "${FILESDIR}"/helpers/* "${WORKDIR}"
-	chmod a+x "${WORKDIR}"/*.sh
-	"${WORKDIR}"/unbundler.sh "${DISTDIR}/${MY_P}".bundle
-
-	# Patch up the installer
-	epatch "${FILESDIR}/${P}-installer.patch"
-
-	mkdir "${WORKDIR}/vmware-confdir"
-}
-
-src_install() {
-	dodir /etc/init.d
-
-	#Run the installer
-	local INSTALLER="${WORKDIR}/payload/install/vmware-installer"
-	local PYOPTS="-W ignore::DeprecationWarning"
-	export VMWARE_SKIP_NETWORKING="true"
-	python ${PYOPTS} "${INSTALLER}/vmware-installer.py" \
-		--set-setting vmware-installer.libconf "${INSTALLER}/lib/libconf" \
-		--set-setting initdir "${T}" \
-		--set-setting initscriptdir "${D}/etc/init.d" \
-		--set-setting prefix "${D}${VM_INSTALL_DIR}" \
-		--set-setting sysconfdir "${D}/etc" \
-		--install-component "${INSTALLER}" \
-		--install-bundle "${DISTDIR}/${MY_P}.bundle" \
-		--console --required
-
-	rm -fr "${D}${VM_INSTALL_DIR}/lib/vmware/modules/binary"
-
-	if [ ! -e "${WORKDIR}"/vmware-confdir/bootstrap ]; then
-		eerror "VMware installation seems to have rolled back."
-		eerror "Please include the contents of ${WORKDIR}/vmware-installer.log"
-		eerror "in any bug reports you file."
-		die "VMware installation rolled back."
-	fi
-
-	# Redirect all the ${D} paths to / paths"
-	sed -i -e "s:${D}::" "${WORKDIR}"/vmware-confdir/bootstrap
-
-	# Fix up icons/mime/desktop handlers
-	dodir /usr/share/
-	mv "${D}${VM_INSTALL_DIR}"/share/applications "${D}"/usr/share/
-	rm -f "${D}${VM_INSTALL_DIR}"/share/icons/hicolor/{icon-theme.cache,index.theme}
-	mv "${D}${VM_INSTALL_DIR}"/share/icons "${D}"/usr/share/
-	dodir /usr/share/mime
-	mv "${D}${VM_INSTALL_DIR}"/share/mime/packages "${D}"/usr/share/mime
-	sed -i -e "s:${D}::" "${D}"/usr/share/applications/*.desktop
-
-	# Copy across the temporary /etc/vmware directory
-	dodir /etc/vmware/init.d
-	cp -r "${WORKDIR}"/vmware-confdir/* "${D}/etc/vmware"
-	mv "${D}"/etc/init.d/* "${D}/etc/vmware/init.d"
-	newinitd "${FILESDIR}/${PN}"-6.5.rc vmware
-	touch "${D}"/etc/vmware/networking
-
-	# Setup the path environment
-	insinto /etc/env.d
-	doins "${FILESDIR}/90${PN}"
-
-	# Fix some paths to allow included gtk to work
-	for i in 	"/etc/pango/pangorc" 			\
-				"/etc/pango/pango.modules"		\
-				"/etc/gtk-2.0/gtk.immodules"	\
-				"/etc/gtk-2.0/gdk-pixbuf.loaders" ; do
-		sed -i -e "s:${D}::" "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf${i} ;
-		sed -i -e "s:${D}::" "${D}${VM_INSTALL_DIR}"/lib/vmware/installer/lib/libconf${i} ;
-	done
-
-	# No idea why this happens, but it seems to happen all the time
-	ewarn "The following installation segment takes a *very* long time."
-	ewarn "Please be patient."
-}
-
-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-player, you must configure a default
-	network setup."
-	ewarn "You can do this by running 'emerge --config ${PN}'."
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}