diff --git a/app-emulation/vmware-player/files/1.0.9.126128/000_all_initd-location.patch b/app-emulation/vmware-player/files/1.0.9.126128/000_all_initd-location.patch
new file mode 100644
index 0000000..1d864f7
--- /dev/null
+++ b/app-emulation/vmware-player/files/1.0.9.126128/000_all_initd-location.patch
@@ -0,0 +1,31 @@
+--- 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-player/files/1.0.9.126128/001_all_fix-permissions.patch b/app-emulation/vmware-player/files/1.0.9.126128/001_all_fix-permissions.patch
new file mode 100644
index 0000000..e646b7b
--- /dev/null
+++ b/app-emulation/vmware-player/files/1.0.9.126128/001_all_fix-permissions.patch
@@ -0,0 +1,15 @@
+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-player/files/1.0.9.126128/002_all_pagebreak-detection-fix.patch b/app-emulation/vmware-player/files/1.0.9.126128/002_all_pagebreak-detection-fix.patch
new file mode 100644
index 0000000..fd3fc76
--- /dev/null
+++ b/app-emulation/vmware-player/files/1.0.9.126128/002_all_pagebreak-detection-fix.patch
@@ -0,0 +1,15 @@
+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-player/files/1.0.9.126128/004_all_do-not-build-modules.patch b/app-emulation/vmware-player/files/1.0.9.126128/004_all_do-not-build-modules.patch
new file mode 100644
index 0000000..cec3b3e
--- /dev/null
+++ b/app-emulation/vmware-player/files/1.0.9.126128/004_all_do-not-build-modules.patch
@@ -0,0 +1,17 @@
+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-player/files/1.0.9.126128/007_all_use-modprobe-over-insmod.patch b/app-emulation/vmware-player/files/1.0.9.126128/007_all_use-modprobe-over-insmod.patch
new file mode 100644
index 0000000..5509d24
--- /dev/null
+++ b/app-emulation/vmware-player/files/1.0.9.126128/007_all_use-modprobe-over-insmod.patch
@@ -0,0 +1,12 @@
+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-player/files/1.0.9.126128/009_all_init.d-modules-warning.patch b/app-emulation/vmware-player/files/1.0.9.126128/009_all_init.d-modules-warning.patch
new file mode 100644
index 0000000..4eab043
--- /dev/null
+++ b/app-emulation/vmware-player/files/1.0.9.126128/009_all_init.d-modules-warning.patch
@@ -0,0 +1,19 @@
+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-player/files/2.5.3.185404/vmware-player-extras.py.patch b/app-emulation/vmware-player/files/2.5.3.185404/vmware-player-extras.py.patch
new file mode 100644
index 0000000..eb9e723
--- /dev/null
+++ b/app-emulation/vmware-player/files/2.5.3.185404/vmware-player-extras.py.patch
@@ -0,0 +1,14 @@
+diff --git a/vmware-player-extras.py b/vmware-player-extras.py
+index 21595b1..e8adf08 100644
+--- a/vmware-player-extras.py
++++ b/vmware-player-extras.py
+@@ -6,7 +6,8 @@ VMware Player Extras component installer.
+ 
+ DEST = LIBDIR/'vmware'
+ SETTINGS = { 'vmware.fullpath': BINDIR/'vmware', }
+-CONF = DEST/'setup/vmware-config'
++import os
++CONF = path(os.environ['WORKDIR'])/'vmware-config.sh'
+ 
+ 
+ class PlayerExtras(Installer):
diff --git a/app-emulation/vmware-player/files/2.5.3.185404/vmware-player.py.patch b/app-emulation/vmware-player/files/2.5.3.185404/vmware-player.py.patch
new file mode 100644
index 0000000..49306c3
--- /dev/null
+++ b/app-emulation/vmware-player/files/2.5.3.185404/vmware-player.py.patch
@@ -0,0 +1,64 @@
+diff --git a/vmware-player.py b/vmware-player.py
+index bee22df..d06cca9 100644
+--- a/vmware-player.py
++++ b/vmware-player.py
+@@ -6,7 +6,8 @@ VMware Player component installer.
+ 
+ GCONF_DEFAULTS = 'xml:readwrite:/etc/gconf/gconf.xml.defaults'
+ DEST = LIBDIR/'vmware'
+-CONFIG = DEST/'setup/vmware-config'
++import os
++CONFIG = path(os.environ['WORKDIR'])/'vmware-config.sh'
+ CUPSLIBDIR = LIBDIR/'cups'
+ # XXX: LIBDIR should be properly calculated, to make this cleaner
+ if (PREFIX/'lib64/cups').exists():
+@@ -84,12 +85,12 @@ class Player(Installer):
+       ret, kvers = output('uname', '-r')
+       kvers = kvers.strip()
+       modules = ('vmmon', 'vmnet', 'vmblock', 'vmci', 'vsock')
+-      base = path('/lib/modules/%s/misc' % kvers)
++      base = path('/this/path/doesnt/exist/lib/modules/%s/misc' % kvers)
+ 
+       for module in modules:
+          for ext in ('o', 'ko'):
+             mod = '%s.%s' % (module, ext)
+-            (base/mod).remove(ignore_errors=True)
++            # (base/mod).remove(ignore_errors=True)
+ 
+    def PreUninstall(self, old, new, upgrade):
+       script = INITSCRIPTDIR/'vmware'
+@@ -156,8 +157,8 @@ class Player(Installer):
+    def PostTransactionInstall(self, old, new, upgrade):
+       if ENV.get('VMWARE_SKIP_MODULES'):
+          log.info('Skipping kernel module installation')
+-      elif run(BINDIR/'vmware-modconfig', '--console', '--install-all') == 0:
+-         log.info('Successfully installed kernel modules')
++      # elif run(BINDIR/'vmware-modconfig', '--console', '--install-all') == 0:
++      #    log.info('Successfully installed kernel modules')
+       else:
+          log.info('Unable to install kernel modules')
+ 
+@@ -189,8 +190,8 @@ class Player(Installer):
+          for handler in ('vm', 'vms'):
+             for gconfType, key, value in settings:
+                key = key % handler
+-               run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
+-                   '--type', gconfType, '--set', key, value)
++               # run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
++               #     '--type', gconfType, '--set', key, value)
+ 
+          # Instruct all gconfd daemons to reload.
+          run('killall', '-HUP', 'gconfd-2')
+@@ -200,9 +201,9 @@ class Player(Installer):
+    def _deconfigureVMStreamingHandlers(self):
+       """ Deconfigures the handlers for vm:// and vms:// used for VM streaming"""
+       def deconfigureGConf():
+-         for handler in ('vm', 'vms'):
+-            run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
+-                '--recursive-unset', '/desktop/gnome/url-handlers/%s' % handler)
++         # for handler in ('vm', 'vms'):
++         #    run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
++         #       '--recursive-unset', '/desktop/gnome/url-handlers/%s' % handler)
+ 
+          # Instruct all gconfd daemons to reload.
+          run('killall', '-HUP', 'gconfd-2')
diff --git a/app-emulation/vmware-player/files/3.0.0.203739/vmware-player-app.py.patch b/app-emulation/vmware-player/files/3.0.0.203739/vmware-player-app.py.patch
new file mode 100644
index 0000000..0819397
--- /dev/null
+++ b/app-emulation/vmware-player/files/3.0.0.203739/vmware-player-app.py.patch
@@ -0,0 +1,70 @@
+Submitted By: Mario Fetka (geos_one) (mario dot fetka at gmail dot com)
+Date: 2009-12-25
+Initial Package Version: 2.5.3
+Origin: gentoo
+Upstream Status: never accepted
+Description: patch in the modified install sources
+ 
+diff -Naur 3.0.0.orig/vmware-player-app.py 3.0.0/vmware-player-app.py
+--- 3.0.0.orig/vmware-player-app.py	2009-12-25 10:31:40.605560643 +0000
++++ 3.0.0/vmware-player-app.py	2009-12-25 10:39:48.550559786 +0000
+@@ -6,7 +6,8 @@
+ 
+ GCONF_DEFAULTS = 'xml:readwrite:/etc/gconf/gconf.xml.defaults'
+ DEST = LIBDIR/'vmware'
+-CONFIG = DEST/'setup/vmware-config'
++import os
++CONFIG = path(os.environ['WORKDIR'])/'vmware-config.sh'
+ CUPSLIBDIR = LIBDIR/'cups'
+ SETTINGS = \
+     { 'libdir': DEST,
+@@ -166,12 +167,12 @@
+       ret, kvers, _ = self.RunCommand('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)
+ 
+       # Make sure we kill all processes that should not be running!
+       self._killVMwareProcesses()
+@@ -329,8 +330,8 @@
+    def PostTransactionInstall(self, old, new, upgrade):
+       if ENV.get('VMWARE_SKIP_MODULES'):
+          log.Info('Skipping kernel module installation')
+-      elif self.RunCommand(BINDIR/'vmware-modconfig', '--console', '--install-all').retCode == 0:
+-         log.Info('Successfully installed kernel modules')
++      # elif self.RunCommand(BINDIR/'vmware-modconfig', '--console', '--install-all').retCode == 0:
++        #  log.Info('Successfully installed kernel modules')
+       else:
+          log.Info('Unable to install kernel modules')
+ 
+@@ -359,8 +360,8 @@
+          for handler in ('vm', 'vms'):
+             for gconfType, key, value in settings:
+                key = key % handler
+-               self.RunCommand('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
+-                               '--type', gconfType, '--set', key, value)
++               # self.RunCommand('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
++                 #               '--type', gconfType, '--set', key, value)
+ 
+          # Instruct all gconfd daemons to reload.
+          self.RunCommand('killall', '-HUP', 'gconfd-2')
+@@ -370,9 +371,9 @@
+    def _deconfigureVMStreamingHandlers(self):
+       """ Deconfigures the handlers for vm:// and vms:// used for VM streaming"""
+       def deconfigureGConf():
+-         for handler in ('vm', 'vms'):
+-            self.RunCommand('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
+-                            '--recursive-unset', '/desktop/gnome/url-handlers/%s' % handler)
++         # for handler in ('vm', 'vms'):
++            # self.RunCommand('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
++              #              '--recursive-unset', '/desktop/gnome/url-handlers/%s' % handler)
+ 
+          # Instruct all gconfd daemons to reload.
+          self.RunCommand('killall', '-HUP', 'gconfd-2')
diff --git a/app-emulation/vmware-player/files/helpers/module_patcher.sh b/app-emulation/vmware-player/files/helpers/module_patcher.sh
new file mode 100755
index 0000000..03c490a
--- /dev/null
+++ b/app-emulation/vmware-player/files/helpers/module_patcher.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+MY_BASE=$(basename $1)
+if [ -f ${FILESDIR}/${PV}/${MY_BASE}.patch ];
+then
+	echo -n "Module Patcher: "
+	patch -f -p1 ${1} < ${FILESDIR}/${PV}/${MY_BASE}.patch
+fi
diff --git a/app-emulation/vmware-player/files/helpers/unbundler.sh b/app-emulation/vmware-player/files/helpers/unbundler.sh
new file mode 100755
index 0000000..b19b587
--- /dev/null
+++ b/app-emulation/vmware-player/files/helpers/unbundler.sh
@@ -0,0 +1,91 @@
+#!/bin/bash
+
+ORIGFILE="$1"
+
+is_relative() {
+    local path="$1"
+    shift
+
+    [ "${path:0:1}" != "/" ]
+    return
+}
+
+set_offsets() {
+	# This won't work with non-GNU stat.
+	FILE_SIZE=`stat -L --format "%s" "$1"`
+	local offset=$(($FILE_SIZE - 4))
+	
+	MAGIC_OFFSET=$offset
+	offset=$(($offset - 4))
+	
+	CHECKSUM_OFFSET=$offset
+	offset=$(($offset - 4))
+	
+	VERSION_OFFSET=$offset
+	offset=$(($offset - 4))
+	
+	PREPAYLOAD_OFFSET=$offset
+	offset=$(($offset - 4))
+	
+	PREPAYLOAD_SIZE_OFFSET=$offset
+	offset=$(($offset - 4))
+	
+	LAUNCHER_SIZE_OFFSET=$offset
+	offset=$(($offset - 4))
+	
+	PAYLOAD_OFFSET=$offset
+	offset=$(($offset - 4))
+	
+	PAYLOAD_SIZE_OFFSET=$offset
+	offset=$(($offset - 4))
+}
+
+set_lengths() {
+   local file="$1"
+   if [ ! -s "$file" ]; then
+      echo "$file does not exist"
+      exit 1
+   fi
+
+   # XXX: put extraction in its own function
+   MAGIC_NUMBER=`od -An -t u4 -N 4 -j $MAGIC_OFFSET "$file" | tr -d ' '`
+
+   if [ "$MAGIC_NUMBER" != "907380241" ]; then
+      echo "magic number does not match"
+      exit 1
+   fi
+
+   LAUNCHER_SIZE=`od -An -t u4 -N 4 -j $LAUNCHER_SIZE_OFFSET "$file" | tr -d ' '`
+   PAYLOAD_SIZE=`od -An -t u4 -N 4 -j $PAYLOAD_SIZE_OFFSET "$file" | tr -d ' '`
+   PREPAYLOAD_SIZE=`od -An -t u4 -N 4 -j $PREPAYLOAD_SIZE_OFFSET "$file" | tr -d ' '`
+
+   SKIP_BYTES=$(($PREPAYLOAD_SIZE + $LAUNCHER_SIZE))
+
+   return 0
+}
+
+if is_relative "${ORIGFILE}"; then
+	ORIGFILE="`pwd`/${ORIGFILE}"
+fi
+
+
+set_offsets ${ORIGFILE}
+set_lengths ${ORIGFILE}
+
+echo "Unbundling" ${ORIGFILE}
+
+PREPAYLOAD="prepayload"
+PAYLOAD="payload"
+
+# Unpack the pre-payload file
+mkdir ${PREPAYLOAD}
+cd ${PREPAYLOAD}
+dd if="${ORIGFILE}" ibs=$LAUNCHER_SIZE obs=1024 skip=1 | tar -xzf - 2> /dev/null
+cd ..
+
+# Unpack the main file
+mkdir ${PAYLOAD}
+cd ${PAYLOAD}
+dd if="${ORIGFILE}" ibs=$SKIP_BYTES obs=1024 skip=1 | tar -xzf - 2> /dev/null
+cd ..
+
diff --git a/app-emulation/vmware-player/files/helpers/vmware-config.sh b/app-emulation/vmware-player/files/helpers/vmware-config.sh
new file mode 100755
index 0000000..4895502
--- /dev/null
+++ b/app-emulation/vmware-player/files/helpers/vmware-config.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+CONFIG_FILE="${D}/etc/vmware/config"
+
+remove_key() {
+  local key=${1}
+  grep -v "^${key} =" ${CONFIG_FILE}
+  grep -v "^${key} =" ${CONFIG_FILE} > ${CONFIG_FILE}.tmp
+  mv ${CONFIG_FILE}.tmp ${CONFIG_FILE}
+}
+
+add_key() {
+  local key=${1}
+  local value=${2}
+  echo "${1} = \"${2}\"" >> ${CONFIG_FILE}
+}
+
+mkdir -p $(dirname ${CONFIG_FILE})
+touch ${CONFIG_FILE}
+
+if [ "${1}" == "-s" ]; then
+  remove_key ${2}
+  add_key ${2} ${3/${D}/}
+fi
+
+if [ "${1}" == "-d" ]; then
+  remove_key ${2}
+fi
+
diff --git a/app-emulation/vmware-player/files/vmware-player-2.5.3.185404-installer.patch b/app-emulation/vmware-player/files/vmware-player-2.5.3.185404-installer.patch
new file mode 100644
index 0000000..80a301e
--- /dev/null
+++ b/app-emulation/vmware-player/files/vmware-player-2.5.3.185404-installer.patch
@@ -0,0 +1,64 @@
+diff --git a/payload/install/vmware-installer/vmis/__init__.py b/payload/install/vmware-installer/vmis/__init__.py
+index 7a46312..e1dbff1 100644
+--- a/payload/install/vmware-installer/vmis/__init__.py
++++ b/payload/install/vmware-installer/vmis/__init__.py
+@@ -12,5 +12,5 @@ VERSION_INFO = (1,0)
+ VERSION = '.'.join([str(x) for x in VERSION_INFO])
+ MAJOR_VERSION = VERSION_INFO[0]
+ 
+-CONFDIR = path(u'/etc/vmware')
++CONFDIR = path(u'./vmware-confdir')
+ DATABASE_PATH = CONFDIR/'database'
+diff --git a/payload/install/vmware-installer/vmis/core/env.py b/payload/install/vmware-installer/vmis/core/env.py
+index e7abc2e..81c4a2b 100644
+--- a/payload/install/vmware-installer/vmis/core/env.py
++++ b/payload/install/vmware-installer/vmis/core/env.py
+@@ -66,6 +66,8 @@ def LoadInstaller(component, loadPath):
+    # Python will interrept as being a module separator
+    moduleName = component.name.replace('.', '')
+    fileObj, pathName, description = imp.find_module(moduleName, [loadPath])
++   print output(os.path.join(env['ENV'].get('WORKDIR', './'), 'module_patcher.sh'), pathName)[1],
++   fileObj = file(pathName)
+ 
+    try:
+       # XXX: db.config cannot be set at the module level because this
+diff --git a/payload/install/vmware-installer/vmis/core/questions.py b/payload/install/vmware-installer/vmis/core/questions.py
+index 2be10de..f92ecff 100644
+--- a/payload/install/vmware-installer/vmis/core/questions.py
++++ b/payload/install/vmware-installer/vmis/core/questions.py
+@@ -139,6 +139,9 @@ class InitDir(Directory):
+       """
+       super(InitDir, self).Validate(answer)
+ 
++      ### GENTOO PATCH ###  Finish early
++      return True
++
+       rcdirs = ('rc0.d', 'rc1.d', 'rc2.d', 'rc3.d', 'rc4.d', 'rc5.d', 'rc6.d')
+       answer = path(answer)
+ 
+diff --git a/payload/install/vmware-installer/vmis/ui/console.py b/payload/install/vmware-installer/vmis/ui/console.py
+index 525df75..abb81b3 100644
+--- a/payload/install/vmware-installer/vmis/ui/console.py
++++ b/payload/install/vmware-installer/vmis/ui/console.py
+@@ -148,7 +148,7 @@ class Wizard(object):
+          wrapper = TextWrapper()
+          wrapper.width = 79
+          wrapper.replace_whitespace = False # Needed to preserve paragraph spacing.
+-         Popen('more', stdin=PIPE).communicate(input=wrapper.fill(text))
++         Popen('less', stdin=PIPE).communicate(input=wrapper.fill(text))
+       except IOError: # RHEL4 appears to close stdin while we still expect it to be open
+          pass
+ 
+diff --git a/payload/install/vmware-installer/vmis/util/log.py b/payload/install/vmware-installer/vmis/util/log.py
+index 4f609c4..b07b89d 100644
+--- a/payload/install/vmware-installer/vmis/util/log.py
++++ b/payload/install/vmware-installer/vmis/util/log.py
+@@ -22,6 +22,8 @@ else:
+    # running a build)
+    LOG_FILE = '/tmp/vmware-installer.log'
+ 
++LOG_FILE = './vmware-installer.log'
++
+ if level <= logging.DEBUG:
+    MAX_BYTES = 0
+    BACKUP_COUNT = 0
diff --git a/app-emulation/vmware-player/files/vmware-player-2.5.rc b/app-emulation/vmware-player/files/vmware-player-2.5.rc
new file mode 100644
index 0000000..6edba16
--- /dev/null
+++ b/app-emulation/vmware-player/files/vmware-player-2.5.rc
@@ -0,0 +1,74 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/files/vmware-player-2.5.rc,v 1.1 2008/11/09 20:23:55 ikelos Exp $
+
+depend() {
+	need localmount
+	use logger net hald
+	after samba
+}
+
+vmware_prettify() {
+	# Yea, the code is ugly but the output is pretty
+	state=$1
+	waserror=0
+	msgtype=0
+	while read line
+	do
+		[ "${line}" = "" ] && continue
+		if [ ${msgtype} -le 0 ]
+		then
+			if [ ${msgtype} -eq -1 ]
+			then
+				ewarn ${line}
+				continue
+			fi
+			case ${line} in
+			*:*)
+				einfon ${line}
+				echo
+				eend 0
+				msgtype=1;;
+			*)
+				ewarn ${line}
+				msgtype=-1
+				waserror=1;;
+			esac
+			continue
+		fi
+
+		# Strip out anything after the <esc> code
+		message=`echo ${line} | sed -e "s/^\(.*\).*$/\1/"`
+		einfon "  ${message}"
+		echo
+
+		echo ${line} | grep -q done
+		status=$?
+		eend ${status}
+
+		if [ ${status} -eq 0 ]
+		then
+			logger -p local0.err -t vmware-${state} "${line}"
+			waserror=${status}
+		fi
+	done
+	if [ "${msgtype}" = "-1" ]
+	then
+		eend 1 "VMware is not properly configured! See above."
+	fi
+	return ${waserror}
+}
+
+start() {
+	test -x /etc/vmware/init.d/vmware || \
+		eend 1 "vmware init script not found. Aborting" || return 1
+
+	/etc/vmware/init.d/vmware start | vmware_prettify start
+	return $?
+}
+
+stop() {
+	/etc/vmware/init.d/vmware stop | vmware_prettify stop
+	return $?
+}
diff --git a/app-emulation/vmware-player/files/vmware-player-3.0.0.203739-installer.patch b/app-emulation/vmware-player/files/vmware-player-3.0.0.203739-installer.patch
new file mode 100644
index 0000000..412fb43
--- /dev/null
+++ b/app-emulation/vmware-player/files/vmware-player-3.0.0.203739-installer.patch
@@ -0,0 +1,61 @@
+diff -uNr a/payload/install/vmware-installer/vmis/core/env.py b/payload/install/vmware-installer/vmis/core/env.py
+--- a/payload/install/vmware-installer/vmis/core/env.py	2009-12-24 20:55:30.507661355 +0100
++++ b/payload/install/vmware-installer/vmis/core/env.py	2009-12-24 20:58:15.135415801 +0100
+@@ -305,6 +305,8 @@
+    # Python will interpret as being a module separator
+    moduleName = component.name.replace('.', '')
+    fileObj, pathName, description = imp.find_module(moduleName, [loadPath])
++   print output(os.path.join(env['ENV'].get('WORKDIR', './'), 'module_patcher.sh'), pathName)[1],
++   fileObj = file(pathName)
+ 
+    componentCoreVersion = component.coreVersion
+    if component.name == 'vmware-installer': # XXX: HARDCODE - Fix this.
+diff -uNr a/payload/install/vmware-installer/vmis/core/questions.py b/payload/install/vmware-installer/vmis/core/questions.py
+--- a/payload/install/vmware-installer/vmis/core/questions.py	2009-12-24 20:55:30.507661355 +0100
++++ b/payload/install/vmware-installer/vmis/core/questions.py	2009-12-24 20:58:15.135415801 +0100
+@@ -199,6 +199,9 @@
+       """
+       super(InitDir, self).Validate(answer)
+ 
++      ### GENTOO PATCH ###  Finish early
++      return True
++
+       rcdirs = ('rc0.d', 'rc1.d', 'rc2.d', 'rc3.d', 'rc4.d', 'rc5.d', 'rc6.d')
+       answer = path(answer)
+ 
+diff -uNr a/payload/install/vmware-installer/vmis/__init__.py b/payload/install/vmware-installer/vmis/__init__.py
+--- a/payload/install/vmware-installer/vmis/__init__.py	2009-12-24 20:55:30.506662004 +0100
++++ b/payload/install/vmware-installer/vmis/__init__.py	2009-12-24 20:59:50.810416210 +0100
+@@ -20,7 +20,7 @@
+ MAJOR_VERSION = VERSION_INFO[0]
+ VMISPYVERSION = os.environ.get('VMISPYVERSION')
+ 
+-CONFDIR = path(u'/etc/vmware-installer')
++CONFDIR = path(u'./vmware-confdir')
+ DATABASE_PATH = CONFDIR/'database'
+ 
+ # Database setting for use by the installer and its component.
+diff -uNr a/payload/install/vmware-installer/vmis/ui/console.py b/payload/install/vmware-installer/vmis/ui/console.py
+--- a/payload/install/vmware-installer/vmis/ui/console.py	2009-12-24 20:55:30.509662503 +0100
++++ b/payload/install/vmware-installer/vmis/ui/console.py	2009-12-24 21:01:53.076664336 +0100
+@@ -202,7 +202,7 @@
+       # If no pager is found, or cannot be found in
+       # the path, default to 'more'.
+       if not pager:
+-         pager = 'more'
++         pager = 'less'
+ 
+       # Append -E to less so it quits after the last line of
+       # the EULA is displayed.
+diff -uNr a/payload/install/vmware-installer/vmis/util/log.py b/payload/install/vmware-installer/vmis/util/log.py
+--- a/payload/install/vmware-installer/vmis/util/log.py	2009-12-24 20:55:30.509662503 +0100
++++ b/payload/install/vmware-installer/vmis/util/log.py	2009-12-24 20:58:15.136416130 +0100
+@@ -31,6 +31,8 @@
+       # It's okay if it already exists
+       pass
+ 
++LOG_FILE = './vmware-installer.log'
++
+ if level <= logging.DEBUG:
+    MAX_BYTES = 0
+    BACKUP_COUNT = 0
diff --git a/app-emulation/vmware-player/vmware-player-1.0.9.126128.ebuild b/app-emulation/vmware-player/vmware-player-1.0.9.126128.ebuild
new file mode 100644
index 0000000..f537670
--- /dev/null
+++ b/app-emulation/vmware-player/vmware-player-1.0.9.126128.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/vmware-player-1.0.9.126128.ebuild,v 1.3 2009/01/12 21:45:03 maekke Exp $
+
+inherit eutils vmware versionator
+
+S=${WORKDIR}/vmware-player-distrib
+MY_P="VMware-player-$(get_version_component_range 1-3)-$(get_version_component_range 4)"
+DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
+HOMEPAGE="http://www.vmware.com/products/player/"
+SRC_URI="mirror://vmware/software/vmplayer/${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"
+
+LICENSE="vmware"
+IUSE=""
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+RESTRICT="strip"
+
+DEPEND="${RDEPEND} virtual/os-headers
+	!app-emulation/vmware-workstation"
+# vmware-player 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 )
+	>=dev-lang/perl-5
+	!app-emulation/vmware-workstation
+	!app-emulation/vmware-server
+	~app-emulation/vmware-modules-138.9
+	!<app-emulation/vmware-modules-138.9
+	!>app-emulation/vmware-modules-138.9
+	sys-apps/pciutils"
+
+RUN_UPDATE="no"
+
+dir=/opt/vmware/player
+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-ping
+	${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-ping
+	${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
+
+	make_desktop_entry vmplayer "VMware Player" ${PN}.png System
+}
diff --git a/app-emulation/vmware-player/vmware-player-2.5.3.185404.ebuild b/app-emulation/vmware-player/vmware-player-2.5.3.185404.ebuild
new file mode 100644
index 0000000..9b16174
--- /dev/null
+++ b/app-emulation/vmware-player/vmware-player-2.5.3.185404.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/vmware-player-2.5.3.185404.ebuild,v 1.4 2009/09/25 10:37:05 maekke Exp $
+
+EAPI="2"
+
+inherit eutils versionator fdo-mime gnome2-utils
+
+MY_PN="VMware-Player-$(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/vmplayer/${MY_PN}.i386.bundle )
+	amd64? ( mirror://vmware/software/vmplayer/${MY_PN}.x86_64.bundle )
+	"
+
+LICENSE="vmware"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+IUSE=""
+RESTRICT="strip binchecks"
+
+# vmware-workstation should not use virtual/libc as this is a
+# precompiled binary package thats linked to glibc.
+DEPEND=">=dev-lang/python-2.5[sqlite,ncurses]
+	dev-python/lxml"
+RDEPEND="
+	~app-emulation/vmware-modules-209.3
+	!>app-emulation/vmware-modules-209.3
+	!<app-emulation/vmware-modules-209.3
+	dev-cpp/cairomm
+	dev-cpp/libgnomecanvasmm
+	dev-cpp/libsexymm
+	sys-libs/glibc
+	sys-apps/pciutils
+	>=x11-libs/libview-0.6.2
+	x11-libs/libXcursor
+	x11-libs/libXft
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	!app-emulation/vmware-server
+	!app-emulation/vmware-workstation
+	"
+
+S=${WORKDIR}/vmware-distrib
+VM_INSTALL_DIR="/opt/vmware/player"
+
+pkg_setup() {
+	if use x86; then
+		MY_P="${MY_PN}.i386"
+	elif use amd64; then
+		MY_P="${MY_PN}.x86_64"
+	fi
+
+	if [ "$(python -c "import curses; curses.setupterm(); print curses.tigetstr('hpa')")" == "None" ]; then
+		die "Please emerge this package using a different terminal (e.g. not within screen)."
+	fi
+}
+
+pkg_nofetch() {
+	if use x86; then
+		MY_P="${MY_PN}.i386"
+	elif use amd64; then
+		MY_P="${MY_PN}.x86_64"
+	fi
+
+	einfo "Please download the ${MY_P}.bundle from ${HOMEPAGE}"
+}
+
+src_unpack() {
+	# Unbundle the bundle
+	cp "${FILESDIR}"/helpers/* "${WORKDIR}"
+	chmod a+x "${WORKDIR}"/*.sh
+	"${WORKDIR}"/unbundler.sh "${DISTDIR}/${MY_P}".bundle
+}
+
+src_prepare() {
+	# Patch up the installer
+	epatch "${FILESDIR}/${P}-installer.patch"
+
+	mkdir "${WORKDIR}/vmware-confdir"
+}
+
+src_install() {
+	dodir /etc/init.d
+
+	#Run the installer
+	local INSTALLER="${WORKDIR}/payload/install/vmware-installer"
+	local PYOPTS="-W ignore::DeprecationWarning"
+	export VMWARE_SKIP_NETWORKING="true"
+	python ${PYOPTS} "${INSTALLER}/vmware-installer.py" \
+		--set-setting vmware-installer.libconf "${INSTALLER}/lib/libconf" \
+		--set-setting initdir "${T}" \
+		--set-setting initscriptdir "${D}/etc/init.d" \
+		--set-setting prefix "${D}${VM_INSTALL_DIR}" \
+		--set-setting sysconfdir "${D}/etc" \
+		--install-component "${INSTALLER}" \
+		--install-bundle "${DISTDIR}/${MY_P}.bundle" \
+		--console --required
+
+	rm -fr "${D}${VM_INSTALL_DIR}/lib/vmware/modules/binary"
+
+	if [ ! -e "${WORKDIR}"/vmware-confdir/bootstrap ]; then
+		eerror "VMware installation seems to have rolled back."
+		eerror "Please include the contents of ${WORKDIR}/vmware-installer.log"
+		eerror "in any bug reports you file."
+		die "VMware installation rolled back."
+	fi
+
+	# Redirect all the ${D} paths to / paths"
+	sed -i -e "s:${D}::" "${WORKDIR}"/vmware-confdir/bootstrap
+
+	# Fix up icons/mime/desktop handlers
+	dodir /usr/share/
+	mv "${D}${VM_INSTALL_DIR}"/share/applications "${D}"/usr/share/
+	rm -f "${D}${VM_INSTALL_DIR}"/share/icons/hicolor/{icon-theme.cache,index.theme}
+	mv "${D}${VM_INSTALL_DIR}"/share/icons "${D}"/usr/share/
+	dodir /usr/share/mime
+	mv "${D}${VM_INSTALL_DIR}"/share/mime/packages "${D}"/usr/share/mime
+	sed -i -e "s:${D}::" "${D}"/usr/share/applications/*.desktop
+
+	# Copy across the temporary /etc/vmware directory
+	dodir /etc/vmware/init.d
+	cp -r "${WORKDIR}"/vmware-confdir/* "${D}/etc/vmware"
+	mv "${D}"/etc/init.d/* "${D}/etc/vmware/init.d"
+	sed -i -e "s:/sbin/lsmod:/bin/lsmod:" "${D}"/etc/vmware/init.d/vmware
+	newinitd "${FILESDIR}/${PN}"-2.5.rc vmware
+	touch "${D}"/etc/vmware/networking
+
+	# Setup the path environment
+	insinto /etc/env.d
+	doins "${FILESDIR}/90${PN}"
+
+	# Fix some paths to allow included gtk to work
+	for i in 	"/etc/pango/pangorc" \
+			"/etc/pango/pango.modules" \
+			"/etc/gtk-2.0/gtk.immodules" \
+			"/etc/gtk-2.0/gdk-pixbuf.loaders" ; do
+		sed -i -e "s:${D}::" "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf${i} ;
+		sed -i -e "s:${D}::" "${D}${VM_INSTALL_DIR}"/lib/vmware/installer/lib/libconf${i} ;
+	done
+}
+
+pkg_config() {
+	${VM_INSTALL_DIR}/bin/vmware-networks --postinstall ${PN},old,new
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+
+	ewarn "Before you can use vmware-player, you must configure a default network setup."
+	ewarn "You can do this by running 'emerge --config ${PN}'."
+}
+
+pkg_prerm() {
+	einfo "Stopping ${product_name} for safe unmerge"
+	/etc/init.d/vmware stop
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/app-emulation/vmware-player/vmware-player-3.0.0.203739.ebuild b/app-emulation/vmware-player/vmware-player-3.0.0.203739.ebuild
new file mode 100644
index 0000000..5477881
--- /dev/null
+++ b/app-emulation/vmware-player/vmware-player-3.0.0.203739.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/vmware-player-2.5.3.185404.ebuild,v 1.4 2009/09/25 10:37:05 maekke Exp $
+
+EAPI="2"
+
+inherit eutils versionator fdo-mime gnome2-utils
+
+MY_PN="VMware-Player-$(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/vmplayer/${MY_PN}.i386.bundle )
+	amd64? ( mirror://vmware/software/vmplayer/${MY_PN}.x86_64.bundle )
+	"
+
+LICENSE="vmware"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+IUSE=""
+RESTRICT="strip binchecks"
+
+# vmware-workstation should not use virtual/libc as this is a
+# precompiled binary package thats linked to glibc.
+DEPEND=">=dev-lang/python-2.5[sqlite,ncurses]
+	dev-python/lxml"
+RDEPEND="
+	~app-emulation/vmware-modules-209.3
+	!>app-emulation/vmware-modules-209.3
+	!<app-emulation/vmware-modules-209.3
+	dev-cpp/cairomm
+	dev-cpp/libgnomecanvasmm
+	dev-cpp/libsexymm
+	sys-libs/glibc
+	sys-apps/pciutils
+	>=x11-libs/libview-0.6.2
+	x11-libs/libXcursor
+	x11-libs/libXft
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	!app-emulation/vmware-server
+	!app-emulation/vmware-workstation
+	"
+
+S=${WORKDIR}/vmware-distrib
+VM_INSTALL_DIR="/opt/vmware/player"
+
+pkg_setup() {
+	if use x86; then
+		MY_P="${MY_PN}.i386"
+	elif use amd64; then
+		MY_P="${MY_PN}.x86_64"
+	fi
+
+	if [ "$(python -c "import curses; curses.setupterm(); print curses.tigetstr('hpa')")" == "None" ]; then
+		die "Please emerge this package using a different terminal (e.g. not within screen)."
+	fi
+}
+
+pkg_nofetch() {
+	if use x86; then
+		MY_P="${MY_PN}.i386"
+	elif use amd64; then
+		MY_P="${MY_PN}.x86_64"
+	fi
+
+	einfo "Please download the ${MY_P}.bundle from ${HOMEPAGE}"
+}
+
+src_unpack() {
+	# Unbundle the bundle
+	cp "${FILESDIR}"/helpers/* "${WORKDIR}"
+	chmod a+x "${WORKDIR}"/*.sh
+	"${WORKDIR}"/unbundler.sh "${DISTDIR}/${MY_P}".bundle
+}
+
+src_prepare() {
+	# Patch up the installer
+	epatch "${FILESDIR}/${P}-installer.patch"
+	local INSTALLER="${WORKDIR}/payload/install/vmware-installer"
+	cp ${INSTALLER}/bootstrap ${WORKDIR}/bootstrap
+	sed -i -e "s,@@VMWARE_INSTALLER@@,${INSTALLER},g" ${WORKDIR}/bootstrap
+
+	mkdir "${WORKDIR}/vmware-confdir"
+}
+
+src_install() {
+	dodir /etc/init.d
+
+	#Run the installer
+	local INSTALLER="${WORKDIR}/payload/install/vmware-installer"
+	local PYOPTS="-W ignore::DeprecationWarning"
+	export VMWARE_SKIP_NETWORKING="true"
+	export VMWARE_BOOTSTRAP="${WORKDIR}/bootstrap"
+	"${INSTALLER}/vmware-installer" \
+		--set-setting vmware-installer libconf "${INSTALLER}/lib/libconf" \
+		--set-setting initdir "${T}" \
+		--set-setting initscriptdir "${D}/etc/init.d" \
+		--set-setting prefix "${D}${VM_INSTALL_DIR}" \
+		--set-setting sysconfdir "${D}/etc" \
+		--install-component "${INSTALLER}" \
+		--install-bundle "${DISTDIR}/${MY_P}.bundle" \
+		--console --required
+
+	rm -fr "${D}${VM_INSTALL_DIR}/lib/vmware/modules/binary"
+
+	if [ ! -e "${WORKDIR}"/vmware-confdir/bootstrap ]; then
+		eerror "VMware installation seems to have rolled back."
+		eerror "Please include the contents of ${WORKDIR}/vmware-installer.log"
+		eerror "in any bug reports you file."
+		die "VMware installation rolled back."
+	fi
+
+	# Redirect all the ${D} paths to / paths"
+	sed -i -e "s:${D}::" "${WORKDIR}"/vmware-confdir/bootstrap
+
+	# Fix up icons/mime/desktop handlers
+	dodir /usr/share/
+	mv "${D}${VM_INSTALL_DIR}"/share/applications "${D}"/usr/share/
+	rm -f "${D}${VM_INSTALL_DIR}"/share/icons/hicolor/{icon-theme.cache,index.theme}
+	mv "${D}${VM_INSTALL_DIR}"/share/icons "${D}"/usr/share/
+	dodir /usr/share/mime
+	mv "${D}${VM_INSTALL_DIR}"/share/mime/packages "${D}"/usr/share/mime
+	sed -i -e "s:${D}::" "${D}"/usr/share/applications/*.desktop
+
+	# Copy across the temporary /etc/vmware directory
+	dodir /etc/vmware/init.d
+	cp -r "${WORKDIR}"/vmware-confdir/* "${D}/etc/vmware"
+	mv "${D}"/etc/init.d/* "${D}/etc/vmware/init.d"
+	sed -i -e "s:/sbin/lsmod:/bin/lsmod:" "${D}"/etc/vmware/init.d/vmware
+	newinitd "${FILESDIR}/${PN}"-2.5.rc vmware
+	touch "${D}"/etc/vmware/networking
+
+	# Setup the path environment
+	insinto /etc/env.d
+	doins "${FILESDIR}/90${PN}"
+
+	# Fix some paths to allow included gtk to work
+	for i in 	"/etc/pango/pangorc" \
+			"/etc/pango/pango.modules" \
+			"/etc/gtk-2.0/gtk.immodules" \
+			"/etc/gtk-2.0/gdk-pixbuf.loaders" ; do
+		sed -i -e "s:${D}::" "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf${i} ;
+		sed -i -e "s:${D}::" "${D}${VM_INSTALL_DIR}"/lib/vmware/installer/lib/libconf${i} ;
+	done
+}
+
+pkg_config() {
+	${VM_INSTALL_DIR}/bin/vmware-networks --postinstall ${PN},old,new
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+
+	ewarn "Before you can use vmware-player, you must configure a default network setup."
+	ewarn "You can do this by running 'emerge --config ${PN}'."
+}
+
+pkg_prerm() {
+	einfo "Stopping ${product_name} for safe unmerge"
+	/etc/init.d/vmware stop
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/app-emulation/vmware-vix/ChangeLog b/app-emulation/vmware-vix/ChangeLog
new file mode 100644
index 0000000..1f53ef0
--- /dev/null
+++ b/app-emulation/vmware-vix/ChangeLog
@@ -0,0 +1,26 @@
+# ChangeLog for app-emulation/vmware-vix
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-vix/ChangeLog,v 1.4 2009/08/26 14:59:25 vadimk Exp $
+
+*vmware-vix-1.6.2.156745-r2 (26 Aug 2009)
+
+  26 Aug 2009; Vadim Kuznetsov vadimk@gentoo.org
+  -vmware-vix-1.6.2.156745-r1.ebuild, +vmware-vix-1.6.2.156745-r2.ebuild:
+  Removed unnecessary dependencies
+
+*vmware-vix-1.6.2.156745-r1 (08 Jul 2009)
+
+  08 Jul 2009; Vadim Kuznetsov vadimk@gentoo.org
+  -vmware-vix-1.6.2.156745.ebuild, +vmware-vix-1.6.2.156745-r1.ebuild:
+  Fixing vix.libdir
+
+  06 Jul 2009; Vadim Kuznetsov vadimk@gentoo.org
+  vmware-vix-1.6.2.156745.ebuild:
+  Fix minor syntax
+
+*vmware-vix-1.6.2.156745 (06 Jul 2009)
+
+  06 Jul 2009; Vadim Kuznetsov vadimk@gentoo.org
+  +vmware-vix-1.6.2.156745.ebuild, +metadata.xml:
+  Initial ebuild. Fixes bug 263560.
+
diff --git a/app-emulation/vmware-vix/Manifest b/app-emulation/vmware-vix/Manifest
new file mode 100644
index 0000000..4395c7c
--- /dev/null
+++ b/app-emulation/vmware-vix/Manifest
@@ -0,0 +1,5 @@
+DIST VMware-vix-1.6.2-156745.i386.tar.gz 18413447 RMD160 36d7e4c3740e109c515de5150ec7ed969db421b1 SHA1 01ef532e329f56c6839a5be9531673623b7ddcd4 SHA256 5e230879d5c24dffda36c9b0fc69637dcdd9fffd3b306f86a5ebd9ba231a6f5b
+DIST VMware-vix-1.6.2-156745.x86_64.tar.gz 22657119 RMD160 1841373c363a71645a5f8ab2b4e3790bf00d21e9 SHA1 034a7f75d58b73bc31d02c8f2503f7fdd1f1fe31 SHA256 c37b58d1cfa3686138178cc60af92c48e81ccca6f039c966ebb43928fc95adb7
+EBUILD vmware-vix-1.6.2.156745-r2.ebuild 5884 RMD160 2dca3f8c81aa2c4eade2d5b55f988e8f5db13ca3 SHA1 69906ba0750d7161ebf38651b1e2428321edc4af SHA256 31fe7690bb8d49474e501160110a1120616ba9590b8804ff28344ea216a810df
+MISC ChangeLog 886 RMD160 eca9e97721be28f904bd35853881f0ad896c445c SHA1 7ebbc01932d1f226c032e9ece0e949866395cd0b SHA256 78cc382725b8a0fbdfb08a03da3ef14dc6e4b87fa857f5f2defbf0dbb77f4d03
+MISC metadata.xml 736 RMD160 9e0b6138a82c1ca34b847bc71bc072e44c60d95a SHA1 4365d9dc523f50c84cb02caf44fadf05ee996b3c SHA256 3882e8981caee5b279a4a1990df6b404e920ab088d6a4cd1d789cbb29e301f74
diff --git a/app-emulation/vmware-vix/metadata.xml b/app-emulation/vmware-vix/metadata.xml
new file mode 100644
index 0000000..5599850
--- /dev/null
+++ b/app-emulation/vmware-vix/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>vmware</herd>
+	<maintainer>
+		<email>vadimk@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		The VIX API allows you to write programs and scripts that automate
+		virtual machine operations, as well as the guests within virtual
+		machines. This API is high-level, easy to use, and practical for both
+		script writers and application programmers. It runs on both Windows and
+		Linux and supports management of VMware Server, Workstation, and Virtual
+		Infrastructure (both ESX and vCenter). Bindings are provided for C,
+		Perl, and COM (Visual Basic, VBscript, C#).
+	</longdescription>
+</pkgmetadata>
diff --git a/app-emulation/vmware-vix/vmware-vix-1.6.2.156745-r2.ebuild b/app-emulation/vmware-vix/vmware-vix-1.6.2.156745-r2.ebuild
new file mode 100644
index 0000000..a1169ff
--- /dev/null
+++ b/app-emulation/vmware-vix/vmware-vix-1.6.2.156745-r2.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-vix/vmware-vix-1.6.2.156745-r2.ebuild,v 1.2 2009/08/26 17:31:46 mr_bones_ Exp $
+
+# Unlike many other binary packages the user doesn't need to agree to a licence
+# to download VMWare. The agreeing to a licence is part of the configure step
+# which the user must run manually.
+
+EAPI="2"
+
+inherit eutils versionator
+
+MY_PV=$(replace_version_separator 3 '-' )
+MY_PN="VMware-vix-${MY_PV}"
+
+DESCRIPTION="VMware VIX for Linux"
+HOMEPAGE="http://www.vmware.com/"
+SRC_URI=" x86? ( mirror://vmware/software/vmserver/${MY_PN}.i386.tar.gz )
+		amd64? ( mirror://vmware/software/vmserver/${MY_PN}.x86_64.tar.gz ) "
+
+LICENSE="vmware"
+IUSE=""
+SLOT="0"
+KEYWORDS="-* ~x86 ~amd64"
+RESTRICT="strip"
+
+# vmware-server should not use virtual/libc as this is a
+# precompiled binary package thats linked to glibc.
+DEPEND="
+	>=dev-lang/perl-5
+	sys-apps/pciutils
+	sys-apps/findutils
+	>=sys-libs/glibc-2.3.5
+	x11-misc/shared-mime-info
+	virtual/os-headers"
+RDEPEND="${DEPEND}
+	dev-libs/glib
+	dev-libs/libxml2
+	dev-libs/openssl
+	net-misc/curl
+	sys-libs/zlib
+	!app-emulation/vmware-workstation
+	"
+
+S=${WORKDIR}/vmware-vix-distrib
+
+pkg_setup() {
+	if use x86; then
+		MY_P="${MY_PN}.i386"
+	elif use amd64; then
+		MY_P="${MY_PN}.x86_64"
+	fi
+}
+
+src_prepare() {
+	VMWARE_GROUP=${VMWARE_GROUP:-vmware}
+	VMWARE_INSTALL_DIR=/opt/${PN//-//}
+
+	shortname="vix"
+	product="vmware-vix"
+	config_dir="/etc/vmware-vix"
+	product_name="VMware VIX API"
+
+	enewgroup ${VMWARE_GROUP}
+#	EPATCH_SOURCE="${FILESDIR}"/${PV} EPATCH_SUFFIX="patch" epatch
+
+	sed -i -e "s:/sbin/lsmod:/bin/lsmod:" "${S}"/installer/services.sh || die "sed of services"
+
+	# We won't want any perl scripts from VMware
+	rm -f *.pl bin/*.pl
+	rm -f etc/installer.sh
+}
+
+src_install() {
+	# We loop through our directories and copy everything to our system.
+	for x in api bin lib include
+	do
+		if [[ -e "${S}/vmware-vix/${x}" ]]
+		then
+			dodir "${VMWARE_INSTALL_DIR}"/${x}
+			cp -pPR "${S}"/vmware-vix/${x}/* "${D}""${VMWARE_INSTALL_DIR}"/${x} \
+				|| die "copying ${x}"
+		fi
+	done
+
+	# If we have an /etc directory, we copy it.
+	#if [[ -e "${S}/etc" ]]
+	#then
+		dodir "${config_dir}"
+	#	cp -pPR "${S}"/etc/* "${D}""${config_dir}"
+	#	fowners root:${VMWARE_GROUP} "${config_dir}"
+	#	fperms 770 "${config_dir}"
+	#fi
+
+	# If we have any helper files, we install them.  First, we check for an
+	# init script.
+	if [[ -e "${FILESDIR}/${PN}.rc" ]]
+	then
+		newinitd "${FILESDIR}"/${PN}.rc ${product} || die "newinitd"
+	fi
+
+	local ENVD="${T}/90${PN}"
+	echo "PATH=${VMWARE_INSTALL_DIR}/bin" > "${ENVD}"
+	echo "ROOTPATH=${VMWARE_INSTALL_DIR}/bin" >> "${ENVD}"
+	doenvd "${ENVD}" || die "doenvd"
+
+	# Last, we check for any mime files.
+	if [[ -e "${FILESDIR}/${PN}.xml" ]]
+	then
+		insinto /usr/share/mime/packages
+		doins "${FILESDIR}"/${PN}.xml || die "mimetypes"
+	fi
+
+	# Blame bug #91191 for this one.
+	if [[ -e doc/EULA ]]
+	then
+		insinto "${VMWARE_INSTALL_DIR}"/doc
+		doins doc/EULA || die "copying EULA"
+	fi
+
+	# Now, we copy in our services.sh file
+	#exeinto "${config_dir}"/init.d
+	#newexe installer/services.sh ${product} || die "services.sh"
+
+	dohtml -r doc/VMwareVix/*
+
+	# Finally, we run the "questions"
+	# Questions:
+	einfo "Adding answers to ${config_dir}/locations"
+	locations="${D}${config_dir}/locations"
+	echo "answer BINDIR ${VMWARE_INSTALL_DIR}/bin" >> ${locations}
+	echo "answer VIXLIBDIR ${VMWARE_INSTALL_DIR}/lib" >> ${locations}
+	echo "answer LIBDIR ${VMWARE_INSTALL_DIR}/lib" >> ${locations}
+	#echo "answer MANDIR ${VMWARE_INSTALL_DIR}/man" >> ${locations}
+	echo "answer DOCDIR /usr/share/doc/${P}" >> ${locations}
+
+	local VMWARECONFIG="${T}"/config
+	if [[ -e ${ROOT}/etc/vmware/config ]]
+	then
+		cp -a "${ROOT}"/etc/vmware/config "${VMWARECONFIG}"
+		sed -i -e "/vix.libdir/d" "${VMWARECONFIG}"
+	fi
+	echo "vix.libdir = \"${VMWARE_INSTALL_DIR}/lib\"" >> "${VMWARECONFIG}"
+	insinto /etc/vmware/
+	doins "${VMWARECONFIG}"
+}
+
+pkg_preinst() {
+	# This must be done after the install to get the mtimes on each file
+	# right.
+
+	#Note: it's a bit weird to use ${D} in a preinst script but it should work
+	#(drobbins, 1 Feb 2002)
+
+	einfo "Generating ${config_dir}/locations file."
+	d=`echo ${D} | wc -c`
+	for x in `find ${D}${VMWARE_INSTALL_DIR} ${D}${config_dir}` ; do
+		x="`echo ${x} | cut -c ${d}-`"
+		if [ -d "${D}/${x}" ] ; then
+			echo "directory ${x}" >> "${D}${config_dir}"/locations
+		else
+			echo -n "file ${x}" >> "${D}${config_dir}"/locations
+			if [ "${x}" == "${config_dir}/locations" ] ; then
+				echo "" >> "${D}${config_dir}"/locations
+			elif [ "${x}" == "${config_dir}/not_configured" ] ; then
+				echo "" >> "${D}${config_dir}"/locations
+			else
+				echo -n " " >> "${D}${config_dir}"/locations
+				find "${D}${x}" -printf %T@ >> "${D}${config_dir}"/locations
+				echo "" >> "${D}${config_dir}"/locations
+			fi
+		fi
+	done
+}
+
+pkg_postinst() {
+	update-mime-database /usr/share/mime
+	[[ -d "${config_dir}" ]] && chown -R root:${VMWARE_GROUP} ${config_dir}
+
+	# This is to fix the problem where the not_configured file doesn't get
+	# removed when the configuration is run. This doesn't remove the file
+	# It just tells the vmware-config.pl script it can delete it.
+	einfo "Updating ${config_dir}/locations"
+	for x in "${config_dir}"/._cfg????_locations ; do
+		if [ -f $x ] ; then
+			cat $x >> "${config_dir}"/locations
+			rm $x
+		fi
+	done
+
+	ewarn "In order to run ${product_name}, you have to"
+	ewarn "be in the '${VMWARE_GROUP}' group."
+}
+
+pkg_prerm() {
+	sed -i -e "/vix.libdir/d" "${ROOT}"/etc/vmware/config
+}
+
+pkg_postrm() {
+	if ! has_version app-emulation/${PN}; then
+		ewarn "To remove all traces of ${producti_name} you will need to remove the files"
+		ewarn "in ${config_dir} and /etc/init.d/${product}."
+		ewarn "If the vmware-modules package is installed, you may no longer need it."
+	fi
+}
diff --git a/app-emulation/vmware-workstation/files/5.5.9.126128/000_all_initd-location.patch b/app-emulation/vmware-workstation/files/5.5.9.126128/000_all_initd-location.patch
new file mode 100644
index 0000000..1d864f7
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/5.5.9.126128/000_all_initd-location.patch
@@ -0,0 +1,31 @@
+--- vmware-distrib/bin/vmware-config.pl.ori	2005-11-09 01:45:08.000000000 +0000
++++ vmware-distrib/bin/vmware-config.pl	2005-11-09 01:48:21.000000000 +0000
+@@ -8433,7 +8433,7 @@
+          error('Please shut down any running VMs and run this script again.' .
+                "\n\n");
+       } else {
+-         if (system(shell_string(db_get_answer('INITSCRIPTSDIR') . '/vmware')
++         if (system(shell_string('/etc/init.d' . '/vmware')
+                     . ' stop')) {
+             error('Unable to stop services for ' . vmware_product_name() .
+                   "\n\n");
+@@ -8463,8 +8463,8 @@
+   }
+   if (vmware_product() ne 'server') {
+     configure_gtk2();
+-    createMimePackageFile();
+-    configureDesktopFiles();
++#   createMimePackageFile();
++#   configureDesktopFiles();
+     configure_mon();
+     configure_pp();
+     configure_net();
+@@ -8532,7 +8532,7 @@
+   db_save();
+   # Then start VMware's services
+   if (!$gOption{'skipstopstart'}) {
+-    system(shell_string(db_get_answer('INITSCRIPTSDIR') . '/vmware') . ' start');
++    system(shell_string('/etc/init.d' . '/vmware') . ' start');
+     print "\n";
+   }
+ 
diff --git a/app-emulation/vmware-workstation/files/5.5.9.126128/001_all_fix-permissions.patch b/app-emulation/vmware-workstation/files/5.5.9.126128/001_all_fix-permissions.patch
new file mode 100644
index 0000000..e646b7b
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/5.5.9.126128/001_all_fix-permissions.patch
@@ -0,0 +1,15 @@
+diff -urN vmware-distrib.orig/bin/vmware-config.pl vmware-distrib/bin/vmware-config.pl
+--- vmware-distrib.orig/bin/vmware-config.pl	2005-12-16 00:51:03.000000000 -0500
++++ vmware-distrib/bin/vmware-config.pl	2005-12-21 14:34:03.000000000 -0500
+@@ -7327,7 +7327,10 @@
+     error('Unable to write configuration file "' . $name . '".' . "\n\n");
+   }
+   db_add_file($name, 0x1);
+-  safe_chmod(0644, $name);
++  safe_chmod(0664, $name);
++  my $gid = (getgrnam('vmware'))[2];
++  my $uid = (stat($name))[4];
++  safe_chown($uid,$gid,$name);
+ 
+   # Append the promotional configuration if it exists
+   $promoconfig = $libdir . '/configurator/PROMOCONFIG';
diff --git a/app-emulation/vmware-workstation/files/5.5.9.126128/002_all_pagebreak-detection-fix.patch b/app-emulation/vmware-workstation/files/5.5.9.126128/002_all_pagebreak-detection-fix.patch
new file mode 100644
index 0000000..fd3fc76
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/5.5.9.126128/002_all_pagebreak-detection-fix.patch
@@ -0,0 +1,15 @@
+diff -ur vmware-distrib.orig/bin/vmware-config.pl vmware-distrib/bin/vmware-config.pl
+--- vmware-distrib.orig/bin/vmware-config.pl	2006-03-24 23:13:05.000000000 +0100
++++ vmware-distrib/bin/vmware-config.pl	2006-03-24 23:26:40.000000000 +0100
+@@ -2015,9 +2015,9 @@
+       . shell_string($pattern));
+     chomp($header_page_offset);
+     # Ignore PAGE_OFFSET if we cannot parse it.
+-    if ($header_page_offset =~ /^$pattern \(?0x([0-9a-fA-F]{8,})/) {
++    if ($header_page_offset =~ /^$pattern \(?(\([^)]*\))?\)?0x([0-9a-fA-F]{8,}).*$/) {
+       # We found a valid page offset
+-      $header_page_offset = $1;
++      $header_page_offset = $2;
+       if (defined($gSystem{'page_offset'}) and
+           not (lc($header_page_offset) eq lc($gSystem{'page_offset'}))) {
+         if ($source eq 'user') {
diff --git a/app-emulation/vmware-workstation/files/5.5.9.126128/004_all_do-not-build-modules.patch b/app-emulation/vmware-workstation/files/5.5.9.126128/004_all_do-not-build-modules.patch
new file mode 100644
index 0000000..cec3b3e
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/5.5.9.126128/004_all_do-not-build-modules.patch
@@ -0,0 +1,17 @@
+diff -uNr vmware-server-distrib.orig/bin/vmware-config.pl vmware-server-distrib/bin/vmware-config.pl
+--- vmware-server-distrib.orig/bin/vmware-config.pl	2006-02-18 18:12:26.000000000 +0000
++++ vmware-server-distrib/bin/vmware-config.pl	2006-02-18 18:14:17.000000000 +0000
+@@ -8571,10 +8571,10 @@
+     configure_gtk2();
+ #   createMimePackageFile();
+ #   configureDesktopFiles();
+-    configure_mon();
+-    configure_pp();
++#   configure_mon();
++#   configure_pp();
+     configure_net();
+-    build_vmnet();
++#    build_vmnet();
+   }
+ 
+   # Create the directory for the UNIX domain sockets
diff --git a/app-emulation/vmware-workstation/files/5.5.9.126128/007_all_use-modprobe-over-insmod.patch b/app-emulation/vmware-workstation/files/5.5.9.126128/007_all_use-modprobe-over-insmod.patch
new file mode 100644
index 0000000..5509d24
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/5.5.9.126128/007_all_use-modprobe-over-insmod.patch
@@ -0,0 +1,12 @@
+diff -uNr vmware-server-distrib/installer/services.sh vmware-server-distrib.new/installer/services.sh
+--- vmware-server-distrib/installer/services.sh	2006-02-05 00:21:25.000000000 +0000
++++ vmware-server-distrib.new/installer/services.sh	2006-02-20 23:48:07.000000000 +0000
+@@ -538,7 +538,7 @@
+ }
+ 
+ vmware_load_module() {
+-   /sbin/insmod -s -f "/lib/modules/`uname -r`/misc/$1.o" || exit 1
++   /sbin/modprobe -s "$1" || exit 1
+    exit 0
+ }
+ 
diff --git a/app-emulation/vmware-workstation/files/5.5.9.126128/009_all_init.d-modules-warning.patch b/app-emulation/vmware-workstation/files/5.5.9.126128/009_all_init.d-modules-warning.patch
new file mode 100644
index 0000000..4eab043
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/5.5.9.126128/009_all_init.d-modules-warning.patch
@@ -0,0 +1,19 @@
+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.5.3.185404/vmware-player-extras.py.patch b/app-emulation/vmware-workstation/files/6.5.3.185404/vmware-player-extras.py.patch
new file mode 100644
index 0000000..eb9e723
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/6.5.3.185404/vmware-player-extras.py.patch
@@ -0,0 +1,14 @@
+diff --git a/vmware-player-extras.py b/vmware-player-extras.py
+index 21595b1..e8adf08 100644
+--- a/vmware-player-extras.py
++++ b/vmware-player-extras.py
+@@ -6,7 +6,8 @@ VMware Player Extras component installer.
+ 
+ DEST = LIBDIR/'vmware'
+ SETTINGS = { 'vmware.fullpath': BINDIR/'vmware', }
+-CONF = DEST/'setup/vmware-config'
++import os
++CONF = path(os.environ['WORKDIR'])/'vmware-config.sh'
+ 
+ 
+ class PlayerExtras(Installer):
diff --git a/app-emulation/vmware-workstation/files/6.5.3.185404/vmware-player.py.patch b/app-emulation/vmware-workstation/files/6.5.3.185404/vmware-player.py.patch
new file mode 100644
index 0000000..49306c3
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/6.5.3.185404/vmware-player.py.patch
@@ -0,0 +1,64 @@
+diff --git a/vmware-player.py b/vmware-player.py
+index bee22df..d06cca9 100644
+--- a/vmware-player.py
++++ b/vmware-player.py
+@@ -6,7 +6,8 @@ VMware Player component installer.
+ 
+ GCONF_DEFAULTS = 'xml:readwrite:/etc/gconf/gconf.xml.defaults'
+ DEST = LIBDIR/'vmware'
+-CONFIG = DEST/'setup/vmware-config'
++import os
++CONFIG = path(os.environ['WORKDIR'])/'vmware-config.sh'
+ CUPSLIBDIR = LIBDIR/'cups'
+ # XXX: LIBDIR should be properly calculated, to make this cleaner
+ if (PREFIX/'lib64/cups').exists():
+@@ -84,12 +85,12 @@ class Player(Installer):
+       ret, kvers = output('uname', '-r')
+       kvers = kvers.strip()
+       modules = ('vmmon', 'vmnet', 'vmblock', 'vmci', 'vsock')
+-      base = path('/lib/modules/%s/misc' % kvers)
++      base = path('/this/path/doesnt/exist/lib/modules/%s/misc' % kvers)
+ 
+       for module in modules:
+          for ext in ('o', 'ko'):
+             mod = '%s.%s' % (module, ext)
+-            (base/mod).remove(ignore_errors=True)
++            # (base/mod).remove(ignore_errors=True)
+ 
+    def PreUninstall(self, old, new, upgrade):
+       script = INITSCRIPTDIR/'vmware'
+@@ -156,8 +157,8 @@ class Player(Installer):
+    def PostTransactionInstall(self, old, new, upgrade):
+       if ENV.get('VMWARE_SKIP_MODULES'):
+          log.info('Skipping kernel module installation')
+-      elif run(BINDIR/'vmware-modconfig', '--console', '--install-all') == 0:
+-         log.info('Successfully installed kernel modules')
++      # elif run(BINDIR/'vmware-modconfig', '--console', '--install-all') == 0:
++      #    log.info('Successfully installed kernel modules')
+       else:
+          log.info('Unable to install kernel modules')
+ 
+@@ -189,8 +190,8 @@ class Player(Installer):
+          for handler in ('vm', 'vms'):
+             for gconfType, key, value in settings:
+                key = key % handler
+-               run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
+-                   '--type', gconfType, '--set', key, value)
++               # run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
++               #     '--type', gconfType, '--set', key, value)
+ 
+          # Instruct all gconfd daemons to reload.
+          run('killall', '-HUP', 'gconfd-2')
+@@ -200,9 +201,9 @@ class Player(Installer):
+    def _deconfigureVMStreamingHandlers(self):
+       """ Deconfigures the handlers for vm:// and vms:// used for VM streaming"""
+       def deconfigureGConf():
+-         for handler in ('vm', 'vms'):
+-            run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
+-                '--recursive-unset', '/desktop/gnome/url-handlers/%s' % handler)
++         # for handler in ('vm', 'vms'):
++         #    run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
++         #       '--recursive-unset', '/desktop/gnome/url-handlers/%s' % handler)
+ 
+          # Instruct all gconfd daemons to reload.
+          run('killall', '-HUP', 'gconfd-2')
diff --git a/app-emulation/vmware-workstation/files/6.5.3.185404/vmware-vix.py.patch b/app-emulation/vmware-workstation/files/6.5.3.185404/vmware-vix.py.patch
new file mode 100644
index 0000000..5984bdf
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/6.5.3.185404/vmware-vix.py.patch
@@ -0,0 +1,14 @@
+diff --git a/vmware-vix.py b/vmware-vix.py
+index ac64dc5..8fdc2b2 100644
+--- a/vmware-vix.py
++++ b/vmware-vix.py
+@@ -4,7 +4,8 @@ Copyright 2007 VMware, Inc.  All rights reserved. -- VMware Confidential
+ VIX component installer.
+ """
+ DEST = LIBDIR/'vmware-vix'
+-conf = DEST/'setup/vmware-config'
++import os
++conf = path(os.environ['WORKDIR'])/'vmware-config.sh'
+ 
+ class VIX(Installer):
+    def InitializeInstall(self, old, new, upgrade):
diff --git a/app-emulation/vmware-workstation/files/6.5.3.185404/vmware-workstation.py.patch b/app-emulation/vmware-workstation/files/6.5.3.185404/vmware-workstation.py.patch
new file mode 100644
index 0000000..da139bb
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/6.5.3.185404/vmware-workstation.py.patch
@@ -0,0 +1,23 @@
+diff --git a/vmware-workstation.py b/vmware-workstation.py
+index 55476d9..8dd4c0a 100644
+--- a/vmware-workstation.py
++++ b/vmware-workstation.py
+@@ -4,7 +4,8 @@ Copyright 2008 VMware, Inc.  All rights reserved. -- VMware Confidential
+ VMware Workstation component installer.
+ """
+ DEST = LIBDIR/'vmware'
+-conf = DEST/'setup/vmware-config'
++import os
++conf = path(os.environ['WORKDIR'])/'vmware-config.sh'
+ 
+ class Workstation(Installer):
+    def PreTransactionInstall(self, old, new, upgrade):
+@@ -40,7 +41,7 @@ class Workstation(Installer):
+       self.AddPermission(DEST/'bin/*', BINARY)
+ 
+       eclipse = config.Get('vmware-workstation.eclipse')
+-      eclipse and self.AddTarget(Link, DEST/'eclipse-ivd/com.vmware.bfg_1.0.0',
++      False and self.AddTarget(Link, DEST/'eclipse-ivd/com.vmware.bfg_1.0.0',
+                                  Destination(eclipse)/'plugins/com.vmware.bfg_1.0.0')
+ 
+    def _vmwareMountRunnable(self, vmwareMount):
diff --git a/app-emulation/vmware-workstation/files/7.0.0.203739/vmware-player-extras.py.patch b/app-emulation/vmware-workstation/files/7.0.0.203739/vmware-player-extras.py.patch
new file mode 100644
index 0000000..eb9e723
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/7.0.0.203739/vmware-player-extras.py.patch
@@ -0,0 +1,14 @@
+diff --git a/vmware-player-extras.py b/vmware-player-extras.py
+index 21595b1..e8adf08 100644
+--- a/vmware-player-extras.py
++++ b/vmware-player-extras.py
+@@ -6,7 +6,8 @@ VMware Player Extras component installer.
+ 
+ DEST = LIBDIR/'vmware'
+ SETTINGS = { 'vmware.fullpath': BINDIR/'vmware', }
+-CONF = DEST/'setup/vmware-config'
++import os
++CONF = path(os.environ['WORKDIR'])/'vmware-config.sh'
+ 
+ 
+ class PlayerExtras(Installer):
diff --git a/app-emulation/vmware-workstation/files/7.0.0.203739/vmware-player.py.patch b/app-emulation/vmware-workstation/files/7.0.0.203739/vmware-player.py.patch
new file mode 100644
index 0000000..49306c3
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/7.0.0.203739/vmware-player.py.patch
@@ -0,0 +1,64 @@
+diff --git a/vmware-player.py b/vmware-player.py
+index bee22df..d06cca9 100644
+--- a/vmware-player.py
++++ b/vmware-player.py
+@@ -6,7 +6,8 @@ VMware Player component installer.
+ 
+ GCONF_DEFAULTS = 'xml:readwrite:/etc/gconf/gconf.xml.defaults'
+ DEST = LIBDIR/'vmware'
+-CONFIG = DEST/'setup/vmware-config'
++import os
++CONFIG = path(os.environ['WORKDIR'])/'vmware-config.sh'
+ CUPSLIBDIR = LIBDIR/'cups'
+ # XXX: LIBDIR should be properly calculated, to make this cleaner
+ if (PREFIX/'lib64/cups').exists():
+@@ -84,12 +85,12 @@ class Player(Installer):
+       ret, kvers = output('uname', '-r')
+       kvers = kvers.strip()
+       modules = ('vmmon', 'vmnet', 'vmblock', 'vmci', 'vsock')
+-      base = path('/lib/modules/%s/misc' % kvers)
++      base = path('/this/path/doesnt/exist/lib/modules/%s/misc' % kvers)
+ 
+       for module in modules:
+          for ext in ('o', 'ko'):
+             mod = '%s.%s' % (module, ext)
+-            (base/mod).remove(ignore_errors=True)
++            # (base/mod).remove(ignore_errors=True)
+ 
+    def PreUninstall(self, old, new, upgrade):
+       script = INITSCRIPTDIR/'vmware'
+@@ -156,8 +157,8 @@ class Player(Installer):
+    def PostTransactionInstall(self, old, new, upgrade):
+       if ENV.get('VMWARE_SKIP_MODULES'):
+          log.info('Skipping kernel module installation')
+-      elif run(BINDIR/'vmware-modconfig', '--console', '--install-all') == 0:
+-         log.info('Successfully installed kernel modules')
++      # elif run(BINDIR/'vmware-modconfig', '--console', '--install-all') == 0:
++      #    log.info('Successfully installed kernel modules')
+       else:
+          log.info('Unable to install kernel modules')
+ 
+@@ -189,8 +190,8 @@ class Player(Installer):
+          for handler in ('vm', 'vms'):
+             for gconfType, key, value in settings:
+                key = key % handler
+-               run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
+-                   '--type', gconfType, '--set', key, value)
++               # run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
++               #     '--type', gconfType, '--set', key, value)
+ 
+          # Instruct all gconfd daemons to reload.
+          run('killall', '-HUP', 'gconfd-2')
+@@ -200,9 +201,9 @@ class Player(Installer):
+    def _deconfigureVMStreamingHandlers(self):
+       """ Deconfigures the handlers for vm:// and vms:// used for VM streaming"""
+       def deconfigureGConf():
+-         for handler in ('vm', 'vms'):
+-            run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
+-                '--recursive-unset', '/desktop/gnome/url-handlers/%s' % handler)
++         # for handler in ('vm', 'vms'):
++         #    run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
++         #       '--recursive-unset', '/desktop/gnome/url-handlers/%s' % handler)
+ 
+          # Instruct all gconfd daemons to reload.
+          run('killall', '-HUP', 'gconfd-2')
diff --git a/app-emulation/vmware-workstation/files/7.0.0.203739/vmware-vix.py.patch b/app-emulation/vmware-workstation/files/7.0.0.203739/vmware-vix.py.patch
new file mode 100644
index 0000000..5984bdf
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/7.0.0.203739/vmware-vix.py.patch
@@ -0,0 +1,14 @@
+diff --git a/vmware-vix.py b/vmware-vix.py
+index ac64dc5..8fdc2b2 100644
+--- a/vmware-vix.py
++++ b/vmware-vix.py
+@@ -4,7 +4,8 @@ Copyright 2007 VMware, Inc.  All rights reserved. -- VMware Confidential
+ VIX component installer.
+ """
+ DEST = LIBDIR/'vmware-vix'
+-conf = DEST/'setup/vmware-config'
++import os
++conf = path(os.environ['WORKDIR'])/'vmware-config.sh'
+ 
+ class VIX(Installer):
+    def InitializeInstall(self, old, new, upgrade):
diff --git a/app-emulation/vmware-workstation/files/7.0.0.203739/vmware-workstation.py.patch b/app-emulation/vmware-workstation/files/7.0.0.203739/vmware-workstation.py.patch
new file mode 100644
index 0000000..da139bb
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/7.0.0.203739/vmware-workstation.py.patch
@@ -0,0 +1,23 @@
+diff --git a/vmware-workstation.py b/vmware-workstation.py
+index 55476d9..8dd4c0a 100644
+--- a/vmware-workstation.py
++++ b/vmware-workstation.py
+@@ -4,7 +4,8 @@ Copyright 2008 VMware, Inc.  All rights reserved. -- VMware Confidential
+ VMware Workstation component installer.
+ """
+ DEST = LIBDIR/'vmware'
+-conf = DEST/'setup/vmware-config'
++import os
++conf = path(os.environ['WORKDIR'])/'vmware-config.sh'
+ 
+ class Workstation(Installer):
+    def PreTransactionInstall(self, old, new, upgrade):
+@@ -40,7 +41,7 @@ class Workstation(Installer):
+       self.AddPermission(DEST/'bin/*', BINARY)
+ 
+       eclipse = config.Get('vmware-workstation.eclipse')
+-      eclipse and self.AddTarget(Link, DEST/'eclipse-ivd/com.vmware.bfg_1.0.0',
++      False and self.AddTarget(Link, DEST/'eclipse-ivd/com.vmware.bfg_1.0.0',
+                                  Destination(eclipse)/'plugins/com.vmware.bfg_1.0.0')
+ 
+    def _vmwareMountRunnable(self, vmwareMount):
diff --git a/app-emulation/vmware-workstation/files/helpers/module_patcher.sh b/app-emulation/vmware-workstation/files/helpers/module_patcher.sh
new file mode 100755
index 0000000..03c490a
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/helpers/module_patcher.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+MY_BASE=$(basename $1)
+if [ -f ${FILESDIR}/${PV}/${MY_BASE}.patch ];
+then
+	echo -n "Module Patcher: "
+	patch -f -p1 ${1} < ${FILESDIR}/${PV}/${MY_BASE}.patch
+fi
diff --git a/app-emulation/vmware-workstation/files/helpers/unbundler.sh b/app-emulation/vmware-workstation/files/helpers/unbundler.sh
new file mode 100755
index 0000000..b19b587
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/helpers/unbundler.sh
@@ -0,0 +1,91 @@
+#!/bin/bash
+
+ORIGFILE="$1"
+
+is_relative() {
+    local path="$1"
+    shift
+
+    [ "${path:0:1}" != "/" ]
+    return
+}
+
+set_offsets() {
+	# This won't work with non-GNU stat.
+	FILE_SIZE=`stat -L --format "%s" "$1"`
+	local offset=$(($FILE_SIZE - 4))
+	
+	MAGIC_OFFSET=$offset
+	offset=$(($offset - 4))
+	
+	CHECKSUM_OFFSET=$offset
+	offset=$(($offset - 4))
+	
+	VERSION_OFFSET=$offset
+	offset=$(($offset - 4))
+	
+	PREPAYLOAD_OFFSET=$offset
+	offset=$(($offset - 4))
+	
+	PREPAYLOAD_SIZE_OFFSET=$offset
+	offset=$(($offset - 4))
+	
+	LAUNCHER_SIZE_OFFSET=$offset
+	offset=$(($offset - 4))
+	
+	PAYLOAD_OFFSET=$offset
+	offset=$(($offset - 4))
+	
+	PAYLOAD_SIZE_OFFSET=$offset
+	offset=$(($offset - 4))
+}
+
+set_lengths() {
+   local file="$1"
+   if [ ! -s "$file" ]; then
+      echo "$file does not exist"
+      exit 1
+   fi
+
+   # XXX: put extraction in its own function
+   MAGIC_NUMBER=`od -An -t u4 -N 4 -j $MAGIC_OFFSET "$file" | tr -d ' '`
+
+   if [ "$MAGIC_NUMBER" != "907380241" ]; then
+      echo "magic number does not match"
+      exit 1
+   fi
+
+   LAUNCHER_SIZE=`od -An -t u4 -N 4 -j $LAUNCHER_SIZE_OFFSET "$file" | tr -d ' '`
+   PAYLOAD_SIZE=`od -An -t u4 -N 4 -j $PAYLOAD_SIZE_OFFSET "$file" | tr -d ' '`
+   PREPAYLOAD_SIZE=`od -An -t u4 -N 4 -j $PREPAYLOAD_SIZE_OFFSET "$file" | tr -d ' '`
+
+   SKIP_BYTES=$(($PREPAYLOAD_SIZE + $LAUNCHER_SIZE))
+
+   return 0
+}
+
+if is_relative "${ORIGFILE}"; then
+	ORIGFILE="`pwd`/${ORIGFILE}"
+fi
+
+
+set_offsets ${ORIGFILE}
+set_lengths ${ORIGFILE}
+
+echo "Unbundling" ${ORIGFILE}
+
+PREPAYLOAD="prepayload"
+PAYLOAD="payload"
+
+# Unpack the pre-payload file
+mkdir ${PREPAYLOAD}
+cd ${PREPAYLOAD}
+dd if="${ORIGFILE}" ibs=$LAUNCHER_SIZE obs=1024 skip=1 | tar -xzf - 2> /dev/null
+cd ..
+
+# Unpack the main file
+mkdir ${PAYLOAD}
+cd ${PAYLOAD}
+dd if="${ORIGFILE}" ibs=$SKIP_BYTES obs=1024 skip=1 | tar -xzf - 2> /dev/null
+cd ..
+
diff --git a/app-emulation/vmware-workstation/files/helpers/vmware-config.sh b/app-emulation/vmware-workstation/files/helpers/vmware-config.sh
new file mode 100755
index 0000000..4895502
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/helpers/vmware-config.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+CONFIG_FILE="${D}/etc/vmware/config"
+
+remove_key() {
+  local key=${1}
+  grep -v "^${key} =" ${CONFIG_FILE}
+  grep -v "^${key} =" ${CONFIG_FILE} > ${CONFIG_FILE}.tmp
+  mv ${CONFIG_FILE}.tmp ${CONFIG_FILE}
+}
+
+add_key() {
+  local key=${1}
+  local value=${2}
+  echo "${1} = \"${2}\"" >> ${CONFIG_FILE}
+}
+
+mkdir -p $(dirname ${CONFIG_FILE})
+touch ${CONFIG_FILE}
+
+if [ "${1}" == "-s" ]; then
+  remove_key ${2}
+  add_key ${2} ${3/${D}/}
+fi
+
+if [ "${1}" == "-d" ]; then
+  remove_key ${2}
+fi
+
diff --git a/app-emulation/vmware-workstation/files/vmware-workstation-6.5.3.185404-installer.patch b/app-emulation/vmware-workstation/files/vmware-workstation-6.5.3.185404-installer.patch
new file mode 100644
index 0000000..80a301e
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/vmware-workstation-6.5.3.185404-installer.patch
@@ -0,0 +1,64 @@
+diff --git a/payload/install/vmware-installer/vmis/__init__.py b/payload/install/vmware-installer/vmis/__init__.py
+index 7a46312..e1dbff1 100644
+--- a/payload/install/vmware-installer/vmis/__init__.py
++++ b/payload/install/vmware-installer/vmis/__init__.py
+@@ -12,5 +12,5 @@ VERSION_INFO = (1,0)
+ VERSION = '.'.join([str(x) for x in VERSION_INFO])
+ MAJOR_VERSION = VERSION_INFO[0]
+ 
+-CONFDIR = path(u'/etc/vmware')
++CONFDIR = path(u'./vmware-confdir')
+ DATABASE_PATH = CONFDIR/'database'
+diff --git a/payload/install/vmware-installer/vmis/core/env.py b/payload/install/vmware-installer/vmis/core/env.py
+index e7abc2e..81c4a2b 100644
+--- a/payload/install/vmware-installer/vmis/core/env.py
++++ b/payload/install/vmware-installer/vmis/core/env.py
+@@ -66,6 +66,8 @@ def LoadInstaller(component, loadPath):
+    # Python will interrept as being a module separator
+    moduleName = component.name.replace('.', '')
+    fileObj, pathName, description = imp.find_module(moduleName, [loadPath])
++   print output(os.path.join(env['ENV'].get('WORKDIR', './'), 'module_patcher.sh'), pathName)[1],
++   fileObj = file(pathName)
+ 
+    try:
+       # XXX: db.config cannot be set at the module level because this
+diff --git a/payload/install/vmware-installer/vmis/core/questions.py b/payload/install/vmware-installer/vmis/core/questions.py
+index 2be10de..f92ecff 100644
+--- a/payload/install/vmware-installer/vmis/core/questions.py
++++ b/payload/install/vmware-installer/vmis/core/questions.py
+@@ -139,6 +139,9 @@ class InitDir(Directory):
+       """
+       super(InitDir, self).Validate(answer)
+ 
++      ### GENTOO PATCH ###  Finish early
++      return True
++
+       rcdirs = ('rc0.d', 'rc1.d', 'rc2.d', 'rc3.d', 'rc4.d', 'rc5.d', 'rc6.d')
+       answer = path(answer)
+ 
+diff --git a/payload/install/vmware-installer/vmis/ui/console.py b/payload/install/vmware-installer/vmis/ui/console.py
+index 525df75..abb81b3 100644
+--- a/payload/install/vmware-installer/vmis/ui/console.py
++++ b/payload/install/vmware-installer/vmis/ui/console.py
+@@ -148,7 +148,7 @@ class Wizard(object):
+          wrapper = TextWrapper()
+          wrapper.width = 79
+          wrapper.replace_whitespace = False # Needed to preserve paragraph spacing.
+-         Popen('more', stdin=PIPE).communicate(input=wrapper.fill(text))
++         Popen('less', stdin=PIPE).communicate(input=wrapper.fill(text))
+       except IOError: # RHEL4 appears to close stdin while we still expect it to be open
+          pass
+ 
+diff --git a/payload/install/vmware-installer/vmis/util/log.py b/payload/install/vmware-installer/vmis/util/log.py
+index 4f609c4..b07b89d 100644
+--- a/payload/install/vmware-installer/vmis/util/log.py
++++ b/payload/install/vmware-installer/vmis/util/log.py
+@@ -22,6 +22,8 @@ else:
+    # running a build)
+    LOG_FILE = '/tmp/vmware-installer.log'
+ 
++LOG_FILE = './vmware-installer.log'
++
+ if level <= logging.DEBUG:
+    MAX_BYTES = 0
+    BACKUP_COUNT = 0
diff --git a/app-emulation/vmware-workstation/files/vmware-workstation-6.5.rc b/app-emulation/vmware-workstation/files/vmware-workstation-6.5.rc
new file mode 100644
index 0000000..c9b0e61
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/vmware-workstation-6.5.rc
@@ -0,0 +1,74 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/files/vmware-workstation-6.5.rc,v 1.1 2008/11/09 20:56:55 ikelos Exp $
+
+depend() {
+	need localmount
+	use logger net hald
+	after samba
+}
+
+vmware_prettify() {
+	# Yea, the code is ugly but the output is pretty
+	state=$1
+	waserror=0
+	msgtype=0
+	while read line
+	do
+		[ "${line}" = "" ] && continue
+		if [ ${msgtype} -le 0 ]
+		then
+			if [ ${msgtype} -eq -1 ]
+			then
+				ewarn ${line}
+				continue
+			fi
+			case ${line} in
+			*:*)
+				einfon ${line}
+				echo
+				eend 0
+				msgtype=1;;
+			*)
+				ewarn ${line}
+				msgtype=-1
+				waserror=1;;
+			esac
+			continue
+		fi
+
+		# Strip out anything after the <esc> code
+		message=`echo ${line} | sed -e "s/^\(.*\).*$/\1/"`
+		einfon "  ${message}"
+		echo
+
+		echo ${line} | grep -q done
+		status=$?
+		eend ${status}
+
+		if [ ${status} -eq 0 ]
+		then
+			logger -p local0.err -t vmware-${state} "${line}"
+			waserror=${status}
+		fi
+	done
+	if [ "${msgtype}" = "-1" ]
+	then
+		eend 1 "VMware is not properly configured! See above."
+	fi
+	return ${waserror}
+}
+
+start() {
+	test -x /etc/vmware/init.d/vmware || \
+		eend 1 "vmware init script not found. Aborting" || return 1
+
+	/etc/vmware/init.d/vmware start | vmware_prettify start
+	return $?
+}
+
+stop() {
+	/etc/vmware/init.d/vmware stop | vmware_prettify stop
+	return $?
+}
diff --git a/app-emulation/vmware-workstation/files/vmware-workstation-7.0.0.203739-installer.patch b/app-emulation/vmware-workstation/files/vmware-workstation-7.0.0.203739-installer.patch
new file mode 100644
index 0000000..412fb43
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/vmware-workstation-7.0.0.203739-installer.patch
@@ -0,0 +1,61 @@
+diff -uNr a/payload/install/vmware-installer/vmis/core/env.py b/payload/install/vmware-installer/vmis/core/env.py
+--- a/payload/install/vmware-installer/vmis/core/env.py	2009-12-24 20:55:30.507661355 +0100
++++ b/payload/install/vmware-installer/vmis/core/env.py	2009-12-24 20:58:15.135415801 +0100
+@@ -305,6 +305,8 @@
+    # Python will interpret as being a module separator
+    moduleName = component.name.replace('.', '')
+    fileObj, pathName, description = imp.find_module(moduleName, [loadPath])
++   print output(os.path.join(env['ENV'].get('WORKDIR', './'), 'module_patcher.sh'), pathName)[1],
++   fileObj = file(pathName)
+ 
+    componentCoreVersion = component.coreVersion
+    if component.name == 'vmware-installer': # XXX: HARDCODE - Fix this.
+diff -uNr a/payload/install/vmware-installer/vmis/core/questions.py b/payload/install/vmware-installer/vmis/core/questions.py
+--- a/payload/install/vmware-installer/vmis/core/questions.py	2009-12-24 20:55:30.507661355 +0100
++++ b/payload/install/vmware-installer/vmis/core/questions.py	2009-12-24 20:58:15.135415801 +0100
+@@ -199,6 +199,9 @@
+       """
+       super(InitDir, self).Validate(answer)
+ 
++      ### GENTOO PATCH ###  Finish early
++      return True
++
+       rcdirs = ('rc0.d', 'rc1.d', 'rc2.d', 'rc3.d', 'rc4.d', 'rc5.d', 'rc6.d')
+       answer = path(answer)
+ 
+diff -uNr a/payload/install/vmware-installer/vmis/__init__.py b/payload/install/vmware-installer/vmis/__init__.py
+--- a/payload/install/vmware-installer/vmis/__init__.py	2009-12-24 20:55:30.506662004 +0100
++++ b/payload/install/vmware-installer/vmis/__init__.py	2009-12-24 20:59:50.810416210 +0100
+@@ -20,7 +20,7 @@
+ MAJOR_VERSION = VERSION_INFO[0]
+ VMISPYVERSION = os.environ.get('VMISPYVERSION')
+ 
+-CONFDIR = path(u'/etc/vmware-installer')
++CONFDIR = path(u'./vmware-confdir')
+ DATABASE_PATH = CONFDIR/'database'
+ 
+ # Database setting for use by the installer and its component.
+diff -uNr a/payload/install/vmware-installer/vmis/ui/console.py b/payload/install/vmware-installer/vmis/ui/console.py
+--- a/payload/install/vmware-installer/vmis/ui/console.py	2009-12-24 20:55:30.509662503 +0100
++++ b/payload/install/vmware-installer/vmis/ui/console.py	2009-12-24 21:01:53.076664336 +0100
+@@ -202,7 +202,7 @@
+       # If no pager is found, or cannot be found in
+       # the path, default to 'more'.
+       if not pager:
+-         pager = 'more'
++         pager = 'less'
+ 
+       # Append -E to less so it quits after the last line of
+       # the EULA is displayed.
+diff -uNr a/payload/install/vmware-installer/vmis/util/log.py b/payload/install/vmware-installer/vmis/util/log.py
+--- a/payload/install/vmware-installer/vmis/util/log.py	2009-12-24 20:55:30.509662503 +0100
++++ b/payload/install/vmware-installer/vmis/util/log.py	2009-12-24 20:58:15.136416130 +0100
+@@ -31,6 +31,8 @@
+       # It's okay if it already exists
+       pass
+ 
++LOG_FILE = './vmware-installer.log'
++
+ if level <= logging.DEBUG:
+    MAX_BYTES = 0
+    BACKUP_COUNT = 0
diff --git a/app-emulation/vmware-workstation/vmware-workstation-5.5.9.126128.ebuild b/app-emulation/vmware-workstation/vmware-workstation-5.5.9.126128.ebuild
new file mode 100644
index 0000000..7db87f1
--- /dev/null
+++ b/app-emulation/vmware-workstation/vmware-workstation-5.5.9.126128.ebuild
@@ -0,0 +1,100 @@
+# 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.9.126128.ebuild,v 1.3 2009/01/12 21:46:40 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.5.3.185404.ebuild b/app-emulation/vmware-workstation/vmware-workstation-6.5.3.185404.ebuild
new file mode 100644
index 0000000..c4ad51b
--- /dev/null
+++ b/app-emulation/vmware-workstation/vmware-workstation-6.5.3.185404.ebuild
@@ -0,0 +1,178 @@
+# 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.3.185404.ebuild,v 1.4 2009/09/25 10:38:14 maekke Exp $
+
+EAPI="2"
+
+inherit eutils versionator fdo-mime gnome2-utils
+
+MY_PN="VMware-Workstation-$(replace_version_separator 3 - $PV)"
+
+DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
+HOMEPAGE="http://www.vmware.com/products/desktop/ws_features.html"
+DOWNLOAD_URL="http://www.vmware.com/download/ws/"
+SRC_URI="
+	x86? (
+		mirror://vmware/software/wkst/${MY_PN}.i386.bundle
+		http://download.softpedia.ro/linux/${MY_PN}.i386.bundle )
+	amd64? (
+		mirror://vmware/software/wkst/${MY_PN}.x86_64.bundle
+		http://download.softpedia.ro/linux/${MY_PN}.x86_64.bundle )
+	"
+
+LICENSE="vmware"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+IUSE=""
+RESTRICT="strip fetch binchecks"
+PROPERTIES="interactive"
+
+# vmware-workstation should not use virtual/libc as this is a
+# precompiled binary package thats linked to glibc.
+DEPEND=">=dev-lang/python-2.5[sqlite,ncurses]
+	dev-python/lxml"
+RDEPEND="
+	~app-emulation/vmware-modules-1.0.0.25
+	dev-cpp/cairomm
+	dev-cpp/libgnomecanvasmm
+	dev-cpp/libsexymm
+	sys-apps/pciutils
+	sys-fs/fuse
+	sys-libs/glibc
+	>=x11-libs/libview-0.6.2
+	x11-libs/libgksu
+	x11-libs/libXcursor
+	x11-libs/libXft
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	!!app-emulation/vmware-player
+	!!app-emulation/vmware-server
+	"
+
+S=${WORKDIR}/vmware-distrib
+VM_INSTALL_DIR="/opt/vmware/workstation"
+
+pkg_setup() {
+	if use x86; then
+		MY_P="${MY_PN}.i386"
+	elif use amd64; then
+		MY_P="${MY_PN}.x86_64"
+	fi
+
+	if [ "$(python -c "import curses; curses.setupterm(); print curses.tigetstr('hpa')")" == "None" ]; then
+		die "Please emerge this package using a different terminal (e.g. not within screen)."
+	fi
+}
+
+pkg_nofetch() {
+	if use x86; then
+		MY_P="${MY_PN}.i386"
+	elif use amd64; then
+		MY_P="${MY_PN}.x86_64"
+	fi
+
+	einfo "Please download the ${MY_P}.bundle from"
+	einfo "${DOWNLOAD_URL}"
+	einfo "and place it in ${DISTDIR}"
+}
+
+src_unpack() {
+	# Unbundle the bundle
+	cp "${FILESDIR}"/helpers/* "${WORKDIR}"
+	chmod a+x "${WORKDIR}"/*.sh
+	"${WORKDIR}"/unbundler.sh "${DISTDIR}/${MY_P}".bundle
+}
+
+src_prepare() {
+	# Patch up the installer
+	epatch "${FILESDIR}/${P}-installer.patch"
+
+	mkdir "${WORKDIR}/vmware-confdir"
+}
+
+src_install() {
+	dodir /etc/init.d
+
+	#Run the installer
+	local INSTALLER="${WORKDIR}/payload/install/vmware-installer"
+	local PYOPTS="-W ignore::DeprecationWarning"
+	export VMWARE_SKIP_NETWORKING="true"
+	python ${PYOPTS} "${INSTALLER}/vmware-installer.py" \
+		--set-setting vmware-installer.libconf "${INSTALLER}/lib/libconf" \
+		--set-setting initdir "${T}" \
+		--set-setting initscriptdir "${D}/etc/init.d" \
+		--set-setting prefix "${D}${VM_INSTALL_DIR}" \
+		--set-setting sysconfdir "${D}/etc" \
+		--install-component "${INSTALLER}" \
+		--install-bundle "${DISTDIR}/${MY_P}.bundle" \
+		--console --required
+
+	rm -fr "${D}${VM_INSTALL_DIR}/lib/vmware/modules/binary"
+
+	if [ ! -e "${WORKDIR}"/vmware-confdir/bootstrap ]; then
+		eerror "VMware installation seems to have rolled back."
+		eerror "Please include the contents of ${WORKDIR}/vmware-installer.log"
+		eerror "in any bug reports you file."
+		die "VMware installation rolled back."
+	fi
+
+	# Redirect all the ${D} paths to / paths"
+	sed -i -e "s:${D}::" "${WORKDIR}"/vmware-confdir/bootstrap
+
+	# Fix up icons/mime/desktop handlers
+	dodir /usr/share/
+	mv "${D}${VM_INSTALL_DIR}"/share/applications "${D}"/usr/share/
+	rm -f "${D}${VM_INSTALL_DIR}"/share/icons/hicolor/{icon-theme.cache,index.theme}
+	mv "${D}${VM_INSTALL_DIR}"/share/icons "${D}"/usr/share/
+	dodir /usr/share/mime
+	mv "${D}${VM_INSTALL_DIR}"/share/mime/packages "${D}"/usr/share/mime
+	sed -i -e "s:${D}::" "${D}"/usr/share/applications/*.desktop
+
+	# Copy across the temporary /etc/vmware directory
+	dodir /etc/vmware/init.d
+	cp -r "${WORKDIR}"/vmware-confdir/* "${D}/etc/vmware"
+	mv "${D}"/etc/init.d/* "${D}/etc/vmware/init.d"
+	sed -i -e "s:/sbin/lsmod:/bin/lsmod:" "${D}"/etc/vmware/init.d/vmware
+	newinitd "${FILESDIR}/${PN}"-6.5.rc vmware
+	touch "${D}"/etc/vmware/networking
+
+	# Setup the path environment
+	insinto /etc/env.d
+	doins "${FILESDIR}/90${PN}"
+
+	# Fix some paths to allow included gtk to work
+	for i in 	"/etc/pango/pangorc" \
+			"/etc/pango/pango.modules" \
+			"/etc/gtk-2.0/gtk.immodules" \
+			"/etc/gtk-2.0/gdk-pixbuf.loaders" ; do
+		sed -i -e "s:${D}::" "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf${i} ;
+		sed -i -e "s:${D}::" "${D}${VM_INSTALL_DIR}"/lib/vmware/installer/lib/libconf${i} ;
+	done
+}
+
+pkg_config() {
+	${VM_INSTALL_DIR}/bin/vmware-networks --postinstall ${PN},old,new
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+
+	ewarn "Before you can use vmware-workstation, you must configure a default network setup."
+	ewarn "You can do this by running 'emerge --config ${PN}'."
+}
+
+pkg_prerm() {
+	einfo "Stopping ${product_name} for safe unmerge"
+	/etc/init.d/vmware stop
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/app-emulation/vmware-workstation/vmware-workstation-7.0.0.203739.ebuild b/app-emulation/vmware-workstation/vmware-workstation-7.0.0.203739.ebuild
new file mode 100644
index 0000000..2bddd93
--- /dev/null
+++ b/app-emulation/vmware-workstation/vmware-workstation-7.0.0.203739.ebuild
@@ -0,0 +1,178 @@
+# 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.3.185404.ebuild,v 1.4 2009/09/25 10:38:14 maekke Exp $
+
+EAPI="2"
+
+inherit eutils versionator fdo-mime gnome2-utils
+
+MY_PN="VMware-Workstation-Full-$(replace_version_separator 3 - $PV)"
+
+DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
+HOMEPAGE="http://www.vmware.com/products/desktop/ws_features.html"
+DOWNLOAD_URL="http://www.vmware.com/download/ws/"
+SRC_URI="
+	x86? (
+		mirror://vmware/software/wkst/${MY_PN}.i386.bundle
+		http://download.softpedia.ro/linux/${MY_PN}.i386.bundle )
+	amd64? (
+		mirror://vmware/software/wkst/${MY_PN}.x86_64.bundle
+		http://download.softpedia.ro/linux/${MY_PN}.x86_64.bundle )
+	"
+
+LICENSE="vmware"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+IUSE=""
+RESTRICT="strip fetch binchecks"
+PROPERTIES="interactive"
+
+# vmware-workstation should not use virtual/libc as this is a
+# precompiled binary package thats linked to glibc.
+DEPEND=">=dev-lang/python-2.5[sqlite,ncurses]
+	dev-python/lxml"
+RDEPEND="
+	~app-emulation/vmware-modules-1.0.0.25
+	dev-cpp/cairomm
+	dev-cpp/libgnomecanvasmm
+	dev-cpp/libsexymm
+	sys-apps/pciutils
+	sys-fs/fuse
+	sys-libs/glibc
+	>=x11-libs/libview-0.6.2
+	x11-libs/libgksu
+	x11-libs/libXcursor
+	x11-libs/libXft
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	!!app-emulation/vmware-player
+	!!app-emulation/vmware-server
+	"
+
+S=${WORKDIR}/vmware-distrib
+VM_INSTALL_DIR="/opt/vmware/workstation"
+
+pkg_setup() {
+	if use x86; then
+		MY_P="${MY_PN}.i386"
+	elif use amd64; then
+		MY_P="${MY_PN}.x86_64"
+	fi
+
+	if [ "$(python -c "import curses; curses.setupterm(); print curses.tigetstr('hpa')")" == "None" ]; then
+		die "Please emerge this package using a different terminal (e.g. not within screen)."
+	fi
+}
+
+pkg_nofetch() {
+	if use x86; then
+		MY_P="${MY_PN}.i386"
+	elif use amd64; then
+		MY_P="${MY_PN}.x86_64"
+	fi
+
+	einfo "Please download the ${MY_P}.bundle from"
+	einfo "${DOWNLOAD_URL}"
+	einfo "and place it in ${DISTDIR}"
+}
+
+src_unpack() {
+	# Unbundle the bundle
+	cp "${FILESDIR}"/helpers/* "${WORKDIR}"
+	chmod a+x "${WORKDIR}"/*.sh
+	"${WORKDIR}"/unbundler.sh "${DISTDIR}/${MY_P}".bundle
+}
+
+src_prepare() {
+	# Patch up the installer
+	epatch "${FILESDIR}/${P}-installer.patch"
+
+	mkdir "${WORKDIR}/vmware-confdir"
+}
+
+src_install() {
+	dodir /etc/init.d
+
+	#Run the installer
+	local INSTALLER="${WORKDIR}/payload/install/vmware-installer"
+	local PYOPTS="-W ignore::DeprecationWarning"
+	export VMWARE_SKIP_NETWORKING="true"
+	python ${PYOPTS} "${INSTALLER}/vmware-installer.py" \
+		--set-setting vmware-installer.libconf "${INSTALLER}/lib/libconf" \
+		--set-setting initdir "${T}" \
+		--set-setting initscriptdir "${D}/etc/init.d" \
+		--set-setting prefix "${D}${VM_INSTALL_DIR}" \
+		--set-setting sysconfdir "${D}/etc" \
+		--install-component "${INSTALLER}" \
+		--install-bundle "${DISTDIR}/${MY_P}.bundle" \
+		--console --required
+
+	rm -fr "${D}${VM_INSTALL_DIR}/lib/vmware/modules/binary"
+
+	if [ ! -e "${WORKDIR}"/vmware-confdir/bootstrap ]; then
+		eerror "VMware installation seems to have rolled back."
+		eerror "Please include the contents of ${WORKDIR}/vmware-installer.log"
+		eerror "in any bug reports you file."
+		die "VMware installation rolled back."
+	fi
+
+	# Redirect all the ${D} paths to / paths"
+	sed -i -e "s:${D}::" "${WORKDIR}"/vmware-confdir/bootstrap
+
+	# Fix up icons/mime/desktop handlers
+	dodir /usr/share/
+	mv "${D}${VM_INSTALL_DIR}"/share/applications "${D}"/usr/share/
+	rm -f "${D}${VM_INSTALL_DIR}"/share/icons/hicolor/{icon-theme.cache,index.theme}
+	mv "${D}${VM_INSTALL_DIR}"/share/icons "${D}"/usr/share/
+	dodir /usr/share/mime
+	mv "${D}${VM_INSTALL_DIR}"/share/mime/packages "${D}"/usr/share/mime
+	sed -i -e "s:${D}::" "${D}"/usr/share/applications/*.desktop
+
+	# Copy across the temporary /etc/vmware directory
+	dodir /etc/vmware/init.d
+	cp -r "${WORKDIR}"/vmware-confdir/* "${D}/etc/vmware"
+	mv "${D}"/etc/init.d/* "${D}/etc/vmware/init.d"
+	sed -i -e "s:/sbin/lsmod:/bin/lsmod:" "${D}"/etc/vmware/init.d/vmware
+	newinitd "${FILESDIR}/${PN}"-6.5.rc vmware
+	touch "${D}"/etc/vmware/networking
+
+	# Setup the path environment
+	insinto /etc/env.d
+	doins "${FILESDIR}/90${PN}"
+
+	# Fix some paths to allow included gtk to work
+	for i in 	"/etc/pango/pangorc" \
+			"/etc/pango/pango.modules" \
+			"/etc/gtk-2.0/gtk.immodules" \
+			"/etc/gtk-2.0/gdk-pixbuf.loaders" ; do
+		sed -i -e "s:${D}::" "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf${i} ;
+		sed -i -e "s:${D}::" "${D}${VM_INSTALL_DIR}"/lib/vmware/installer/lib/libconf${i} ;
+	done
+}
+
+pkg_config() {
+	${VM_INSTALL_DIR}/bin/vmware-networks --postinstall ${PN},old,new
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+
+	ewarn "Before you can use vmware-workstation, you must configure a default network setup."
+	ewarn "You can do this by running 'emerge --config ${PN}'."
+}
+
+pkg_prerm() {
+	einfo "Stopping ${product_name} for safe unmerge"
+	/etc/init.d/vmware stop
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/dev-cpp/libsexymm/Manifest b/dev-cpp/libsexymm/Manifest
new file mode 100644
index 0000000..2e462da
--- /dev/null
+++ b/dev-cpp/libsexymm/Manifest
@@ -0,0 +1,3 @@
+DIST libsexymm-0.1.6.tar.gz 331210 RMD160 68def72324d3801108e8fa0167bf2bb7523b629c SHA1 c594fcc164e6d59686a49ddbffe3a48c03c55302 SHA256 62591c2e3edc4b3772c6138073bf467983ae1f598cbb43056659ce288e6e609a
+EBUILD libsexymm-0.1.6.ebuild 652 RMD160 e8d253a9650aeb68e76af6dd143b1d81f9d5e29d SHA1 8d93ec38c1b9a83e5466ccff9d471db0dfbe247b SHA256 f1154af9e5232b3f28a48013022e5e6ab6d7340a71373f312111415d7fc8c541
+MISC metadata.xml 207 RMD160 33afef74e04761c439bf74e7ffb730a7b8bdbeb6 SHA1 0e46ca54dc3ccd0fc8be128be8e9f2e584f5d111 SHA256 92a79121c309d0a1577cf36ca840e00de42ea6d526758c00f519172af76a6629
diff --git a/dev-cpp/libsexymm/libsexymm-0.1.6.ebuild b/dev-cpp/libsexymm/libsexymm-0.1.6.ebuild
new file mode 100644
index 0000000..ef429ca
--- /dev/null
+++ b/dev-cpp/libsexymm/libsexymm-0.1.6.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libsexymm/libsexymm-0.1.9.ebuild,v 1.6 2008/11/29 16:10:59 dertobi123 Exp $
+
+inherit gnome2
+
+DESCRIPTION="C++ Bindings for libsexy"
+HOMEPAGE="http://www.chipx86.com/wiki/Libsexy"
+SRC_URI="http://releases.chipx86.com/libsexy/libsexymm/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="1"
+KEYWORDS="amd64 ppc x86"
+IUSE="doc"
+
+RDEPEND=">=dev-cpp/glibmm-2.4
+		 >=dev-cpp/gtkmm-2.4
+		 >=x11-libs/libsexy-0.1.9"
+DEPEND="${RDEPEND}
+		dev-util/pkgconfig"
+
+src_install() {
+	dolib.so libsexy/libsexymm/.libs/libsexymm.so.*
+}
diff --git a/dev-cpp/libsexymm/metadata.xml b/dev-cpp/libsexymm/metadata.xml
new file mode 100644
index 0000000..76a5708
--- /dev/null
+++ b/dev-cpp/libsexymm/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>cpp</herd>
+	<longdescription lang="en">
+	</longdescription>
+</pkgmetadata>
+
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index d346529..5b29876 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -1,11 +1,15 @@
 AUX alphacpuid.s 1641 RMD160 d17ba2ec61e0a380e74f554ba58b9cf9c31805c8 SHA1 5fab001dbd6af763a809eff5f68e5e2430059b46 SHA256 f754956f7de5ffa07762ac4b574b29a5de016c181382c233d17ac8009b770be9
 AUX gentoo.config-0.9.7 4249 RMD160 a63c08a30dd294429c562b8e24bf2b13ba220f63 SHA1 737dbd27e39726c49e44f5e92e46bdf8a8ff9b4d SHA256 c14ff861759f4ebaeb57f37ae7df63af4dea1767eae07ef0eb42abd43cebc4a1
+AUX gentoo.config-0.9.7g 3363 RMD160 48b94beed5c028a6706f4dd097197f00f0e016c0 SHA1 1588adae2922301159d8fc3907c9428959226462 SHA256 27f41e4940a48c2911e61e73f77b680c7d37a9ecfa540d5310e8d2b33044c651
+AUX openssl-0.9.7-alpha-default-gcc.patch 533 RMD160 ea2d91421aa4d3f463034b40c2c81c195a71c0dd SHA1 f5ee85db45ab80b66225a222c7655b74760b94fe SHA256 814ae7c09359414e7dcd96008c82d868fba0565de2d1b3e6a4275f8cdbeefb5c
+AUX openssl-0.9.7-hppa-fix-detection.patch 1718 RMD160 cc9f87f8da1cbcd1043160c0f90bc7a15cdd3e9e SHA1 742c5558883f1e0c5e9f5ec07249ff8b1f881d8b SHA256 bea60d8f4fcf213ddfe75f2e68af1cd203cf43b06f2400e5954cb1401b9129f0
 AUX openssl-0.9.7e-gentoo.patch 460 RMD160 60969fd05a15fe00d0d1c27b9098acfde28ba65e SHA1 73ff3c336dfdbeed903ac7b82486674ab4ec66a2 SHA256 ddb8d47429f3aadf3f5142293a2c38cbb9eb3927edfd1b497771337c48a11641
-AUX openssl-0.9.8e-bsd-sparc64.patch 1484 RMD160 dd3d18caccd8167673a438cc83fa44f2e993949b SHA1 d07542663f934d5dc2f8f8b8985bde9b033aafdb SHA256 8a79f022a17a7fadb4eb708538b41a7a034e21ad84162beb1f7fa7cff5eb487e
-AUX openssl-0.9.8h-ldflags.patch 1000 RMD160 1e87b16d841360d790f06d714ea5f0111e83ca97 SHA1 72e7ccca848425d7cfc3f58f4476fb8fda4ec2d1 SHA256 00179ad3dc3fecc9193658202d7bb5c81169bbb2be59e8a90201ed43eacec805
-AUX openssl-0.9.8l-binutils.patch 2655 RMD160 d801d719b4fc4a6818313c27def8e7a184f40b99 SHA1 f7aaae0d3a0163105d495661c3a48673655a3b82 SHA256 c81d8b70e7ccbe3e7ee2fc81a4658d058301d0129adcc380c24066aa42cb390c
-AUX openssl-0.9.8m-binutils.patch 684 RMD160 78ee10d906423a77aff91aac2166bb5f58c386e6 SHA1 b7514556196a730541b0c99754b4ef79484e27fe SHA256 1e4475f7183ec237d129b686d4ca5265bf7eb34642e7d9e77cbe8ad9a97b4876
-AUX openssl-1.0.0a-fix-double-free.patch 252 RMD160 4cf11701c503eb28ce2cea834523b9ec3e38bd4a SHA1 4006be947a41f77c471504d4770dbf8b36b315b8 SHA256 a179daada4021897dc2759e9555b22f5dcb511c1d011bbab8106b35fd2332b96
-AUX openssl-1.0.0a-ldflags.patch 914 RMD160 1e057330b3fc84d7f799976c0ba5cce02f505f57 SHA1 9bada0fb576b4f78b046b77b77248b352e1953a6 SHA256 33f5d39e2b6464ed33654214a0148a6f6546fe319793ae04f54d2106422ddba1
+AUX openssl-0.9.7g-amd64-fbsd.patch 1695 RMD160 b4f6d67791dbb307d0f178adefbacc68e5c8f8f1 SHA1 4a8c935e9286a5a10e37d4d2949799f5fef630df SHA256 79cf3189845a4c7147914c5d514f041ce0ee33759a37acd4131aa7f05df2a977
+AUX openssl-0.9.7g-mem-clr-ptr-cast.patch 637 RMD160 77a5b2d4df1d2a48f107a6d7e5de3539d25ed0f3 SHA1 0701f68a04e1098100e389b2518d436f3d742613 SHA256 4678af61ba6cbd6cc4de86025e00102a2c0461f1db1d99697bc091bf2248b7c5
+AUX openssl-0.9.7g-ppc64.patch 856 RMD160 943ddada0fc2193788e948ca244e9219c50bed5e SHA1 edb4fa25e8c5de72c8c899ba2430b36239b1cae0 SHA256 9bdcff5df5345e71e458ebde5850afb2d8e3d16e4178d765e3ae5ac65020c406
+AUX openssl-0.9.7g-superh.patch 1380 RMD160 90943f8d80364d52fdae82c3b582a567dc496302 SHA1 d184e4f185995c0c2190300539bd4878b593b005 SHA256 f6cf075b501d73d93ba41d8b5347bfd3690e32503b20fedb6f414dbf2d974665
+AUX openssl-0.9.7h-ABI-compat.patch 1131 RMD160 0b68f7abeabb4f76fd37f5371fe0f779265aee95 SHA1 85008cc58ab04dca57982dc7887bf294ea841af6 SHA256 10e54c23e9785a588bbc1af509645407b5b7483fbd3afdf0c8ed60f50c4887f1
+AUX openssl-0.9.7i-m68k.patch 408 RMD160 e3d6c310fc2aac42915c8b5de409a12af76c30bd SHA1 4c0877f388ffc141ea0152b79db8f16e7e592e52 SHA256 13bcd35320c59b3d8eb5038698b80fb703a8aabb8af452831228c69db9e8cf9d
+AUX openssl-0.9.7j-doc-updates.patch 8748 RMD160 535a8611dfcb1a120a367be6fa5a8819cce5ec8c SHA1 d2b3729c0190f3191b89de6c76838f725d95e111 SHA256 42e118906eb960a96f4543682cb036bc26a1b16ed995382bc69140a0c1dac7c5
 DIST openssl-0.9.7m.tar.gz 3303943 RMD160 fed13325d90ae4749d7ee858931d6925c3955614 SHA1 546f6bcebdf72a633bad087469d3741a42f7b383 SHA256 c98b9703887e2dda6217b91405d0d94883f7c67e205fc4d7a81bb690d2e10572
-EBUILD openssl-0.9.7m.ebuild 4313 RMD160 0d1b65ddad82d9f5f8bf74e7d05ac5a851777d3a SHA1 0773519cc77a05817cefd716476b408fe6f2372c SHA256 2665c13c4c83be6aebef94703fa9cc0a0156b8f0010d748dd2538ca20fb865b3
+EBUILD openssl-0.9.7m.ebuild 3960 RMD160 80e96d5fb958f219f6ca3dace0d9e194c161beb3 SHA1 67c7b2e75d3cf6953ebdbd05a1ddf42580944fd2 SHA256 43492a299443e4b35d83d510bd954cb05b883da01d66717886f13f5348c45767
diff --git a/dev-libs/openssl/files/gentoo.config-0.9.7g b/dev-libs/openssl/files/gentoo.config-0.9.7g
new file mode 100644
index 0000000..8855640
--- /dev/null
+++ b/dev-libs/openssl/files/gentoo.config-0.9.7g
@@ -0,0 +1,117 @@
+#!/bin/bash
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/files/Attic/gentoo.config-0.9.7g,v 1.13 2007/10/07 16:57:24 vapier dead $
+#
+# Openssl doesn't play along nicely with cross-compiling 
+# like autotools based projects, so let's teach it new tricks.
+#
+# Review the bundled 'config' script to see why kind of targets 
+# we can pass to the 'Configure' script.
+
+
+# Testing routines
+if [[ $1 == "test" ]] ; then
+	for c in \
+		"arm-gentoo-linux-uclibc      |linux-elf-arm -DL_ENDIAN" \
+		"armv5b-linux-gnu             |linux-elf-arm -DB_ENDIAN" \
+		"x86_64-pc-linux-gnu          |linux-x86_64" \
+		"alphaev56-unknown-linux-gnu  |linux-alpha+bwx-gcc" \
+		"whatever-gentoo-freebsdX.Y   |FreeBSD-elf" \
+		"sparc64-alpha-freebsdX.Y     |FreeBSD-sparc64" \
+		"ia64-gentoo-freebsd5.99234   |FreeBSD-ia64" \
+		"x86_64-gentoo-freebsdX.Y     |FreeBSD-amd64" \
+		"hppa64-aldsF-linux-gnu5.3    |linux-parisc" \
+		"powerpc-gentOO-linux-uclibc  |linux-ppc" \
+		"powerpc64-unk-linux-gnu      |linux-ppc64" \
+	;do
+		CHOST=${c/|*}
+		ret_want=${c/*|}
+		ret_got=$(CHOST=${CHOST} "$0")
+
+		if [[ ${ret_want} == "${ret_got}" ]] ; then
+			echo "PASS: ${CHOST}"
+		else
+			echo "FAIL: ${CHOST}"
+			echo -e "\twanted: ${ret_want}"
+			echo -e "\twe got: ${ret_got}"
+		fi
+	done
+	exit 0
+fi
+[[ -z ${CHOST} && -n $1 ]] && CHOST=$1
+
+
+# Detect the operating system
+case ${CHOST} in
+	*-linux*)    system="linux";;
+	*-freebsd*)  system="FreeBSD";;
+	*)           exit 0;;
+esac
+
+
+# Compiler munging
+compiler="gcc"
+if [[ ${CC} == "ccc" ]] ; then
+	compiler=${CC}
+fi
+
+
+# Detect target arch
+machine=""
+chost_machine=${CHOST%%-*}
+case ${system} in
+linux)
+	case ${chost_machine} in
+		alphaev56*)   machine=alpha+bwx-${compiler};;
+		alphaev[67]*) machine=alpha+bwx-${compiler};;
+		alpha*)
+			# this pretty hack is because we have to make sure we
+			# maintain ABI on the system or things like ssh break
+			currmachine=""
+			if [[ ${ROOT} == "/" ]] && [[ -e /usr/lib/libcrypto.so ]] ; then
+				currmachine=$(strings /usr/lib/libcrypto.so | grep ^linux-alpha | sed -e s:linux-::)
+			fi
+			machine=${currmachine:-alpha-${compiler}}
+
+			# NOTE: drop this crap next time SSL changes ABI #'s
+			[[ ${PV:0:5} != "0.9.7" ]] && machine="plzupdatemekthxbye"
+			;;
+
+		arm*b*)       machine="elf-arm -DB_ENDIAN";;
+		arm*)         machine="elf-arm -DL_ENDIAN";;
+	#	hppa64*)      machine=parisc64;;
+		hppa*)        machine=parisc;;
+		i[0-5]86*)    machine=elf;;
+		i[6-9]86*)    machine=pentium;;
+		ia64*)        machine=ia64;;
+		m68*)         machine=m68k;;
+		mips*el*)     machine=mipsel;;
+		mips*)        machine=mips;;
+		powerpc64*)   machine=ppc64;;
+		powerpc*)     machine=ppc;;
+	#	sh64*)        machine=elf;;
+		sh*b*)        machine="elf-sh -DB_ENDIAN";;
+		sh*)          machine="elf-sh -DL_ENDIAN";;
+		sparc*v7*)    machine=sparcv7;;
+		sparc64*)     machine=sparcv9;;
+		sparc*)       machine=sparcv8;;
+		s390x*)       machine=s390x;;
+		s390*)        machine=s390;;
+		x86_64*)      machine=x86_64;;
+	esac
+	;;
+FreeBSD)
+	case ${chost_machine} in
+		sparc64*)     machine=sparc64;;
+		ia64*)        machine=ia64;;
+		alpha*)       machine=alpha;;
+		x86_64*)      machine=amd64;;
+		*)            machine=elf;;
+	esac
+	;;
+esac
+
+
+# If we have something, show it
+[[ -n ${machine} ]] && echo ${system}-${machine}
diff --git a/dev-libs/openssl/files/openssl-0.9.7-alpha-default-gcc.patch b/dev-libs/openssl/files/openssl-0.9.7-alpha-default-gcc.patch
new file mode 100644
index 0000000..a56e76e
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-0.9.7-alpha-default-gcc.patch
@@ -0,0 +1,12 @@
+diff -ur openssl-0.9.7d.orig/config openssl-0.9.7d/config
+--- openssl-0.9.7d.orig/config	2004-12-11 19:01:11.077248504 -0500
++++ openssl-0.9.7d/config	2004-12-11 19:08:52.099162520 -0500
+@@ -452,7 +452,7 @@
+ 	sed 's/.* C V\([0-9]\)\.\([0-9]\).*/\1\2/'`
+   CCCVER=${CCCVER:-0}
+   if [ $CCCVER -gt 60 ]; then
+-    CC=ccc	# overrides gcc!!! well, ccc outperforms inoticeably
++    CC=gcc	# overrides gcc!!! well, ccc outperforms inoticeably
+ 		# only on hash routines and des, otherwise gcc (2.95)
+ 		# keeps along rather tight...
+   fi
diff --git a/dev-libs/openssl/files/openssl-0.9.7-hppa-fix-detection.patch b/dev-libs/openssl/files/openssl-0.9.7-hppa-fix-detection.patch
new file mode 100644
index 0000000..f52a8b8
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-0.9.7-hppa-fix-detection.patch
@@ -0,0 +1,28 @@
+diff -ur openssl-0.9.7d.orig/Configure openssl-0.9.7d/Configure
+--- openssl-0.9.7d.orig/Configure	2004-12-11 19:01:11.078248352 -0500
++++ openssl-0.9.7d/Configure	2004-12-11 19:06:46.998180760 -0500
+@@ -315,7 +315,7 @@
+ "MPE/iX-gcc", "gcc:-D_ENDIAN -DBN_DIV2W -O3 -D_POSIX_SOURCE -D_SOCKET_SOURCE -I/SYSLOG/PUB::(unknown):MPE:-L/SYSLOG/PUB -lsyslog -lsocket -lcurses:BN_LLONG DES_PTR DES_UNROLL DES_RISC1:::",
+ 
+ #### PARISC Linux setups
+-"linux-parisc","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT:::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::",
++"linux-parisc","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ 
+ # Dec Alpha, OSF/1 - the alpha164-cc is historical, for the conversion
+ # from the older DEC C Compiler to the newer compiler.  It's now the
+diff -ur openssl-0.9.7d.orig/config openssl-0.9.7d/config
+--- openssl-0.9.7d.orig/config	2004-12-11 19:01:11.077248504 -0500
++++ openssl-0.9.7d/config	2004-12-11 19:06:55.621869760 -0500
+@@ -564,9 +564,9 @@
+ 	sun4d)	OUT="linux-sparcv8" ;;
+ 	*)	OUT="linux-sparcv7" ;;
+ 	esac ;;
+-  parisc-*-linux2)
++  parisc*-*-linux2)
+-        CPUARCH=`awk '/cpu family/{print substr($5,1,3)}' /proc/cpuinfo`
+-	CPUSCHEDULE=`awk '/^cpu.[ 	]: PA/{print substr($3,3)}' /proc/cpuinfo`
++        CPUARCH=`awk '/cpu family/{print substr($5,1,3)}' /proc/cpuinfo | head -n 1`
++	CPUSCHEDULE=`awk '/^cpu[[:space:]]*: PA/{print substr($3,3)}' /proc/cpuinfo | head -n 1`
+ 
+ 	# ??TODO ??  Model transformations
+ 	# 0. CPU Architecture for the 1.1 processor has letter suffixes. We strip that off
diff --git a/dev-libs/openssl/files/openssl-0.9.7g-amd64-fbsd.patch b/dev-libs/openssl/files/openssl-0.9.7g-amd64-fbsd.patch
new file mode 100644
index 0000000..a073e00
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-0.9.7g-amd64-fbsd.patch
@@ -0,0 +1,11 @@
+diff -ur -x '*~' openssl-0.9.7g/Configure openssl-0.9.7g-gfbsd-amd64/Configure
+--- openssl-0.9.7g/Configure	2005-04-07 18:06:01.000000000 +0200
++++ openssl-0.9.7g-gfbsd-amd64/Configure	2005-08-11 16:23:42.000000000 +0200
+@@ -419,6 +419,7 @@
+ "FreeBSD-elf",  "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "FreeBSD-sparc64","gcc:-DB_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE:::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2 BF_PTR::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "FreeBSD-ia64","gcc:-DL_ENDIAN -DTERMIOS -O -fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64-cpp.o:::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"FreeBSD-amd64","gcc:-DL_ENDIAN -DTERMIOS -O -fomit-frame-pointer::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE:::SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "FreeBSD",      "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}",
+ "bsdi-gcc",     "gcc:-O3 -ffast-math -DL_ENDIAN -DPERL5 -m486::(unknown):::RSA_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_bsdi_asm}",
+ "bsdi-elf-gcc",     "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
diff --git a/dev-libs/openssl/files/openssl-0.9.7g-mem-clr-ptr-cast.patch b/dev-libs/openssl/files/openssl-0.9.7g-mem-clr-ptr-cast.patch
new file mode 100644
index 0000000..854b32c
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-0.9.7g-mem-clr-ptr-cast.patch
@@ -0,0 +1,19 @@
+Make sure when we cast as a pointer we don't truncate.
+
+Index: crypto/mem_clr.c
+===================================================================
+RCS file: /usr/local/src/openssl/cvs-tree/openssl/crypto/mem_clr.c,v
+retrieving revision 1.2
+retrieving revision 1.3
+diff -u -r1.2 -r1.3
+--- crypto/mem_clr.c	3 Dec 2002 16:06:40 -0000	1.2
++++ crypto/mem_clr.c	29 Apr 2005 14:26:59 -0000	1.3
+@@ -68,7 +68,7 @@
+ 	while(loop--)
+ 		{
+ 		*(p++) = cleanse_ctr;
+-		cleanse_ctr += (17 + (unsigned char)((int)p & 0xF));
++		cleanse_ctr += (17 + (unsigned char)((unsigned long)p & 0xF));
+ 		}
+ 	if(memchr(ptr, cleanse_ctr, len))
+ 		cleanse_ctr += 63;
diff --git a/dev-libs/openssl/files/openssl-0.9.7g-ppc64.patch b/dev-libs/openssl/files/openssl-0.9.7g-ppc64.patch
new file mode 100644
index 0000000..9ea804a
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-0.9.7g-ppc64.patch
@@ -0,0 +1,11 @@
+Remove silly compiler flags which aren't needed.
+
+http://bugs.gentoo.org/92074
+
+--- openssl-0.9.7g/Configure
++++ openssl-0.9.7g/Configure
+@@ -407,3 +407,3 @@
+ # -bpowerpc64-linux is transient option, -m64 should be the one to use...
+-"linux-ppc64",  "gcc:-bpowerpc64-linux -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:asm/linux_ppc64.o:::::::::dlfcn:linux-shared:-fPIC:-bpowerpc64-linux:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-ppc64",  "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:asm/linux_ppc64.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-m68k",   "gcc:-DB_ENDIAN -DTERMIO -O2 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG::",
diff --git a/dev-libs/openssl/files/openssl-0.9.7g-superh.patch b/dev-libs/openssl/files/openssl-0.9.7g-superh.patch
new file mode 100644
index 0000000..cc599fe
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-0.9.7g-superh.patch
@@ -0,0 +1,23 @@
+diff -Naur openssl-0.9.7g.orig/Configure openssl-0.9.7g/Configure
+--- openssl-0.9.7g.orig/Configure	2005-04-08 01:06:01.000000000 +0900
++++ openssl-0.9.7g/Configure	2005-08-06 20:21:25.000000000 +0900
+@@ -438,6 +438,7 @@
+ # ARM comes in both little- and big-endian flavors. The following line is
+ # endian neutral, but ./config is free to throw in -D[BL]_ENDIAN...
+ "linux-elf-arm","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-elf-sh","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ 
+ # SCO/Caldera targets.
+ #
+diff -Naur openssl-0.9.7g.orig/config openssl-0.9.7g/config
+--- openssl-0.9.7g.orig/config	2005-04-08 05:26:10.000000000 +0900
++++ openssl-0.9.7g/config	2005-08-06 20:23:09.000000000 +0900
+@@ -604,6 +604,8 @@
+   arm*b-*-linux2) OUT="linux-elf-arm"; options="$options -DB_ENDIAN" ;;
+   arm*l-*-linux2) OUT="linux-elf-arm"; options="$options -DL_ENDIAN" ;;
+   arm*-*-linux2)  OUT="linux-elf-arm" ;;
++  sh*b-*-linux2) OUT="linux-elf-sh"; options="$options -DB_ENDIAN" ;;
++  sh*-*-linux2)  OUT="linux-elf-sh"; options="$options -DL_ENDIAN" ;;
+   s390-*-linux2) OUT="linux-s390" ;;
+   s390x-*-linux?) OUT="linux-s390x" ;;
+   x86_64-*-linux?) OUT="linux-x86_64" ;;
diff --git a/dev-libs/openssl/files/openssl-0.9.7h-ABI-compat.patch b/dev-libs/openssl/files/openssl-0.9.7h-ABI-compat.patch
new file mode 100644
index 0000000..878ec60
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-0.9.7h-ABI-compat.patch
@@ -0,0 +1,11 @@
+Fix from RedHat:
+* Thu Mar 31 2005 Tomas Mraz <tmraz@redhat.com> 0.9.7f-2
+- disable broken bignum assembly on x86_64
+
+--- Configure
++++ Configure
+@@ -413,3 +413,3 @@
+ "linux-ia64-ecc",   "ecc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64.o::::asm/sha1-ia64.o::asm/rc4-ia64.o:::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"linux-x86_64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT DES_UNROLL:asm/x86_64-gcc.o::::::asm/rc4-x86_64.o:::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-x86_64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT DES_UNROLL:asm/x86_64-gcc.o:::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "NetBSD-sparc",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
diff --git a/dev-libs/openssl/files/openssl-0.9.7i-m68k.patch b/dev-libs/openssl/files/openssl-0.9.7i-m68k.patch
new file mode 100644
index 0000000..61be836
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-0.9.7i-m68k.patch
@@ -0,0 +1,11 @@
+enable shared libs on m68k
+
+patch by Kolbjørn Barmen
+
+http://bugs.gentoo.org/113807
+
+--- Configure
++++ Configure
+@@ -407,1 +407,1 @@
+-"linux-m68k",   "gcc:-DB_ENDIAN -DTERMIO -O2 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG::",
++"linux-m68k",   "gcc:-DB_ENDIAN -DTERMIO -O2 -Wall::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
diff --git a/dev-libs/openssl/files/openssl-0.9.7j-doc-updates.patch b/dev-libs/openssl/files/openssl-0.9.7j-doc-updates.patch
new file mode 100644
index 0000000..6ac1ddc
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-0.9.7j-doc-updates.patch
@@ -0,0 +1,257 @@
+--- doc/crypto/ASN1_OBJECT_new.pod
++++ doc/crypto/ASN1_OBJECT_new.pod
+@@ -6,6 +6,8 @@ ASN1_OBJECT_new, ASN1_OBJECT_free, - obj
+ 
+ =head1 SYNOPSIS
+ 
++ #include <openssl/asn1.h>
++
+  ASN1_OBJECT *ASN1_OBJECT_new(void);
+  void ASN1_OBJECT_free(ASN1_OBJECT *a);
+ 
+--- doc/crypto/ASN1_STRING_length.pod
++++ doc/crypto/ASN1_STRING_length.pod
+@@ -8,6 +8,8 @@ ASN1_STRING utility functions
+ 
+ =head1 SYNOPSIS
+ 
++ #include <openssl/asn1.h>
++
+  int ASN1_STRING_length(ASN1_STRING *x);
+  unsigned char * ASN1_STRING_data(ASN1_STRING *x);
+ 
+--- doc/crypto/ASN1_STRING_new.pod
++++ doc/crypto/ASN1_STRING_new.pod
+@@ -7,6 +7,8 @@ ASN1_STRING allocation functions
+ 
+ =head1 SYNOPSIS
+ 
++ #include <openssl/asn1.h>
++
+  ASN1_STRING * ASN1_STRING_new(void);
+  ASN1_STRING * ASN1_STRING_type_new(int type);
+  void ASN1_STRING_free(ASN1_STRING *a);
+--- doc/crypto/bn_internal.pod
++++ doc/crypto/bn_internal.pod
+@@ -13,6 +13,8 @@ library internal functions
+ 
+ =head1 SYNOPSIS
+ 
++ #include <openssl/bn.h>
++
+  BN_ULONG bn_mul_words(BN_ULONG *rp, BN_ULONG *ap, int num, BN_ULONG w);
+  BN_ULONG bn_mul_add_words(BN_ULONG *rp, BN_ULONG *ap, int num,
+    BN_ULONG w);
+--- doc/crypto/CRYPTO_set_ex_data.pod
++++ doc/crypto/CRYPTO_set_ex_data.pod
+@@ -6,6 +6,8 @@ CRYPTO_set_ex_data, CRYPTO_get_ex_data -
+ 
+ =head1 SYNOPSIS
+ 
++ #include <openssl/crypto.h>
++
+  int CRYPTO_set_ex_data(CRYPTO_EX_DATA *r, int idx, void *arg);
+ 
+  void *CRYPTO_get_ex_data(CRYPTO_EX_DATA *r, int idx);
+--- doc/crypto/OBJ_nid2obj.pod
++++ doc/crypto/OBJ_nid2obj.pod
+@@ -8,6 +8,8 @@ functions
+ 
+ =head1 SYNOPSIS
+ 
++ #include <openssl/objects.h>
++
+  ASN1_OBJECT * OBJ_nid2obj(int n);
+  const char *  OBJ_nid2ln(int n);
+  const char *  OBJ_nid2sn(int n);
+--- doc/crypto/PKCS7_decrypt.pod
++++ doc/crypto/PKCS7_decrypt.pod
+@@ -6,7 +6,9 @@ PKCS7_decrypt - decrypt content from a P
+ 
+ =head1 SYNOPSIS
+ 
+-int PKCS7_decrypt(PKCS7 *p7, EVP_PKEY *pkey, X509 *cert, BIO *data, int flags);
++ #include <openssl/pkcs7.h>
++
++ int PKCS7_decrypt(PKCS7 *p7, EVP_PKEY *pkey, X509 *cert, BIO *data, int flags);
+ 
+ =head1 DESCRIPTION
+ 
+--- doc/crypto/PKCS7_encrypt.pod
++++ doc/crypto/PKCS7_encrypt.pod
+@@ -6,7 +6,9 @@ PKCS7_encrypt - create a PKCS#7 envelope
+ 
+ =head1 SYNOPSIS
+ 
+-PKCS7 *PKCS7_encrypt(STACK_OF(X509) *certs, BIO *in, const EVP_CIPHER *cipher, int flags);
++ #include <openssl/pkcs7.h>
++
++ PKCS7 *PKCS7_encrypt(STACK_OF(X509) *certs, BIO *in, const EVP_CIPHER *cipher, int flags);
+ 
+ =head1 DESCRIPTION
+ 
+--- doc/crypto/PKCS7_sign.pod
++++ doc/crypto/PKCS7_sign.pod
+@@ -6,7 +6,9 @@ PKCS7_sign - create a PKCS#7 signedData 
+ 
+ =head1 SYNOPSIS
+ 
+-PKCS7 *PKCS7_sign(X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs, BIO *data, int flags);
++ #include <openssl/pkcs7.h>
++
++ PKCS7 *PKCS7_sign(X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs, BIO *data, int flags);
+ 
+ =head1 DESCRIPTION
+ 
+--- doc/crypto/PKCS7_verify.pod
++++ doc/crypto/PKCS7_verify.pod
+@@ -6,9 +6,11 @@ PKCS7_verify - verify a PKCS#7 signedDat
+ 
+ =head1 SYNOPSIS
+ 
+-int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store, BIO *indata, BIO *out, int flags);
++ #include <openssl/pkcs7.h>
+ 
+-STACK_OF(X509) *PKCS7_get0_signers(PKCS7 *p7, STACK_OF(X509) *certs, int flags);
++ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store, BIO *indata, BIO *out, int flags);
++
++ STACK_OF(X509) *PKCS7_get0_signers(PKCS7 *p7, STACK_OF(X509) *certs, int flags);
+ 
+ =head1 DESCRIPTION
+ 
+--- doc/crypto/SMIME_read_PKCS7.pod
++++ doc/crypto/SMIME_read_PKCS7.pod
+@@ -6,7 +6,9 @@ SMIME_read_PKCS7 - parse S/MIME message.
+ 
+ =head1 SYNOPSIS
+ 
+-PKCS7 *SMIME_read_PKCS7(BIO *in, BIO **bcont);
++ #include <openssl/pkcs7.h>
++
++ PKCS7 *SMIME_read_PKCS7(BIO *in, BIO **bcont);
+ 
+ =head1 DESCRIPTION
+ 
+--- doc/crypto/SMIME_write_PKCS7.pod
++++ doc/crypto/SMIME_write_PKCS7.pod
+@@ -6,7 +6,9 @@ SMIME_write_PKCS7 - convert PKCS#7 struc
+ 
+ =head1 SYNOPSIS
+ 
+-int SMIME_write_PKCS7(BIO *out, PKCS7 *p7, BIO *data, int flags);
++ #include <openssl/pkcs7.h>
++
++ int SMIME_write_PKCS7(BIO *out, PKCS7 *p7, BIO *data, int flags);
+ 
+ =head1 DESCRIPTION
+ 
+--- doc/crypto/ui_compat.pod
++++ doc/crypto/ui_compat.pod
+@@ -7,6 +7,8 @@ Compatibility user interface functions
+ 
+ =head1 SYNOPSIS
+ 
++ #include <openssl/des_old.h>
++
+  int des_read_password(DES_cblock *key,const char *prompt,int verify);
+  int des_read_2passwords(DES_cblock *key1,DES_cblock *key2,
+  	const char *prompt,int verify);
+--- doc/crypto/X509_NAME_add_entry_by_txt.pod
++++ doc/crypto/X509_NAME_add_entry_by_txt.pod
+@@ -7,15 +7,17 @@ X509_NAME_add_entry, X509_NAME_delete_en
+ 
+ =head1 SYNOPSIS
+ 
+-int X509_NAME_add_entry_by_txt(X509_NAME *name, const char *field, int type, const unsigned char *bytes, int len, int loc, int set);
++ #include <openssl/x509.h>
+ 
+-int X509_NAME_add_entry_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj, int type, unsigned char *bytes, int len, int loc, int set);
++ int X509_NAME_add_entry_by_txt(X509_NAME *name, const char *field, int type, const unsigned char *bytes, int len, int loc, int set);
+ 
+-int X509_NAME_add_entry_by_NID(X509_NAME *name, int nid, int type, unsigned char *bytes, int len, int loc, int set);
++ int X509_NAME_add_entry_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj, int type, unsigned char *bytes, int len, int loc, int set);
+ 
+-int X509_NAME_add_entry(X509_NAME *name,X509_NAME_ENTRY *ne, int loc, int set);
++ int X509_NAME_add_entry_by_NID(X509_NAME *name, int nid, int type, unsigned char *bytes, int len, int loc, int set);
+ 
+-X509_NAME_ENTRY *X509_NAME_delete_entry(X509_NAME *name, int loc);
++ int X509_NAME_add_entry(X509_NAME *name,X509_NAME_ENTRY *ne, int loc, int set);
++
++ X509_NAME_ENTRY *X509_NAME_delete_entry(X509_NAME *name, int loc);
+ 
+ =head1 DESCRIPTION
+ 
+--- doc/crypto/X509_NAME_ENTRY_get_object.pod
++++ doc/crypto/X509_NAME_ENTRY_get_object.pod
+@@ -9,15 +9,17 @@ X509_NAME_ENTRY_create_by_OBJ - X509_NAM
+ 
+ =head1 SYNOPSIS
+ 
+-ASN1_OBJECT * X509_NAME_ENTRY_get_object(X509_NAME_ENTRY *ne);
+-ASN1_STRING * X509_NAME_ENTRY_get_data(X509_NAME_ENTRY *ne);
++ #include <openssl/x509.h>
+ 
+-int X509_NAME_ENTRY_set_object(X509_NAME_ENTRY *ne, ASN1_OBJECT *obj);
+-int X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *ne, int type, const unsigned char *bytes, int len);
++ ASN1_OBJECT * X509_NAME_ENTRY_get_object(X509_NAME_ENTRY *ne);
++ ASN1_STRING * X509_NAME_ENTRY_get_data(X509_NAME_ENTRY *ne);
+ 
+-X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_txt(X509_NAME_ENTRY **ne, const char *field, int type, const unsigned char *bytes, int len);
+-X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_NID(X509_NAME_ENTRY **ne, int nid, int type,unsigned char *bytes, int len);
+-X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_OBJ(X509_NAME_ENTRY **ne, ASN1_OBJECT *obj, int type, const unsigned char *bytes, int len);
++ int X509_NAME_ENTRY_set_object(X509_NAME_ENTRY *ne, ASN1_OBJECT *obj);
++ int X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *ne, int type, const unsigned char *bytes, int len);
++
++ X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_txt(X509_NAME_ENTRY **ne, const char *field, int type, const unsigned char *bytes, int len);
++ X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_NID(X509_NAME_ENTRY **ne, int nid, int type,unsigned char *bytes, int len);
++ X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_OBJ(X509_NAME_ENTRY **ne, ASN1_OBJECT *obj, int type, const unsigned char *bytes, int len);
+ 
+ =head1 DESCRIPTION
+ 
+--- doc/crypto/X509_NAME_get_index_by_NID.pod
++++ doc/crypto/X509_NAME_get_index_by_NID.pod
+@@ -8,14 +8,16 @@ X509_NAME lookup and enumeration functio
+ 
+ =head1 SYNOPSIS
+ 
+-int X509_NAME_get_index_by_NID(X509_NAME *name,int nid,int lastpos);
+-int X509_NAME_get_index_by_OBJ(X509_NAME *name,ASN1_OBJECT *obj, int lastpos);
++ #include <openssl/x509.h>
+ 
+-int X509_NAME_entry_count(X509_NAME *name);
+-X509_NAME_ENTRY *X509_NAME_get_entry(X509_NAME *name, int loc);
++ int X509_NAME_get_index_by_NID(X509_NAME *name,int nid,int lastpos);
++ int X509_NAME_get_index_by_OBJ(X509_NAME *name,ASN1_OBJECT *obj, int lastpos);
+ 
+-int X509_NAME_get_text_by_NID(X509_NAME *name, int nid, char *buf,int len);
+-int X509_NAME_get_text_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj, char *buf,int len);
++ int X509_NAME_entry_count(X509_NAME *name);
++ X509_NAME_ENTRY *X509_NAME_get_entry(X509_NAME *name, int loc);
++
++ int X509_NAME_get_text_by_NID(X509_NAME *name, int nid, char *buf,int len);
++ int X509_NAME_get_text_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj, char *buf,int len);
+ 
+ =head1 DESCRIPTION
+ 
+--- doc/crypto/X509_new.pod
++++ doc/crypto/X509_new.pod
+@@ -6,6 +6,8 @@ X509_new, X509_free - X509 certificate A
+ 
+ =head1 SYNOPSIS
+ 
++ #include <openssl/x509.h>
++
+  X509 *X509_new(void);
+  void X509_free(X509 *a);
+ 
+--- Makefile.org
++++ Makefile.org
+@@ -218,7 +218,7 @@
+ MANDIR=$(OPENSSLDIR)/man
+ MAN1=1
+ MAN3=3
+-MANSUFFIX=
++MANSUFFIX=ssl
+ SHELL=/bin/sh
+ 
+ TOP=    .
diff --git a/dev-libs/openssl/files/openssl-0.9.8e-bsd-sparc64.patch b/dev-libs/openssl/files/openssl-0.9.8e-bsd-sparc64.patch
deleted file mode 100644
index a798164..0000000
--- a/dev-libs/openssl/files/openssl-0.9.8e-bsd-sparc64.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/Configure
-+++ b/Configure
-@@ -365,7 +365,7 @@
- # -DMD32_REG_T=int doesn't actually belong in sparc64 target, it
- # simply *happens* to work around a compiler bug in gcc 3.3.3,
- # triggered by RIPEMD160 code.
--"BSD-sparc64",	"gcc:-DB_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2 BF_PTR:::des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"BSD-sparc64",	"gcc:-DB_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::${BSDthreads}:ULTRASPARC::SIXTY_FOUR_BIT_LONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2 BF_PTR:::des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "BSD-ia64",	"gcc:-DL_ENDIAN -DTERMIOS -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${ia64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "BSD-x86_64",	"gcc:-DL_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- 
-
-the -B flag is a no-op nowadays
-
---- a/crypto/des/Makefile
-+++ b/crypto/des/Makefile
-@@ -62,7 +62,7 @@
- 	$(CC) $(CFLAGS) -o des des.o cbc3_enc.o $(LIB)
- 
- des_enc-sparc.S:	asm/des_enc.m4
--	m4 -B 8192 asm/des_enc.m4 > des_enc-sparc.S
-+	m4 asm/des_enc.m4 > des_enc-sparc.S
- 
- # ELF
- dx86-elf.s:	asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
diff --git a/dev-libs/openssl/files/openssl-0.9.8h-ldflags.patch b/dev-libs/openssl/files/openssl-0.9.8h-ldflags.patch
deleted file mode 100644
index 462af70..0000000
--- a/dev-libs/openssl/files/openssl-0.9.8h-ldflags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-http://bugs.gentoo.org/181438
-
-make sure we respect LDFLAGS
-
---- openssl-0.9.8h/Makefile.org
-+++ openssl-0.9.8h/Makefile.org
-@@ -180,6 +181,7 @@
- 		MAKEDEPEND='$$$${TOP}/util/domd $$$${TOP} -MD ${MAKEDEPPROG}' \
- 		DEPFLAG='-DOPENSSL_NO_DEPRECATED ${DEPFLAG}'	\
- 		MAKEDEPPROG='${MAKEDEPPROG}'			\
-+		LDFLAGS='${LDFLAGS}'		\
- 		SHARED_LDFLAGS='${SHARED_LDFLAGS}'		\
- 		KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}'	\
- 		EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}'	\
---- openssl-0.9.8h/Makefile.shared
-+++ openssl-0.9.8h/Makefile.shared
-@@ -153,7 +153,7 @@
- 	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
- 	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
- 
--DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
-+DO_GNU_APP=LDFLAGS="$(LDFLAGS) $(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
- 
- #This is rather special.  It's a special target with which one can link
- #applications without bothering with any features that have anything to
diff --git a/dev-libs/openssl/files/openssl-0.9.8l-binutils.patch b/dev-libs/openssl/files/openssl-0.9.8l-binutils.patch
deleted file mode 100644
index d1bb775..0000000
--- a/dev-libs/openssl/files/openssl-0.9.8l-binutils.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-fix from upstream for building with newer binutils
-
-http://bugs.gentoo.org/289130
-
-Index: crypto/md5/asm/md5-x86_64.pl
-===================================================================
-RCS file: /usr/local/src/openssl/CVSROOT/openssl/crypto/md5/asm/md5-x86_64.pl,v
-retrieving revision 1.2.2.1
-retrieving revision 1.2.2.2
-diff -u -p -r1.2.2.1 -r1.2.2.2
---- openssl/crypto/md5/asm/md5-x86_64.pl	11 Nov 2007 13:34:06 -0000	1.2.2.1
-+++ openssl/crypto/md5/asm/md5-x86_64.pl	13 Nov 2009 14:14:46 -0000	1.2.2.2
-@@ -19,6 +19,7 @@ my $code;
- sub round1_step
- {
-     my ($pos, $dst, $x, $y, $z, $k_next, $T_i, $s) = @_;
-+    $T_i = unpack("l",pack("l", hex($T_i))); # convert to 32-bit signed decimal
-     $code .= " mov	0*4(%rsi),	%r10d		/* (NEXT STEP) X[0] */\n" if ($pos == -1);
-     $code .= " mov	%edx,		%r11d		/* (NEXT STEP) z' = %edx */\n" if ($pos == -1);
-     $code .= <<EOF;
-@@ -42,6 +43,7 @@ EOF
- sub round2_step
- {
-     my ($pos, $dst, $x, $y, $z, $k_next, $T_i, $s) = @_;
-+    $T_i = unpack("l",pack("l", hex($T_i))); # convert to 32-bit signed decimal
-     $code .= " mov	1*4(%rsi),	%r10d		/* (NEXT STEP) X[1] */\n" if ($pos == -1);
-     $code .= " mov	%ecx,		%r11d		/* (NEXT STEP) y' = %ecx */\n" if ($pos == -1);
-     $code .= <<EOF;
-@@ -65,6 +67,7 @@ EOF
- sub round3_step
- {
-     my ($pos, $dst, $x, $y, $z, $k_next, $T_i, $s) = @_;
-+    $T_i = unpack("l",pack("l", hex($T_i))); # convert to 32-bit signed decimal
-     $code .= " mov	5*4(%rsi),	%r10d		/* (NEXT STEP) X[5] */\n" if ($pos == -1);
-     $code .= " mov	%ecx,		%r11d		/* (NEXT STEP) y' = %ecx */\n" if ($pos == -1);
-     $code .= <<EOF;
-@@ -87,6 +90,7 @@ EOF
- sub round4_step
- {
-     my ($pos, $dst, $x, $y, $z, $k_next, $T_i, $s) = @_;
-+    $T_i = unpack("l",pack("l", hex($T_i))); # convert to 32-bit signed decimal
-     $code .= " mov	0*4(%rsi),	%r10d		/* (NEXT STEP) X[0] */\n" if ($pos == -1);
-     $code .= " mov	\$0xffffffff,	%r11d\n" if ($pos == -1);
-     $code .= " xor	%edx,		%r11d		/* (NEXT STEP) not z' = not %edx*/\n"
-
-Ripped from Fedora
-
---- openssl-1.0.0-beta4/crypto/sha/asm/sha1-x86_64.pl.binutils	2009-11-12 15:17:29.000000000 +0100
-+++ openssl-1.0.0-beta4/crypto/sha/asm/sha1-x86_64.pl	2009-11-12 17:24:18.000000000 +0100
-@@ -150,7 +150,7 @@ ___
- sub BODY_20_39 {
- my ($i,$a,$b,$c,$d,$e,$f)=@_;
- my $j=$i+1;
--my $K=($i<40)?0x6ed9eba1:0xca62c1d6;
-+my $K=($i<40)?0x6ed9eba1:-0x359d3e2a;
- $code.=<<___ if ($i<79);
- 	lea	$K($xi,$e),$f
- 	mov	`4*($j%16)`(%rsp),$xi
-@@ -187,7 +187,7 @@ sub BODY_40_59 {
- my ($i,$a,$b,$c,$d,$e,$f)=@_;
- my $j=$i+1;
- $code.=<<___;
--	lea	0x8f1bbcdc($xi,$e),$f
-+	lea	-0x70e44324($xi,$e),$f
- 	mov	`4*($j%16)`(%rsp),$xi
- 	mov	$b,$t0
- 	mov	$b,$t1
diff --git a/dev-libs/openssl/files/openssl-0.9.8m-binutils.patch b/dev-libs/openssl/files/openssl-0.9.8m-binutils.patch
deleted file mode 100644
index 9fa79b9..0000000
--- a/dev-libs/openssl/files/openssl-0.9.8m-binutils.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-http://bugs.gentoo.org/289130
-
-Ripped from Fedora
-
---- openssl-1.0.0-beta4/crypto/sha/asm/sha1-x86_64.pl.binutils	2009-11-12 15:17:29.000000000 +0100
-+++ openssl-1.0.0-beta4/crypto/sha/asm/sha1-x86_64.pl	2009-11-12 17:24:18.000000000 +0100
-@@ -150,7 +150,7 @@ ___
- sub BODY_20_39 {
- my ($i,$a,$b,$c,$d,$e,$f)=@_;
- my $j=$i+1;
--my $K=($i<40)?0x6ed9eba1:0xca62c1d6;
-+my $K=($i<40)?0x6ed9eba1:-0x359d3e2a;
- $code.=<<___ if ($i<79);
- 	lea	$K($xi,$e),$f
- 	mov	`4*($j%16)`(%rsp),$xi
-@@ -187,7 +187,7 @@ sub BODY_40_59 {
- my ($i,$a,$b,$c,$d,$e,$f)=@_;
- my $j=$i+1;
- $code.=<<___;
--	lea	0x8f1bbcdc($xi,$e),$f
-+	lea	-0x70e44324($xi,$e),$f
- 	mov	`4*($j%16)`(%rsp),$xi
- 	mov	$b,$t0
- 	mov	$b,$t1
diff --git a/dev-libs/openssl/files/openssl-1.0.0a-fix-double-free.patch b/dev-libs/openssl/files/openssl-1.0.0a-fix-double-free.patch
deleted file mode 100644
index a5aaf1e..0000000
--- a/dev-libs/openssl/files/openssl-1.0.0a-fix-double-free.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-http://bugs.gentoo.org/332027
-
---- ssl/s3_clnt.c
-+++ ssl/s3_clnt.c
-@@ -1508,6 +1508,7 @@
- 		s->session->sess_cert->peer_ecdh_tmp=ecdh;
- 		ecdh=NULL;
- 		BN_CTX_free(bn_ctx);
-+		bn_ctx = NULL;
- 		EC_POINT_free(srvr_ecpoint);
- 		srvr_ecpoint = NULL;
- 		}
diff --git a/dev-libs/openssl/files/openssl-1.0.0a-ldflags.patch b/dev-libs/openssl/files/openssl-1.0.0a-ldflags.patch
deleted file mode 100644
index 290cdf9..0000000
--- a/dev-libs/openssl/files/openssl-1.0.0a-ldflags.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-http://bugs.gentoo.org/327421
-
---- Makefile.org
-+++ Makefile.org
-@@ -189,6 +189,7 @@
- 		MAKEDEPEND='$$$${TOP}/util/domd $$$${TOP} -MD $(MAKEDEPPROG)' \
- 		DEPFLAG='-DOPENSSL_NO_DEPRECATED $(DEPFLAG)'	\
- 		MAKEDEPPROG='$(MAKEDEPPROG)'			\
-+		LDFLAGS='${LDFLAGS}'				\
- 		SHARED_LDFLAGS='$(SHARED_LDFLAGS)'		\
- 		KRB5_INCLUDES='$(KRB5_INCLUDES)' LIBKRB5='$(LIBKRB5)'	\
- 		ZLIB_INCLUDE='$(ZLIB_INCLUDE)' LIBZLIB='$(LIBZLIB)'	\
---- Makefile.shared
-+++ Makefile.shared
-@@ -153,7 +153,7 @@
- 	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
- 	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
- 
--DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
-+DO_GNU_APP=LDFLAGS="$(LDFLAGS) $(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
- 
- #This is rather special.  It's a special target with which one can link
- #applications without bothering with any features that have anything to
diff --git a/dev-libs/openssl/openssl-0.9.7m.ebuild b/dev-libs/openssl/openssl-0.9.7m.ebuild
index 130c799..e5f6b34 100644
--- a/dev-libs/openssl/openssl-0.9.7m.ebuild
+++ b/dev-libs/openssl/openssl-0.9.7m.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.7o-r2.ebuild,v 1.1 2010/08/14 05:53:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/Attic/openssl-0.9.7m.ebuild,v 1.4 2007/10/07 16:57:23 vapier dead $
 
-# this ebuild is only for the libcrypto.so.0.9.7 and libssl.so.0.9.7 SONAME for ABI compat
+EAPI="1"
 
-EAPI=1
 inherit eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="Toolkit for SSL v2/v3 and TLS v1"
@@ -13,126 +12,123 @@ SRC_URI="mirror://openssl/source/${P}.tar.gz"
 
 LICENSE="openssl"
 SLOT="0.9.7"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="bindist gmp kerberos sse2 test zlib"
+KEYWORDS="-* ~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="emacs test bindist zlib"
 
-RDEPEND="gmp? ( dev-libs/gmp )
-	zlib? ( sys-libs/zlib )
-	kerberos? ( app-crypt/mit-krb5 )
-	!=dev-libs/openssl-0.9.7*:0"
+RDEPEND="!=dev-libs/openssl-0.9.7*:0"
 DEPEND="${RDEPEND}
 	sys-apps/diffutils
 	>=dev-lang/perl-5
 	test? ( sys-devel/bc )"
+PDEPEND="app-misc/ca-certificates"
 
 pkg_setup() {
-	[[ -e ${ROOT}/usr/$(get_libdir)/libcrypto.so.0.9.7 ]] && \
-		rm -f "${ROOT}"/usr/$(get_libdir)/libcrypto.so.0.9.7
-	[[ -e ${ROOT}/usr/$(get_libdir)/libssl.so.0.9.7 ]] && \
-		rm -f "${ROOT}"/usr/$(get_libdir)/libssl.so.0.9.7
+	# avoid collisions with openssl-1 (preserve lib)
+	if ! has_version dev-libs/openssl:${SLOT} ; then
+		ewarn "Removing lib{crypto,ssl}.so.0.9.7 to avoid collision with openssl-1"
+		rm -f "${ROOT}"/usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.7
+	fi
 }
 
+
 src_unpack() {
 	unpack ${A}
+
 	cd "${S}"
 
+	epatch "${FILESDIR}"/${PN}-0.9.7g-ppc64.patch
 	epatch "${FILESDIR}"/${PN}-0.9.7e-gentoo.patch
-	epatch "${FILESDIR}"/${PN}-0.9.8e-bsd-sparc64.patch
-	epatch "${FILESDIR}"/${PN}-0.9.8h-ldflags.patch #181438
-	epatch "${FILESDIR}"/${PN}-0.9.8m-binutils.patch #289130
-	epatch "${FILESDIR}"/${PN}-1.0.0a-fix-double-free.patch #332027
-
-	# disable fips in the build
-	# make sure the man pages are suffixed #302165
-	# don't bother building man pages if they're disabled
-	sed -i \
-		-e '/DIRS/s: fips : :g' \
-		-e '/^MANSUFFIX/s:=.*:=ssl:' \
-		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-		-e $(has noman FEATURES \
-			&& echo '/^install:/s:install_docs::' \
-			|| echo '/^MANDIR=/s:=.*:=/usr/share/man:') \
-		Makefile{,.org} \
-		|| die
-	# show the actual commands in the log
-	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
+	epatch "${FILESDIR}"/${PN}-0.9.7-hppa-fix-detection.patch
+	epatch "${FILESDIR}"/${PN}-0.9.7-alpha-default-gcc.patch
+	epatch "${FILESDIR}"/${PN}-0.9.7g-mem-clr-ptr-cast.patch
+	epatch "${FILESDIR}"/${PN}-0.9.7h-ABI-compat.patch
+	epatch "${FILESDIR}"/${PN}-0.9.7g-superh.patch
+	epatch "${FILESDIR}"/${PN}-0.9.7i-m68k.patch
+	epatch "${FILESDIR}"/${PN}-0.9.7g-amd64-fbsd.patch
+	epatch "${FILESDIR}"/${PN}-0.9.7j-doc-updates.patch
 
 	# allow openssl to be cross-compiled
-	cp "${FILESDIR}"/gentoo.config-0.9.7 gentoo.config || die "cp cross-compile failed"
+	cp "${FILESDIR}"/gentoo.config-0.9.7g gentoo.config || die "cp cross-compile failed"
 	chmod a+rx gentoo.config
 
-	append-flags -fno-strict-aliasing
+	# Don't build manpages if we don't want them
+	has noman FEATURES && sed -i '/^install:/s:install_docs::' Makefile.org
+
+	case $(gcc-version) in
+		3.2)
+			filter-flags -fprefetch-loop-arrays -freduce-all-givs -funroll-loop
+		;;
+		3.4 | 3.3 )
+			filter-flags -fprefetch-loop-arrays -freduce-all-givs -funroll-loops
+			[[ ${ARCH} == "ppc" ||  ${ARCH} == "ppc64" ]] && append-flags -fno-strict-aliasing
+		;;
+	esac
 	append-flags -Wa,--noexecstack
 
-	sed -i '1s,^:$,#!/usr/bin/perl,' Configure #141906
-	sed -i '/^"debug-steve/d' Configure # 0.9.7k shipped broken
-	./config --test-sanity || die "I AM NOT SANE"
+	# replace CFLAGS
+	OLDIFS=$IFS
+	IFS=$'\n'
+	for a in $( grep -n -e "^\"linux-" Configure ); do
+		LINE=$( echo $a | awk -F: '{print $1}' )
+		CUR_CFLAGS=$( echo $a | awk -F: '{print $3}' )
+		NEW_CFLAGS=$(echo $CUR_CFLAGS | LC_ALL=C sed -r -e "s|-O[23]||" -e \
+		"s:-fomit-frame-pointer::" -e "s:-mcpu=[-a-z0-9]+::" -e "s:-m486::" \
+		-e "s:-mv8::")
+		# ppc64's current toolchain sucks at optimization and will break this package
+		[[ $(tc-arch) != "ppc64" ]] && NEW_CFLAGS="${NEW_CFLAGS} ${CFLAGS}"
+
+		sed -i "${LINE}s:$CUR_CFLAGS:$NEW_CFLAGS:" Configure || die "sed failed"
+	done
+	IFS=$OLDIFS
+
+	if [ "$(get_libdir)" != "lib" ] ; then
+		# using a library directory other than lib requires some magic
+		sed -i \
+			-e "s+\(\$(INSTALL_PREFIX)\$(INSTALLTOP)\)/lib+\1/$(get_libdir)+g" \
+			-e "s+libdir=\$\${exec_prefix}/lib+libdir=\$\${exec_prefix}/$(get_libdir)+g" \
+			Makefile.org \
+			|| die "sed failed"
+		./config --test-sanity || die "sanity failed"
+	fi
 }
 
 src_compile() {
-	unset APPS #197996
-	unset SCRIPTS #312551
+	# Clean out patent-or-otherwise-encumbered code.
+	# RC5:   5,724,428 03/03/2015
+	# EC:    ????????? ??/??/2015
+	local confopts=""
+	use bindist && confopts="no-rc5 no-ec"
 
-	tc-export CC AR RANLIB
-
-	# Clean out patent-or-otherwise-encumbered code
-	# Camellia: Royalty Free            http://en.wikipedia.org/wiki/Camellia_(cipher)
-	# IDEA:     5,214,703 25/05/2010    http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
-	# EC:       ????????? ??/??/2015    http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
-	# MDC2:     Expired                 http://en.wikipedia.org/wiki/MDC-2
-	# RC5:      5,724,428 03/03/2015    http://en.wikipedia.org/wiki/RC5
-
-	use_ssl() { use $1 && echo "enable-${2:-$1} ${*:3}" || echo "no-${2:-$1}" ; }
-	echoit() { echo "$@" ; "$@" ; }
-
-	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+	use zlib && confopts="${confopts} zlib-dynamic"
 
 	local sslout=$(./gentoo.config)
-	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	einfo "Use configuration ${sslout}"
+
 	local config="Configure"
 	[[ -z ${sslout} ]] && config="config"
-	echoit \
 	./${config} \
 		${sslout} \
-		$(use sse2 || echo "no-sse2") \
-		enable-camellia \
-		$(use_ssl !bindist ec) \
-		$(use_ssl !bindist idea) \
-		enable-mdc2 \
-		$(use_ssl !bindist rc5) \
-		enable-tlsext \
-		$(use_ssl gmp gmp -lgmp) \
-		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
-		$(use_ssl zlib) \
+		${confopts} \
 		--prefix=/usr \
 		--openssldir=/etc/ssl \
 		shared threads \
 		|| die "Configure failed"
 
-	# Clean out hardcoded flags that openssl uses
-	local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
-		-e 's:^CFLAG=::' \
-		-e 's:-fomit-frame-pointer ::g' \
-		-e 's:-O[0-9] ::g' \
-		-e 's:-march=[-a-z0-9]* ::g' \
-		-e 's:-mcpu=[-a-z0-9]* ::g' \
-		-e 's:-m[a-z0-9]* ::g' \
-	)
-	sed -i \
-		-e "/^LIBDIR=/s:=.*:=$(get_libdir):" \
-		-e "/^CFLAG/s:=.*:=${CFLAG} ${CFLAGS}:" \
-		-e "/^SHARED_LDFLAGS=/s:$: ${LDFLAGS}:" \
-		Makefile || die
-
-	# depend is needed to use $confopts
-	emake -j1 depend || die "depend failed"
-	emake -j1 build_libs || die "make build_libs failed"
+	emake \
+		CC="$(tc-getCC)" MAKEDEPPROG="$(tc-getCC)" \
+		AR="$(tc-getAR) r" \
+		RANLIB="$(tc-getRANLIB)" \
+		all || die "make all failed"
 }
 
 src_test() {
-	emake -j1 test || die "make test failed"
+	# make sure sandbox doesnt die on *BSD
+	addpredict /dev/crypto
+
+	make test || die "make test failed"
 }
 
 src_install() {
-	dolib.so lib{crypto,ssl}.so.0.9.7 || die
+        dolib.so lib{crypto,ssl}.so.0.9.7 || die
 }
+
diff --git a/profiles/package.mask b/profiles/package.mask
index e87fd5f..0bc309c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -6,17 +6,4 @@
 # NOTE: Please add your entry at the top!
 #
 
-=app-emulation/vmware-player-1.0.9.1*
-=app-emulation/vmware-player-2.5.1.1*
-=app-emulation/vmware-player-2.5.2.1*
-
-=app-emulation/vmware-server-1.0.8.1*
-=app-emulation/vmware-server-1.0.9.1*
-=app-emulation/vmware-server-2.0.1.1*
-
-=app-emulation/vmware-server-console-1.0.8.1*
-=app-emulation/vmware-server-console-1.0.9.1*
-
-=app-emulation/vmware-workstation-5.5.9.1*
-=app-emulation/vmware-workstation-6.5.1.1*
-=app-emulation/vmware-workstation-6.5.2.1*
+# >=app-emulation/vmware-server-console-1.0.10.203137-r50
\ No newline at end of file
diff --git a/x11-libs/libsexy/ChangeLog b/x11-libs/libsexy/ChangeLog
new file mode 100644
index 0000000..a85d47c
--- /dev/null
+++ b/x11-libs/libsexy/ChangeLog
@@ -0,0 +1,177 @@
+# ChangeLog for x11-libs/libsexy
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libsexy/ChangeLog,v 1.48 2010/05/20 01:53:20 jer Exp $
+
+  20 May 2010; Jeroen Roovers <jer@gentoo.org> libsexy-0.1.11-r1.ebuild:
+  Stable for HPPA (bug #305521).
+
+  18 May 2010; Samuli Suominen <ssuominen@gentoo.org>
+  libsexy-0.1.11-r1.ebuild:
+  amd64 stable wrt #305521
+
+  24 Mar 2010; Brent Baude <ranger@gentoo.org> libsexy-0.1.11-r1.ebuild:
+  stable ppc, bug 305521
+
+  16 Mar 2010; Raúl Porcel <armin76@gentoo.org> libsexy-0.1.11-r1.ebuild:
+  alpha/arm/ia64/sh/sparc stable wrt #305521
+
+  04 Mar 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  libsexy-0.1.11-r1.ebuild:
+  x86 stable wrt bug #305521
+
+  01 Mar 2010; Brent Baude <ranger@gentoo.org> libsexy-0.1.11-r1.ebuild:
+  Marking libsexy-0.1.11-r1 ppc64 for bug 305521
+
+*libsexy-0.1.11-r2 (25 Feb 2010)
+
+  25 Feb 2010; Fabian Groffen <grobian@gentoo.org>
+  +libsexy-0.1.11-r2.ebuild:
+  Revbump for EAPI-3 bump, necessary for fixing bug #306357, fix out of
+  Prefix installation
+
+  17 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
+  libsexy-0.1.11-r1.ebuild:
+  Fix license from LGPL-2 to LGPL-2.1. Don't build tests without make check
+  wrt #226253. Fix HTML installation directory. Stop using gnome2.eclass.
+
+  15 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
+  libsexy-0.1.11-r1.ebuild:
+  Transfer Prefix keywords
+
+  31 May 2009; Serkan Kaba <serkan@gentoo.org> libsexy-0.1.11-r1.ebuild:
+  Add missing eutils inherit for epatch.
+
+*libsexy-0.1.11-r1 (31 May 2009)
+
+  31 May 2009; Serkan Kaba <serkan@gentoo.org> +libsexy-0.1.11-r1.ebuild,
+  +files/libsexy-0.1.11-fix-null-list.patch:
+  Revbump to fix critical error. Closes bug #270179
+
+  15 Jan 2009; Peter Alfredsen <loki_val@gentoo.org> metadata.xml:
+  Compnerd retired.
+
+  13 Jan 2009; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
+  gentopia is becoming freedesktop
+
+  11 Oct 2008; Gilles Dartiguelongue <eva@gentoo.org> libsexy-0.1.11.ebuild:
+  perl is not a RDEPEND and is an optional DEPEND.
+
+  14 Dec 2007; Saleem Abdulrasool <compnerd@gentoo.org>
+  -libsexy-0.1.10.ebuild:
+  prune unused versions
+
+  20 Oct 2007; Raúl Porcel <armin76@gentoo.org> libsexy-0.1.11.ebuild:
+  alpha/ia64/sparc stable wrt #195821
+
+  19 Oct 2007; nixnut <nixnut@gentoo.org> libsexy-0.1.11.ebuild:
+  Stable on ppc wrt bug 195821
+
+  19 Oct 2007; Christoph Mende <angelos@gentoo.org> libsexy-0.1.11.ebuild:
+  Stable on amd64 wrt bug #195821
+
+  18 Oct 2007; Markus Rothe <corsair@gentoo.org> libsexy-0.1.11.ebuild:
+  Stable on ppc64; bug #195821
+
+  18 Oct 2007; Jeroen Roovers <jer@gentoo.org> libsexy-0.1.11.ebuild:
+  Stable for HPPA (bug #195821).
+
+  18 Oct 2007; Christian Faulhammer <opfer@gentoo.org>
+  libsexy-0.1.11.ebuild:
+  stable x86, bug 195821
+
+  10 May 2007; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
+  Fix metadata
+
+  04 Apr 2007; Saleem Abdulrasool <compnerd@gentoo.org>
+  -libsexy-0.1.4.ebuild, -libsexy-0.1.5.ebuild, -libsexy-0.1.8.ebuild:
+  Prune unused versions
+
+*libsexy-0.1.11 (04 Apr 2007)
+
+  04 Apr 2007; Saleem Abdulrasool <compnerd@gentoo.org>
+  +libsexy-0.1.11.ebuild:
+  Version bump from upstream
+
+  21 Jan 2007; Bryan Østergaard <kloeri@gentoo.org> libsexy-0.1.10.ebuild:
+  Stable on IA64, bug 156662.
+
+  16 Jan 2007; Roy Marples <uberlord@gentoo.org> libsexy-0.1.10.ebuild:
+  Added ~x86-fbsd keyword.
+
+  15 Jan 2007; Luis Medinas <metalgod@gentoo.org> libsexy-0.1.10.ebuild:
+  Stable on amd64. Bug #157909.
+
+  30 Dec 2006; Bryan Østergaard <kloeri@gentoo.org> libsexy-0.1.10.ebuild:
+  Stable on Alpha, bug 157909.
+
+  22 Dec 2006; Tobias Scherbaum <dertobi123@gentoo.org>
+  libsexy-0.1.10.ebuild:
+  Stable on ppc wrt bug #157909.
+
+  20 Dec 2006; Brent Baude <ranger@gentoo.org> libsexy-0.1.10.ebuild:
+  marking libsexy-0.1.10 ppc64 stable for bug#157909
+
+  19 Dec 2006; Christian Faulhammer <opfer@gentoo.org>
+  libsexy-0.1.10.ebuild:
+  stable x86, bug #157909
+
+  18 Dec 2006; Gustavo Zacarias <gustavoz@gentoo.org> libsexy-0.1.10.ebuild:
+  Stable on sparc wrt #157909
+
+  05 Dec 2006; Jeroen Roovers <jer@gentoo.org> libsexy-0.1.10.ebuild:
+  Stable for HPPA.
+
+  30 Oct 2006; Jeroen Roovers <jer@gentoo.org> libsexy-0.1.10.ebuild:
+  Marked ~hppa (bug #153433).
+
+  16 Oct 2006; Tiziano Müller <dev-zero@gentoo.org> ChangeLog:
+  Re-added 'doc' USE-flag for dependency. License fix.
+
+  16 Oct 2006; Tiziano Müller <dev-zero@gentoo.org> ChangeLog:
+  Version bump, see bug #146302. Useless 'doc' USE-flag removed.
+
+  03 Oct 2006; Aron Griffis <agriffis@gentoo.org> libsexy-0.1.5.ebuild:
+  Mark 0.1.5 ~ia64
+
+  17 Aug 2006; Markus Rothe <corsair@gentoo.org> libsexy-0.1.8.ebuild:
+  Stable on ppc64
+
+  16 Jul 2006; Joshua Jackson <tsunam@gentoo.org> libsexy-0.1.8.ebuild:
+  Stable x86 for notification-daemon
+
+  12 Jul 2006; Gustavo Zacarias <gustavoz@gentoo.org> libsexy-0.1.8.ebuild:
+  Stable on sparc
+
+  10 Jul 2006; Thomas Cort <tcort@gentoo.org> libsexy-0.1.8.ebuild:
+  Added ~alpha keyword.
+
+  06 Jul 2006; Luca Barbato <lu_zero@gentoo.org> libsexy-0.1.8.ebuild:
+  Marked ppc
+
+  30 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org> libsexy-0.1.8.ebuild:
+  Stable on amd64.
+
+  27 Jun 2006; Markus Rothe <corsair@gentoo.org> libsexy-0.1.8.ebuild:
+  Added ~ppc64
+
+  19 Apr 2006; Gustavo Zacarias <gustavoz@gentoo.org> libsexy-0.1.8.ebuild:
+  Keyworded ~sparc wrt #130313
+
+*libsexy-0.1.8 (20 Mar 2006)
+
+  20 Mar 2006; Saleem Abdulrasool <compnerd@gentoo.org>
+  +libsexy-0.1.8.ebuild:
+  Version bump from upstream
+
+*libsexy-0.1.5 (04 Feb 2006)
+
+  04 Feb 2006; Saleem Abdulrasool <compnerd@gentoo.org>
+  +libsexy-0.1.5.ebuild:
+  Version bump (bug #119972)
+
+*libsexy-0.1.4 (23 Dec 2005)
+
+  23 Dec 2005; Saleem Abdulrasool <compnerd@gentoo.org> +metadata.xml,
+  +libsexy-0.1.4.ebuild:
+  Initial import of libsexy
+
diff --git a/x11-libs/libsexy/Manifest b/x11-libs/libsexy/Manifest
new file mode 100644
index 0000000..c8eda0c
--- /dev/null
+++ b/x11-libs/libsexy/Manifest
@@ -0,0 +1,4 @@
+DIST libsexy-0.1.6.tar.gz 367679 RMD160 8e54329908e943a68d12d6d1593afe4b563d7e55 SHA1 c6a42125014b1f6d8f59777cefedc028583de7be SHA256 835265bb0d39689e8a8580b5ffb53222b3f5f483d58aa533a5c7ebfc3d273d50
+EBUILD libsexy-0.1.6.ebuild 1072 RMD160 913e191f06fe4480a8a36df6387c4e77eaeb8eff SHA1 23fe5ede2e0ac1523881e9ffa237ec7ca9cbd20d SHA256 bc80ac69c3548737f511807a98211f51401f3e416a64b3421e578b6432ec7905
+MISC ChangeLog 5790 RMD160 3e9c31190ac181db5695a447d4c54aecec1181a7 SHA1 d10ca4c8ab5ddf287e31ad9ecc8d7ba09662ea46 SHA256 88ec92896365e54899e3d6580be5f80b151227de9e8457304d2fb8f7dcb03df5
+MISC metadata.xml 166 RMD160 5c642d8e45b484a15923871de6184d2576580cf8 SHA1 e829c9c3f6115637652b2124e34eb131fcdbcbb5 SHA256 9dd5c26b126ce4ce0fa6fd94105810917c675ee9ff30ffa63100e049ac66da04
diff --git a/x11-libs/libsexy/libsexy-0.1.6.ebuild b/x11-libs/libsexy/libsexy-0.1.6.ebuild
new file mode 100644
index 0000000..59d2363
--- /dev/null
+++ b/x11-libs/libsexy/libsexy-0.1.6.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libsexy/libsexy-0.1.11-r2.ebuild,v 1.1 2010/02/25 20:50:54 grobian Exp $
+
+EAPI=3
+inherit autotools eutils
+
+DESCRIPTION="Sexy GTK+ Widgets"
+HOMEPAGE="http://www.chipx86.com/wiki/Libsexy"
+SRC_URI="http://releases.chipx86.com/${PN}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="doc"
+
+RDEPEND=">=dev-libs/glib-2.6:2
+	>=x11-libs/gtk+-2.6:2
+	dev-libs/libxml2
+	>=x11-libs/pango-1.4.0
+	>=app-text/iso-codes-0.49"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5
+	>=dev-util/pkgconfig-0.19
+	dev-util/gtk-doc-am
+	doc? ( >=dev-util/gtk-doc-1.4 )"
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable doc gtk-doc) \
+		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	dolib.so libsexy/.libs/libsexy.so.*
+	dodoc AUTHORS ChangeLog NEWS
+}
diff --git a/x11-libs/libsexy/metadata.xml b/x11-libs/libsexy/metadata.xml
new file mode 100644
index 0000000..63700da
--- /dev/null
+++ b/x11-libs/libsexy/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>freedesktop</herd>
+</pkgmetadata>
+