diff --git a/app-emulation/vmware-server/ChangeLog b/app-emulation/vmware-server/ChangeLog
index 3f4b4fb..e302887 100644
--- a/app-emulation/vmware-server/ChangeLog
+++ b/app-emulation/vmware-server/ChangeLog
@@ -1,28 +1,358 @@
 # ChangeLog for app-emulation/vmware-server
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server/ChangeLog,v 1.61 2009/12/18 16:14:42 vadimk Exp $
 
-*vmware-server-1.0.9_p156507 (30 May 2009)
+  24 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
+  +vmware-server-1.0.8.126538.ebuild,
+  +files/2.0.1.156745/000_all_initd-location.patch,
+  +files/2.0.1.156745/002_all_pagebreak-detection-fix.patch,
+  +files/2.0.2.203138, +vmware-server-1.0.9.156507.ebuild,
+  +files/2.0.1.156745/001_all_fix-permissions.patch,
+  +files/2.0.1.156745/004_all_do-not-build-modules.patch,
+  +files/2.0.2.203138/000_all_initd-location.patch,
+  +vmware-server-1.0.10.203137.ebuild,
+  +files/2.0.1.156745/007_all_use-modprobe-over-insmod.patch,
+  +files/2.0.1.156745/009_all_init.d-modules-warning.patch,
+  +files/2.0.1.156745/011_all_legit-modules-only.patch,
+  +files/2.0.2.203138/001_all_fix-permissions.patch,
+  files/vmware-server-2.rc, +files/2.0.1.156745,
+  +files/2.0.1.156745/012_all_rc-config.patch,
+  +files/2.0.2.203138/002_all_pagebreak-detection-fix.patch,
+  +files/2.0.2.203138/004_all_do-not-build-modules.patch,
+  +files/2.0.2.203138/007_all_use-modprobe-over-insmod.patch,
+  +files/2.0.2.203138/011_all_legit-modules-only.patch,
+  +files/2.0.2.203138/012_all_rc-config.patch,
+  -vmware-server-1.0.9_p156507.ebuild,
+  +files/2.0.2.203138/009_all_init.d-modules-warning.patch, +files/general,
+  +files/general/001_all_no-desktop-icon.patch,
+  +files/general/002_all_allow-write-access-to-config.patch,
+  +files/general/004_all_do-not-build-modules.patch,
+  +files/general/005_all_do-not-overwrite-authd-file.patch,
+  +files/general/008_all_dhcpd-conf-location.patch,
+  +vmware-server-2.0.2.203138.ebuild,
+  +files/general/006_all_xinetd-sendsig-if-possible.patch,
+  +files/general/007_all_use-modprobe-over-insmod.patch,
+  +files/general/009_all_init.d-modules-warning.patch, metadata.xml:
+  depend on my kernel modules
 
-  30 May 2009; Mario Fetka <mario.fetka@gmail.com>
-  +vmware-server-1.0.9_p156507.ebuild,
-  -vmware-server-1.0.9_p156507-r1.ebuild:
-  cleanup ebuild header
+*vmware-server-1.0.10.203137 (18 Dec 2009)
 
-*vmware-server-1.0.9_p156507-r1 (30 May 2009)
+  18 Dec 2009; Vadim Kuznetsov <vadimk@gentoo.org>
+  +vmware-server-1.0.10.203137.ebuild:
+  Bug 297367
 
-  30 May 2009; Mario Fetka <mario.fetka@gmail.com>
-  +files/vmware-server-2.rc, +files/90vmware-server,
-  +vmware-server-1.0.9_p156507-r1.ebuild, +files/authorization.xml,
-  +files/vmware-authd, +files/vmware-server.rc, +files/vmware-server.xml,
-  +metadata.xml:
-  initial checkin based on new eclass
+*vmware-server-2.0.2.203138 (29 Oct 2009)
 
-  26 Jan 2009; Mike Auty <ikelos@gentoo.org> files/vmware-server-2.rc,
-  vmware-server-2.0.0.122956.ebuild:
-  Remove xinetd requirements and add in a dependency on hal.
+  29 Oct 2009; Vadim Kuznetsov vadimk@gentoo.org
+  +files/2.0.2.203138/000_all_initd-location.patch,
+  +files/2.0.2.203138/001_all_fix-permissions.patch,
+  +files/2.0.2.203138/002_all_pagebreak-detection-fix.patch,
+  +files/2.0.2.203138/004_all_do-not-build-modules.patch,
+  +files/2.0.2.203138/007_all_use-modprobe-over-insmod.patch,
+  +files/2.0.2.203138/009_all_init.d-modules-warning.patch,
+  +files/2.0.2.203138/011_all_legit-modules-only.patch,
+  -vmware-server-2.0.1.156745.ebuild, -vmware-server-2.0.1.156745-r1.ebuild,
+  +vmware-server-2.0.2.203138.ebuild,
+  +files/2.0.2.203138/012_all_rc-config.patch,
+  -vmware-server-2.0.1.156745-r2.ebuild:
+  version bump. Bug 290702
 
-  15 Jan 2009; Mike Auty <ikelos@gentoo.org>
+*vmware-server-2.0.1.156745-r3 (22 Sep 2009)
+
+  22 Sep 2009; Vadim Kuznetsov vadimk@gentoo.org
+  +vmware-server-2.0.1.156745-r3.ebuild:
+  Bug 282213.
+
+  01 Aug 2009; Markus Meier <maekke@gentoo.org>
+  vmware-server-1.0.9.156507.ebuild:
+  amd64 stable, bug #265139
+
+  08 Jul 2009; Vadim Kuznetsov vadimk@gentoo.org
+  vmware-server-2.0.1.156745-r2.ebuild:
+  pkg_prerm is added for safe unmerge. init script is loading vmci module.
+
+*vmware-server-2.0.1.156745-r2 (06 Jul 2009)
+
+  06 Jul 2009; Vadim Kuznetsov vadimk@gentoo.org
+  +files/2.0.1.156745/012_all_rc-config.patch,
+  +vmware-server-2.0.1.156745-r2.ebuild, metadata.xml:
+  New streamlined ebuild without vmware eclass and with some improvements:
+  rc-config, pam, vix. Fixes bug 263560
+
+  25 Jun 2009; Christian Faulhammer <fauli@gentoo.org>
+  vmware-server-1.0.9.156507.ebuild:
+  stable x86, security bug 265139
+
+*vmware-server-2.0.1.156745-r1 (14 Jun 2009)
+
+  14 Jun 2009; Vadim Kuznetsov vadimk@gentoo.org
+  +vmware-server-2.0.1.156745-r1.ebuild, metadata.xml:
+  Bug 273750.
+
+  09 Jun 2009; Vadim Kuznetsov vadimk@gentoo.org
+  vmware-server-2.0.1.156745.ebuild, metadata.xml:
+  Bug 271245. No more /sbin/lsmod link after module-init-tools version bump.
+
+*vmware-server-2.0.1.156745 (09 May 2009)
+*vmware-server-1.0.9.156507 (09 May 2009)
+
+  09 May 2009; Mike Auty <ikelos@gentoo.org> +files/vmware-server-2.rc,
+  +files/2.0.1.156745/000_all_initd-location.patch,
+  +files/2.0.1.156745/001_all_fix-permissions.patch,
+  +files/2.0.1.156745/002_all_pagebreak-detection-fix.patch,
+  +files/2.0.1.156745/004_all_do-not-build-modules.patch,
+  +files/2.0.1.156745/007_all_use-modprobe-over-insmod.patch,
+  +vmware-server-2.0.1.156745.ebuild,
+  +files/2.0.1.156745/009_all_init.d-modules-warning.patch,
+  +files/2.0.1.156745/011_all_legit-modules-only.patch,
+  +vmware-server-1.0.9.156507.ebuild, +files/authorization.xml:
+  Bump vmware-server and add in version 2.
+
+  22 Feb 2009; Mike Auty <ikelos@gentoo.org>
+  -vmware-server-1.0.5.80187.ebuild, -vmware-server-1.0.6.91891.ebuild,
+  -vmware-server-1.0.7.108231.ebuild:
+  Clear out old insecure versions of vmware-server (bug 245941).
+
+  12 Jan 2009; Markus Meier <maekke@gentoo.org>
   vmware-server-1.0.8.126538.ebuild:
-  Stabilize vmware-server to match the main tree.
+  amd64/x86 stable, bug #245941
+
+  11 Jan 2009; Markus Meier <maekke@gentoo.org>
+  vmware-server-1.0.7.108231.ebuild:
+  amd64/x86 stable, bug #236167
+
+  04 Jan 2009; Ulrich Mueller <ulm@gentoo.org>
+  vmware-server-1.0.5.80187.ebuild, vmware-server-1.0.6.91891.ebuild,
+  vmware-server-1.0.7.108231.ebuild, vmware-server-1.0.8.126538.ebuild:
+  Change virtual/xft dependency to x11-libs/libXft, bug 253771.
+
+*vmware-server-1.0.8.126538 (09 Nov 2008)
+
+  09 Nov 2008; Mike Auty <ikelos@gentoo.org>
+  +vmware-server-1.0.8.126538.ebuild:
+  Add in vmware-server-1.0.8 for bug 245941.
+
+*vmware-server-1.0.7.108231 (30 Sep 2008)
+
+  30 Sep 2008; Mike Auty <ikelos@gentoo.org>
+  +vmware-server-1.0.7.108231.ebuild:
+  Bump vmware-server to 1.0.7.
+
+  03 Jul 2008; Christian Faulhammer <opfer@gentoo.org>
+  vmware-server-1.0.6.91891.ebuild:
+  stable x86, security bug 224637
+
+  17 Jun 2008; Richard Freeman <rich0@gentoo.org>
+  vmware-server-1.0.6.91891.ebuild:
+  amd64 stable - 224637
+
+  16 Jun 2008; Christian Faulhammer <opfer@gentoo.org> ChangeLog:
+  app-emulation/vmware-workstation-5.5.7.91707 stable, bug #x86
+
+*vmware-server-1.0.6.91891 (14 Jun 2008)
+
+  14 Jun 2008; Mike Auty <ikelos@gentoo.org> -vmware-server-1.0.4.56528.ebuild,
+  +vmware-server-1.0.6.91891.ebuild:
+  Version bump for bug 224637. Also clear out old version.
+
+  07 May 2008; Christian Faulhammer <opfer@gentoo.org> ChangeLog:
+  stable x86, bug 213548
+
+  26 Apr 2008; Mike Auty <ikelos@gentoo.org> Manifest:
+  Removing old masked vmware-server ebuild.
+
+  04 Apr 2008; Christian Faulhammer <opfer@gentoo.org>
+  vmware-server-1.0.5.80187.ebuild:
+  stable x86, bug 215034
+
+  29 Mar 2008; Richard Freeman <rich0@gentoo.org>
+  vmware-server-1.0.5.80187.ebuild:
+  amd64 stable - 215034
+
+*vmware-server-1.0.5.80187 (22 Mar 2008)
+
+  22 Mar 2008; Mike Auty <ikelos@gentoo.org>
+  +vmware-server-1.0.5.80187.ebuild:
+  Version bump, to fix bug 213548.
+
+  26 Feb 2008; Richard Freeman <rich0@gentoo.org>
+  vmware-server-1.0.4.56528.ebuild:
+  amd64 stable - 211016
+
+  22 Feb 2008; Christian Faulhammer <opfer@gentoo.org>
+  vmware-server-1.0.4.56528.ebuild:
+  stable x86, bug 211016
+
+  31 Jan 2008; Mike Auty <ikelos@gentoo.org> ChangeLog:
+  Re-sign digestless manifest.
+
+  26 Jan 2008; Mike Auty <ikelos@gentoo.org>
+  vmware-server-1.0.3.44356.ebuild, vmware-server-1.0.4.56528.ebuild:
+  Remove the need for redigesting after any-any-updates.
+
+  26 Jan 2008; Mike Auty <ikelos@gentoo.org>
+  files/digest-vmware-server-1.0.3.44356,
+  files/digest-vmware-server-1.0.4.56528, Manifest:
+  Redigest for any-any-update115.
+
+  25 Nov 2007; Mike Auty <ikelos@gentoo.org>
+  files/digest-vmware-server-1.0.3.44356,
+  files/digest-vmware-server-1.0.4.56528, Manifest:
+  Update to vmware-any-any-update114.
+
+  15 Oct 2007; Chris Gianelloni <wolf31o2@gentoo.org>
+  vmware-server-1.0.3.44356.ebuild, vmware-server-1.0.4.56528.ebuild:
+  Typo fix in amd64 check. Thanks to Daniel Robbins <drobbins@funtoo.org> for
+  pointing it out.
+
+*vmware-server-1.0.4.56528 (20 Sep 2007)
+
+  20 Sep 2007; Mike Auty <ikelos@gentoo.org> files/vmware-server.rc,
+  +vmware-server-1.0.4.56528.ebuild:
+  Version bump for security issues (bug 193196).
+
+  16 Sep 2007; Mike Auty <ikelos@gentoo.org> files/vmware-authd,
+  files/vmware-server.rc, vmware-server-1.0.3.44356.ebuild:
+  Fix up PAM issues on amd64, add vmware-modules blockers and fix init script
+  for baselayout-2 and dash.
+
+  28 Jul 2007; Mike Auty <ikelos@gentoo.org>
+  files/digest-vmware-server-1.0.3.44356, Manifest:
+  Redigest for vmware-any-any-update112.
+
+  13 Jul 2007; Chris Gianelloni <wolf31o2@gentoo.org>
+  vmware-server-1.0.3.44356.ebuild:
+  Added another mirror for the vmware-any-any-update patchset.
+
+  02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org>
+  vmware-server-1.0.3.44356.ebuild:
+  (QA) RESTRICT clean up.
+
+*vmware-server-1.0.3.44356 (07 May 2007)
+
+  07 May 2007; Mike Auty <ikelos@gentoo.org>
+  -vmware-server-1.0.1.29996-r5.ebuild, -vmware-server-1.0.2.39867.ebuild,
+  +vmware-server-1.0.3.44356.ebuild:
+  Version bump to 1.0.3, security/maintenance release so removing old versions.
+
+  28 Apr 2007; Mike Auty <ikelos@gentoo.org> files/vmware-server.rc:
+  Redigest for vmware-any-any109, and fix rc file for baselayout-2.
+
+  09 Apr 2007; Mike Auty <ikelos@gentoo.org> files/vmware-server.rc:
+  Fix vmware-server.rc for bug 173752.
+
+  07 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org>
+  files/vmware-server.rc:
+  Change all instances of [ to [[.
+
+*vmware-server-1.0.2.39867 (04 Mar 2007)
+
+  04 Mar 2007; Mike Auty <ikelos@gentoo.org>
+  -vmware-server-1.0.1.29996-r4.ebuild, +vmware-server-1.0.2.39867.ebuild:
+  Version bump.
+
+  05 Feb 2007; Mike Auty <ikelos@gentoo.org>
+  files/digest-vmware-server-1.0.1.29996-r4,
+  files/digest-vmware-server-1.0.1.29996-r5, Manifest:
+  Vmware-any-any bump to support 2.6.20.
+
+  09 Jan 2007; Chris Gianelloni <wolf31o2@gentoo.org>
+  vmware-server-1.0.1.29996-r5.ebuild:
+  Cleaning up after Piotr Jaroszyński <peper@gentoo.org> and making sure we
+  have the right minimum version of baselibs for the new revision.
+
+*vmware-server-1.0.1.29996-r5 (09 Jan 2007)
+
+  09 Jan 2007; Piotr Jaroszyński <peper@gentoo.org>
+  +vmware-server-1.0.1.29996-r5.ebuild:
+  Fix to work with new emul-linux-* packages, bug #160929.
+
+  05 Jan 2007; Mike Auty <ikelos@gentoo.org>
+  files/general/007_all_use-modprobe-over-insmod.patch,
+  vmware-server-1.0.1.29996-r4.ebuild:
+  Fixing einfo/elog statements, and removing force flag from modprobe patch.
+
+  14 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  vmware-server-1.0.1.29996-r4.ebuild:
+  Fixed typo for bug #158134.
+
+  01 Dec 2006; Mike Auty <ikelos@gentoo.org>
+  files/digest-vmware-server-1.0.1.29996-r4, Manifest:
+  Redigest for vmware-any-any105.
+
+  30 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  vmware-server-1.0.1.29996-r4.ebuild:
+  Removed dependencies on the old virtual/x11.
+
+*vmware-server-1.0.1.29996-r4 (04 Oct 2006)
+
+  04 Oct 2006; Mike Auty <ikelos@gentoo.org>
+  -vmware-server-1.0.1.29996-r3.ebuild,
+  +vmware-server-1.0.1.29996-r4.ebuild:
+  Final bump for openssl issues (hopefully).
+
+*vmware-server-1.0.1.29996-r3 (03 Oct 2006)
+
+  03 Oct 2006; Mike Auty <ikelos@gentoo.org>
+  -vmware-server-1.0.1.29996-r2.ebuild,
+  +vmware-server-1.0.1.29996-r3.ebuild:
+  Another version bump to try and finally fix the openssl problems.
+
+*vmware-server-1.0.1.29996-r2 (02 Oct 2006)
+
+  02 Oct 2006; Mike Auty <ikelos@gentoo.org>
+  -vmware-server-1.0.1.29996-r1.ebuild,
+  +vmware-server-1.0.1.29996-r2.ebuild:
+  Bump to fix openssl-0.9.7 issues.
+
+  30 Sep 2006; Mike Auty <ikelos@gentoo.org>
+  -files/digest-vmware-server-1.0.0.28343,
+  -files/digest-vmware-server-1.0.1.29996:
+  Cleaning up orphaned manifests.
+
+*vmware-server-1.0.1.29996-r1 (27 Sep 2006)
+
+  27 Sep 2006; Mike Auty <ikelos@gentoo.org>
+  -vmware-server-1.0.0.28343.ebuild, -vmware-server-1.0.1.29996.ebuild,
+  +vmware-server-1.0.1.29996-r1.ebuild:
+  Revision bump to force an upgrade due to bug
+
+  25 Aug 2006; Mike Auty <ikelos@gentoo.org>
+  files/digest-vmware-server-1.0.0.28343,
+  files/digest-vmware-server-1.0.1.29996, Manifest:
+  Redigested for vmware-any-any-update104.
+
+*vmware-server-1.0.1.29996 (19 Aug 2006)
+
+  19 Aug 2006; Mike Auty <ikelos@gentoo.org>
+  +vmware-server-1.0.1.29996.ebuild:
+  Version bump which fixes bug #144421, bug #141967 and bug #144166.
+
+  09 Aug 2006; Mike Auty <ikelos@gentoo.org>
+  vmware-server-1.0.0.28343.ebuild:
+  Alter ebuild so that the metadata cache is invalidated.
+
+  08 Aug 2006; Mike Auty <ikelos@gentoo.org>
+  files/digest-vmware-server-1.0.0.28343, Manifest:
+  New digests to work with vmware-any-any103, which fixes some problems with
+  the 2.6.18 kernel.
+
+  31 Jul 2006; Mike Auty <ikelos@gentoo.org>
+  vmware-server-1.0.0.28343.ebuild:
+  Alter the indentation and fix the modular X dependencies.
+
+*vmware-server-1.0.0.28343 (31 Jul 2006)
+
+  31 Jul 2006; Mike Auty <ikelos@gentoo.org> +files/90vmware-server,
+  +files/general/001_all_no-desktop-icon.patch,
+  +files/general/002_all_allow-write-access-to-config.patch,
+  +files/general/004_all_do-not-build-modules.patch,
+  +files/general/005_all_do-not-overwrite-authd-file.patch,
+  +files/general/006_all_xinetd-sendsig-if-possible.patch,
+  +files/general/007_all_use-modprobe-over-insmod.patch,
+  +files/general/008_all_dhcpd-conf-location.patch,
+  +files/general/009_all_init.d-modules-warning.patch, +files/vmware-authd,
+  +files/vmware-server.rc, +files/vmware-server.xml, +metadata.xml,
+  +vmware-server-1.0.0.28343.ebuild:
+  Initial commit of vmware-server.
 
diff --git a/app-emulation/vmware-server/Manifest b/app-emulation/vmware-server/Manifest
index 1c774f1..37c4fc0 100644
--- a/app-emulation/vmware-server/Manifest
+++ b/app-emulation/vmware-server/Manifest
@@ -1,16 +1,42 @@
+AUX 2.0.1.156745/000_all_initd-location.patch 1259 RMD160 edced247443fc535e5a6b98404153e970721e5aa SHA1 9a36424152bc38aba53c66cea983a41f0b23baff SHA256 5e163e7232a260ea6bff570180756807f9587ab5cf836c9c293d7162d788c062
+AUX 2.0.1.156745/001_all_fix-permissions.patch 702 RMD160 9d77ba6ff6cba0b9ee529777870470028c687f22 SHA1 863278b6cfadca04ae539bc858731658074ed01e SHA256 8f5fac381a2eda0f1da8a521fcb0ef17b139bf5b8b926425946534e802ce8307
+AUX 2.0.1.156745/002_all_pagebreak-detection-fix.patch 800 RMD160 f21a51e552d025a5120519d6dcd41efc3835a432 SHA1 06133c332b6b1f57476b1154de108a9dfc35435d SHA256 d327d7cb2166b9ef4c8c286568c3a7eb64542212164d58b8a7a3c5e51e19ed6d
+AUX 2.0.1.156745/004_all_do-not-build-modules.patch 553 RMD160 6dd19e4a7626f97354f4cb1725aeba306d72e113 SHA1 7b949213c10681026eb22fe6a6e96af482931e2c SHA256 39884f9af3d85883b06beb6678ad12e5fed32bded8a039b49c680336011425ec
+AUX 2.0.1.156745/007_all_use-modprobe-over-insmod.patch 343 RMD160 ef4007c98c8342e00fe8e04c76f08f0901a6539a SHA1 62d4a5ee744c36fa59b44e4382338760e67e88e1 SHA256 68cb51ad4ea3a24faa1101c3a72cd17f61fcdb901af5fa93a9eeaad5b6c9383d
+AUX 2.0.1.156745/009_all_init.d-modules-warning.patch 965 RMD160 3a98d59bb591aa6498a7dca9751f441b430c6288 SHA1 5b6b1c1330d1108bb769107c73fdc43c1fe46be5 SHA256 dbeb12905d75f06be519cc99e6e0c070b6e08e34cdb813c518b09a04b55876fb
+AUX 2.0.1.156745/011_all_legit-modules-only.patch 535 RMD160 de7fa6a29bf9f7e6670de53fd2dfdc842ec7a097 SHA1 9bd34078eeb012cec94eaac4ab9d899ad4244ca1 SHA256 ed15e9e237bf69dc5ef7803db53011d06b84525d5df6754afa54290d1677f794
+AUX 2.0.1.156745/012_all_rc-config.patch 867 RMD160 b88448d21d361468c2e30863abf2dfac3b71c10e SHA1 5cd66235af794a57e5d982ffb93122999666dbc0 SHA256 a1ef415a5d036efb5846d80a1b0475d56c2bc2f608a4099bd04a1445ace22761
+AUX 2.0.2.203138/000_all_initd-location.patch 1259 RMD160 edced247443fc535e5a6b98404153e970721e5aa SHA1 9a36424152bc38aba53c66cea983a41f0b23baff SHA256 5e163e7232a260ea6bff570180756807f9587ab5cf836c9c293d7162d788c062
+AUX 2.0.2.203138/001_all_fix-permissions.patch 702 RMD160 9d77ba6ff6cba0b9ee529777870470028c687f22 SHA1 863278b6cfadca04ae539bc858731658074ed01e SHA256 8f5fac381a2eda0f1da8a521fcb0ef17b139bf5b8b926425946534e802ce8307
+AUX 2.0.2.203138/002_all_pagebreak-detection-fix.patch 800 RMD160 f21a51e552d025a5120519d6dcd41efc3835a432 SHA1 06133c332b6b1f57476b1154de108a9dfc35435d SHA256 d327d7cb2166b9ef4c8c286568c3a7eb64542212164d58b8a7a3c5e51e19ed6d
+AUX 2.0.2.203138/004_all_do-not-build-modules.patch 553 RMD160 6dd19e4a7626f97354f4cb1725aeba306d72e113 SHA1 7b949213c10681026eb22fe6a6e96af482931e2c SHA256 39884f9af3d85883b06beb6678ad12e5fed32bded8a039b49c680336011425ec
+AUX 2.0.2.203138/007_all_use-modprobe-over-insmod.patch 343 RMD160 ef4007c98c8342e00fe8e04c76f08f0901a6539a SHA1 62d4a5ee744c36fa59b44e4382338760e67e88e1 SHA256 68cb51ad4ea3a24faa1101c3a72cd17f61fcdb901af5fa93a9eeaad5b6c9383d
+AUX 2.0.2.203138/009_all_init.d-modules-warning.patch 965 RMD160 3a98d59bb591aa6498a7dca9751f441b430c6288 SHA1 5b6b1c1330d1108bb769107c73fdc43c1fe46be5 SHA256 dbeb12905d75f06be519cc99e6e0c070b6e08e34cdb813c518b09a04b55876fb
+AUX 2.0.2.203138/011_all_legit-modules-only.patch 535 RMD160 de7fa6a29bf9f7e6670de53fd2dfdc842ec7a097 SHA1 9bd34078eeb012cec94eaac4ab9d899ad4244ca1 SHA256 ed15e9e237bf69dc5ef7803db53011d06b84525d5df6754afa54290d1677f794
+AUX 2.0.2.203138/012_all_rc-config.patch 867 RMD160 b88448d21d361468c2e30863abf2dfac3b71c10e SHA1 5cd66235af794a57e5d982ffb93122999666dbc0 SHA256 a1ef415a5d036efb5846d80a1b0475d56c2bc2f608a4099bd04a1445ace22761
 AUX 90vmware-server 91 RMD160 2a9e2e9d428a06ceac7faec500e6b1423da34b25 SHA1 e090847500dd99d161a46cd361ed2297b3d3ecae SHA256 3175cd9665850cf0d25a96849135c93ab129127370d55572f0137ba3d210e423
 AUX authorization.xml 332 RMD160 f31f4300342a9290634e20187351910d72e7c28d SHA1 28e2b07ed7225c83bef3172d23d4702fe92a3f75 SHA256 a6ce67bb812ca67d26e518da4903cf27338865c0f06beb58d4a8ece6021e1630
+AUX general/001_all_no-desktop-icon.patch 1131 RMD160 3ab69d825994cc3bb177143d27091fc292cec46a SHA1 14264460c8500f1ead267059e2b9b9a5dc8c057f SHA256 b4055370b0092e71a2b2b0f27edeb7bc063ad265f95ab4530e52c3ab3167ad62
+AUX general/002_all_allow-write-access-to-config.patch 647 RMD160 0f25f7dd60dfcb5a72b1f7b9cf344d6f431143a9 SHA1 cabd3dd071ef62d4c70f52d1a3e02334ec7f3a73 SHA256 41492cde60da6d449c0f427ac7bd65598838ec17ac0e3a5f545feeb1d29ea391
+AUX general/004_all_do-not-build-modules.patch 589 RMD160 b2153579c65a232de9c2e6dbd9bbe108d85f95e5 SHA1 394a67a30f1f29084836183303641915ce982bfd SHA256 916754b0616ea330490b9572be1a9216bb7dd441ba328b1e01e777b29fac4e1e
+AUX general/005_all_do-not-overwrite-authd-file.patch 1921 RMD160 79ea31b4e1a628f35aa8e7489aa337e15c09a62a SHA1 d38250dcab6b92bd9ecf314e22bc2516fb7ea81c SHA256 c93d5c06b2e7dfa268c7e1f3b3b78dc2e15d3e7721558ae4dc2e21d1edb95154
+AUX general/006_all_xinetd-sendsig-if-possible.patch 1227 RMD160 f27ea918c99e6a3db0fba8d53b5329833aa4cc58 SHA1 43986e1a5af682db2799a336f10c62fa27b7ca46 SHA256 1fcbbdf11f99f80881ee43ae47ed099d5f10aa3985bfe16606fdf2d307836ff0
+AUX general/007_all_use-modprobe-over-insmod.patch 445 RMD160 186ab443a733276a702dea16a23c04f7deed9d13 SHA1 c7113cd3f7f91527397f6fb07797d4e9c5c6f011 SHA256 bcf4930fae4812c8fbb2eb58b200f1da9441d97cd0c74b8ee6250cf097a28630
+AUX general/008_all_dhcpd-conf-location.patch 382 RMD160 6b0c1a3571fb0d7bc537930d9a77fb4d960aa104 SHA1 344da932ea8652d85028d4f17a3a66afd90c01b7 SHA256 577454af27bc9107220055f9d8b93b40e31650c205d31d5a351c5a1ecc16d658
+AUX general/009_all_init.d-modules-warning.patch 991 RMD160 6205e976db47cd3361b5eca8593414d411a2ab8d SHA1 3742749baa606a57d447931f0af791696a49e660 SHA256 5fbc9f101abb3816a732f64a75e90ce7fcb6783c3cd7bae521d8785e88634498
 AUX vmware-authd 211 RMD160 1bd60030f6f7bb78c0fd3b6d156498121d4be5d4 SHA1 514538222dc4e665e1d450e1bf9bf1d8e03a2b61 SHA256 3eafe9ac10aeac852faa1fbbccb5c525560e358f69964995c5cfb86c53af6b54
-AUX vmware-server-2.rc 1561 RMD160 ea122e81095807e635626a9a8ff1e445137da2b0 SHA1 50262ff622afe0a8d8eab3ad2599193cd56ad211 SHA256 e4cc1591c0cd8ab6e699d4e346ea69e0a0f4d564bc34ae216027338f74517afd
+AUX vmware-server-2.rc 1563 RMD160 8b3affded1b0d2f63c443f236ff1f113bc8c167f SHA1 19110aa398760c17efac9c50636b8c603518f46d SHA256 b81b4df190b21184b1d9200c69f8eb536e0adb3fe5d0fd3442150490ca70a1f3
 AUX vmware-server.rc 1529 RMD160 d6840024f8c7be0a673e5e29660cc75fea9520d8 SHA1 049cf33eb5bac09415f8e2a85f7ecfd0bbc5ab4a SHA256 ef551e4240eea88184c96e286354a53a4983ce80c3332a127767301b42586cb2
 AUX vmware-server.xml 1592 RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e8c SHA1 02db2ee7ca0abb8b8793c9f56d858bb08c1c715f SHA256 56aafee80ad705e8d832f8853c36d763d37b87d1cb132a41c50eb63085ae854d
 DIST VMware-server-1.0.10-203137.tar.gz 107183610 RMD160 0ddaa6a6f5b3c08804eb1b97f13ffd0fc0b87876 SHA1 f21ed65a500b2176166d90ed2821892ce1cb1fd5 SHA256 744d6057daeea5f9a950d164a3d9c5ca6273feed645699cfcf16d8acbcfa504c
+DIST VMware-server-1.0.8-126538.tar.gz 107047809 RMD160 9a1bb74accd2b3e8a84933f9676eb2cd2b1783c9 SHA1 5745503d49b8eef5a93530cbf38fc0a908ef5409 SHA256 03fb55d0088fb0867bb4697ace7535d6038bab52b948e874180a122893656d0c
 DIST VMware-server-1.0.9-156507.tar.gz 107164305 RMD160 1ba44b50b1f516eb8f253e475d6b2c7b5eeb8ade SHA1 ba6e7a7b69e312e177d54c8272de25574e3d5ddb SHA256 e1c049328141f6ea77d31b38fa920d2adff5756a063fb38964faefe928cbd94c
-DIST vmware-server-1.0.10-203137-genpatches-1.tar.bz2 2831 RMD160 ba8abdb18df385cf0566fe2d90a93139628bf4e4 SHA1 0618df489316323362ce8248794109ad6db82778 SHA256 6faf49680f08caa9b2d12ea7225190f40c2ea02f7f308647bc57444ab4978759
-DIST vmware-server-1.0.10-203137-perl-fixed-rpath-libs.tar.bz2 73834 RMD160 7f64627b5b945e8d7dabe39c165a4b66b71fb4d3 SHA1 9d696750ca3ec92b31ca8112fd80dcd832494044 SHA256 c42299dd033187c67b45b739da66583fbd94cdcba745200b89a25ac96cd9364b
-DIST vmware-server-1.0.9-156507-genpatches-1.tar.bz2 2831 RMD160 ba8abdb18df385cf0566fe2d90a93139628bf4e4 SHA1 0618df489316323362ce8248794109ad6db82778 SHA256 6faf49680f08caa9b2d12ea7225190f40c2ea02f7f308647bc57444ab4978759
-DIST vmware-server-1.0.9-156507-perl-fixed-rpath-libs.tar.bz2 73834 RMD160 7f64627b5b945e8d7dabe39c165a4b66b71fb4d3 SHA1 9d696750ca3ec92b31ca8112fd80dcd832494044 SHA256 c42299dd033187c67b45b739da66583fbd94cdcba745200b89a25ac96cd9364b
-EBUILD vmware-server-1.0.10_p203137.ebuild 2485 RMD160 77ca77e85f30253c123ee33ace98805d52ca9bff SHA1 5004199116149c7f8bf8a15c274a89eaf5ff4329 SHA256 eda54303cd35d2479d29837b5d283064c4e0a425accacc4db8a5830154ee82cb
-EBUILD vmware-server-1.0.9_p156507.ebuild 2482 RMD160 11c1c93043fde0435b794ecc878c91de46bbe03a SHA1 a8f5396be0ee68a1191a62e0d1777e323f9204c0 SHA256 4a34bcb616c7bc18e8cd605282c96b0d7e9a3bd0ea19217bb0c63b2bbce5f1a0
-MISC ChangeLog 981 RMD160 526a57fca272624bdd2ca39922b58e8b9ebbd8b8 SHA1 12a63f0e10521090166a8f7bec5937ce9e513547 SHA256 a91f1caf0c4cf3aedc53cd1441025bf980bf0b9ec9e989acb320fd7e4155b671
-MISC metadata.xml 159 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 SHA1 f46b02a39bcd0165558de67ff4256cfc812418a3 SHA256 8581ae1c90a48f50fa0542c7fb28cb8984baaf12f50fa18f33e467081effb215
+DIST VMware-server-2.0.2-203138.i386.tar.gz 506047036 RMD160 3119bf56e1ef9c63dfcb969d951cd78bd9c667e1 SHA1 2917c8d4e521cb9af186be8fcaf2043b1a516a6c SHA256 b4779515e2a8ecc4d768c07f9264aeb94e45986262626a3a557466e77f371662
+DIST VMware-server-2.0.2-203138.x86_64.tar.gz 474415801 RMD160 0778f78122ee6b701543df5885ad1e8d3325fb82 SHA1 b65d3d46dc947fc7995bda354c4947afabd23474 SHA256 a1230f43f6b668a751e9ce2c9d2f6a2c75e4d4cea88f583901f67dbd67412e25
+DIST vmware-server-perl-fixed-rpath-libs.tar.bz2 73834 RMD160 7f64627b5b945e8d7dabe39c165a4b66b71fb4d3 SHA1 9d696750ca3ec92b31ca8112fd80dcd832494044 SHA256 c42299dd033187c67b45b739da66583fbd94cdcba745200b89a25ac96cd9364b
+EBUILD vmware-server-1.0.10.203137.ebuild 2997 RMD160 6e96bbcbf49a342e07f5492d5787db7ead1cac7e SHA1 2aeefa20bd25ddb45b55284c10ec8bccb003cf2e SHA256 dec52fa9f6bf5d6b6f42cece1437ad1e8362b866e0d8524368c950a19a795ded
+EBUILD vmware-server-1.0.8.126538.ebuild 2989 RMD160 3a22b7e35954720de1a81055572cebcb7db007b0 SHA1 a638eb4dfe6bc6161a9cd6f6006a1c275cd71264 SHA256 751e72adba53ba20f2370c700b5dd9a6cb2ee5f6b5e5f828608750505b414e2a
+EBUILD vmware-server-1.0.9.156507.ebuild 2989 RMD160 7cffef1e863b926c7ecd9ec9646e4ff53ea5813c SHA1 1dfdc02f3248b396565a4bd216b3c806e1ac4ad0 SHA256 5583d0b5ed2e67b6136fc8b0746f0c4883652f9cb399f2509cbdaba8cb2fbcf3
+EBUILD vmware-server-2.0.2.203138.ebuild 9607 RMD160 ad3febab5eb3eea7af50ae615dacea010485e23e SHA1 89a0a7c7f757659f795a72bc40451157179f53c8 SHA256 0a31f29a384e8616d59ee4f1b8c72078a702f3479cc28211b6134987891a2f0f
+MISC ChangeLog 13561 RMD160 9f315d19242bba20a82c3d57abaf8165165f6339 SHA1 d1287a839a91150abd319441ffdd2bce579568b5 SHA256 68edd4603f5723be8d5d7770476e60ffd7046ced318541054f1e040010f4da28
+MISC metadata.xml 451 RMD160 34ad07edf6d4f6d9b00b8c0ea197fa8ddad2397b SHA1 7983215b3da6bbfb2e5c167b33b0625a5a31280d SHA256 b64b12ed17797856c0f950540b92f134ca8ffafd40eabafb4ef90c889e16a3e3
diff --git a/app-emulation/vmware-server/files/2.0.1.156745/000_all_initd-location.patch b/app-emulation/vmware-server/files/2.0.1.156745/000_all_initd-location.patch
new file mode 100644
index 0000000..77146c3
--- /dev/null
+++ b/app-emulation/vmware-server/files/2.0.1.156745/000_all_initd-location.patch
@@ -0,0 +1,32 @@
+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	2007-12-02 11:40:41.000000000 +0000
++++ vmware-server-distrib/bin/vmware-config.pl	2007-12-02 11:43:29.000000000 +0000
+@@ -10162,7 +10162,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");
+          }
+@@ -10212,8 +10212,8 @@
+  
+   if (isDesktopProduct()) {
+     build_vmblock();
+-    createMimePackageFile();
+-    configureDesktopFiles();
++    # createMimePackageFile();
++    # configureDesktopFiles();
+     if (vmware_binary() ne "vmplayer") {
+       configure_eclipse_plugin();
+     }
+@@ -10283,7 +10283,7 @@
+   db_save();
+   # Then start VMware's services
+   if (!$gOption{'skip-stop-start'}) {
+-    system(shell_string(db_get_answer('INITSCRIPTSDIR') . '/vmware') . ' start');
++    system(shell_string('/etc/init.d' . '/vmware') . ' start');
+     print "\n";
+   }
+ 
diff --git a/app-emulation/vmware-server/files/2.0.1.156745/001_all_fix-permissions.patch b/app-emulation/vmware-server/files/2.0.1.156745/001_all_fix-permissions.patch
new file mode 100644
index 0000000..605e358
--- /dev/null
+++ b/app-emulation/vmware-server/files/2.0.1.156745/001_all_fix-permissions.patch
@@ -0,0 +1,15 @@
+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	2007-12-02 11:16:42.000000000 +0000
++++ vmware-server-distrib/bin/vmware-config.pl	2007-12-02 11:25:36.000000000 +0000
+@@ -9097,7 +9097,10 @@
+     error('Unable to write configuration file "' . $name . '".' . "\n\n");
+   }
+   db_add_file($name, $cFlagTimestamp | $cFlagConfig);
+-  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-server/files/2.0.1.156745/002_all_pagebreak-detection-fix.patch b/app-emulation/vmware-server/files/2.0.1.156745/002_all_pagebreak-detection-fix.patch
new file mode 100644
index 0000000..fd3fc76
--- /dev/null
+++ b/app-emulation/vmware-server/files/2.0.1.156745/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-server/files/2.0.1.156745/004_all_do-not-build-modules.patch b/app-emulation/vmware-server/files/2.0.1.156745/004_all_do-not-build-modules.patch
new file mode 100644
index 0000000..35fe16b
--- /dev/null
+++ b/app-emulation/vmware-server/files/2.0.1.156745/004_all_do-not-build-modules.patch
@@ -0,0 +1,26 @@
+diff --git a/bin/vmware-config.pl b/bin/vmware-config.pl
+index 363f9cb..7ffc212 100755
+--- a/bin/vmware-config.pl
++++ b/bin/vmware-config.pl
+@@ -10404,16 +10404,16 @@ sub main {
+   }
+ 
+   if (vmware_product() ne 'server') {
+-    configure_mon();
+-    configure_vmci();
+-    configure_vsock();
+-    configure_pp();
++    #configure_mon();
++    #configure_vmci();
++    #configure_vsock();
++    #configure_pp();
+ 
+     if (vmware_product() eq 'wgs') {
+ 	configure_net();
+     }
+ 
+-    build_vmnet();
++    #build_vmnet();
+   }
+ 
+   if (isDesktopProduct()) {
diff --git a/app-emulation/vmware-server/files/2.0.1.156745/007_all_use-modprobe-over-insmod.patch b/app-emulation/vmware-server/files/2.0.1.156745/007_all_use-modprobe-over-insmod.patch
new file mode 100644
index 0000000..42fc20a
--- /dev/null
+++ b/app-emulation/vmware-server/files/2.0.1.156745/007_all_use-modprobe-over-insmod.patch
@@ -0,0 +1,13 @@
+diff --git a/installer/services.sh b/installer/services.sh
+index 402ad79..2fb53ab 100755
+--- a/installer/services.sh
++++ b/installer/services.sh
+@@ -755,7 +755,7 @@ vmware_run_vimsh_cmd() {
+ }
+ 
+ vmware_load_module() {
+-   /sbin/insmod -s -f "/lib/modules/`uname -r`/misc/$1.o" || exit 1
++   /sbin/modprobe -s "$1" || exit 1
+    return 0
+ }
+ 
diff --git a/app-emulation/vmware-server/files/2.0.1.156745/009_all_init.d-modules-warning.patch b/app-emulation/vmware-server/files/2.0.1.156745/009_all_init.d-modules-warning.patch
new file mode 100644
index 0000000..dc57efb
--- /dev/null
+++ b/app-emulation/vmware-server/files/2.0.1.156745/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	2007-12-02 12:08:09.000000000 +0000
++++ vmware-server-distrib/installer/services.sh	2007-12-02 12:12:08.000000000 +0000
+@@ -823,8 +823,13 @@
+ check_configured() {
+    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-server/files/2.0.1.156745/011_all_legit-modules-only.patch b/app-emulation/vmware-server/files/2.0.1.156745/011_all_legit-modules-only.patch
new file mode 100644
index 0000000..cbfa05b
--- /dev/null
+++ b/app-emulation/vmware-server/files/2.0.1.156745/011_all_legit-modules-only.patch
@@ -0,0 +1,13 @@
+diff --git a/bin/vmware-config.pl b/bin/vmware-config.pl
+index bb9d04f..458a14b 100755
+--- a/bin/vmware-config.pl
++++ b/bin/vmware-config.pl
+@@ -10315,7 +10315,7 @@ sub main {
+ 
+    if ($gOption{'tools-switch'} == 0) {
+       my @modules = non_vmware_modules_installed();
+-      if (scalar(@modules) > 0) {
++      if (scalar(@modules) < 0) {
+          my $osVersion = direct_command(shell_string($gHelper{'uname'}) . ' -r');
+          chomp($osVersion);
+          error("The following VMware kernel modules have been found on your " .
diff --git a/app-emulation/vmware-server/files/2.0.1.156745/012_all_rc-config.patch b/app-emulation/vmware-server/files/2.0.1.156745/012_all_rc-config.patch
new file mode 100644
index 0000000..f3bc2b3
--- /dev/null
+++ b/app-emulation/vmware-server/files/2.0.1.156745/012_all_rc-config.patch
@@ -0,0 +1,25 @@
+--- bin.old/vmware-config.pl	2009-07-02 17:56:08.873568674 -0400
++++ bin/vmware-config.pl	2009-07-02 17:56:59.000000000 -0400
+@@ -1341,6 +1341,14 @@
+       }
+    }
+ 
++   # Try using Genoot's rc-config
++   if ($gHelper{'rc-config'} ne '') {
++   	if(0 == system(shell_string($gHelper{'rc-config'}) . ' add '
++			. $service . ' default')) {
++		return;
++	}
++   }
++
+    # Set up vmware to start/stop at run levels 2, 3 and 5
+    link_runlevel(2, $service, $S_level, $K_level);
+    link_runlevel(3, $service, $S_level, $K_level);
+@@ -2552,6 +2560,7 @@
+   }
+   $gHelper{'insserv'} = internal_which('insserv');
+   $gHelper{'chkconfig'} = internal_which('/sbin/chkconfig');
++  $gHelper{'rc-config'} = internal_which('/usr/bin/rc-config');
+   if (vmware_product() eq 'server' &&
+       $gHelper{'chkconfig'} eq '') {
+          error('No initscript installer found.' . "\n\n");
diff --git a/app-emulation/vmware-server/files/2.0.2.203138/000_all_initd-location.patch b/app-emulation/vmware-server/files/2.0.2.203138/000_all_initd-location.patch
new file mode 100644
index 0000000..77146c3
--- /dev/null
+++ b/app-emulation/vmware-server/files/2.0.2.203138/000_all_initd-location.patch
@@ -0,0 +1,32 @@
+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	2007-12-02 11:40:41.000000000 +0000
++++ vmware-server-distrib/bin/vmware-config.pl	2007-12-02 11:43:29.000000000 +0000
+@@ -10162,7 +10162,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");
+          }
+@@ -10212,8 +10212,8 @@
+  
+   if (isDesktopProduct()) {
+     build_vmblock();
+-    createMimePackageFile();
+-    configureDesktopFiles();
++    # createMimePackageFile();
++    # configureDesktopFiles();
+     if (vmware_binary() ne "vmplayer") {
+       configure_eclipse_plugin();
+     }
+@@ -10283,7 +10283,7 @@
+   db_save();
+   # Then start VMware's services
+   if (!$gOption{'skip-stop-start'}) {
+-    system(shell_string(db_get_answer('INITSCRIPTSDIR') . '/vmware') . ' start');
++    system(shell_string('/etc/init.d' . '/vmware') . ' start');
+     print "\n";
+   }
+ 
diff --git a/app-emulation/vmware-server/files/2.0.2.203138/001_all_fix-permissions.patch b/app-emulation/vmware-server/files/2.0.2.203138/001_all_fix-permissions.patch
new file mode 100644
index 0000000..605e358
--- /dev/null
+++ b/app-emulation/vmware-server/files/2.0.2.203138/001_all_fix-permissions.patch
@@ -0,0 +1,15 @@
+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	2007-12-02 11:16:42.000000000 +0000
++++ vmware-server-distrib/bin/vmware-config.pl	2007-12-02 11:25:36.000000000 +0000
+@@ -9097,7 +9097,10 @@
+     error('Unable to write configuration file "' . $name . '".' . "\n\n");
+   }
+   db_add_file($name, $cFlagTimestamp | $cFlagConfig);
+-  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-server/files/2.0.2.203138/002_all_pagebreak-detection-fix.patch b/app-emulation/vmware-server/files/2.0.2.203138/002_all_pagebreak-detection-fix.patch
new file mode 100644
index 0000000..fd3fc76
--- /dev/null
+++ b/app-emulation/vmware-server/files/2.0.2.203138/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-server/files/2.0.2.203138/004_all_do-not-build-modules.patch b/app-emulation/vmware-server/files/2.0.2.203138/004_all_do-not-build-modules.patch
new file mode 100644
index 0000000..35fe16b
--- /dev/null
+++ b/app-emulation/vmware-server/files/2.0.2.203138/004_all_do-not-build-modules.patch
@@ -0,0 +1,26 @@
+diff --git a/bin/vmware-config.pl b/bin/vmware-config.pl
+index 363f9cb..7ffc212 100755
+--- a/bin/vmware-config.pl
++++ b/bin/vmware-config.pl
+@@ -10404,16 +10404,16 @@ sub main {
+   }
+ 
+   if (vmware_product() ne 'server') {
+-    configure_mon();
+-    configure_vmci();
+-    configure_vsock();
+-    configure_pp();
++    #configure_mon();
++    #configure_vmci();
++    #configure_vsock();
++    #configure_pp();
+ 
+     if (vmware_product() eq 'wgs') {
+ 	configure_net();
+     }
+ 
+-    build_vmnet();
++    #build_vmnet();
+   }
+ 
+   if (isDesktopProduct()) {
diff --git a/app-emulation/vmware-server/files/2.0.2.203138/007_all_use-modprobe-over-insmod.patch b/app-emulation/vmware-server/files/2.0.2.203138/007_all_use-modprobe-over-insmod.patch
new file mode 100644
index 0000000..42fc20a
--- /dev/null
+++ b/app-emulation/vmware-server/files/2.0.2.203138/007_all_use-modprobe-over-insmod.patch
@@ -0,0 +1,13 @@
+diff --git a/installer/services.sh b/installer/services.sh
+index 402ad79..2fb53ab 100755
+--- a/installer/services.sh
++++ b/installer/services.sh
+@@ -755,7 +755,7 @@ vmware_run_vimsh_cmd() {
+ }
+ 
+ vmware_load_module() {
+-   /sbin/insmod -s -f "/lib/modules/`uname -r`/misc/$1.o" || exit 1
++   /sbin/modprobe -s "$1" || exit 1
+    return 0
+ }
+ 
diff --git a/app-emulation/vmware-server/files/2.0.2.203138/009_all_init.d-modules-warning.patch b/app-emulation/vmware-server/files/2.0.2.203138/009_all_init.d-modules-warning.patch
new file mode 100644
index 0000000..dc57efb
--- /dev/null
+++ b/app-emulation/vmware-server/files/2.0.2.203138/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	2007-12-02 12:08:09.000000000 +0000
++++ vmware-server-distrib/installer/services.sh	2007-12-02 12:12:08.000000000 +0000
+@@ -823,8 +823,13 @@
+ check_configured() {
+    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-server/files/2.0.2.203138/011_all_legit-modules-only.patch b/app-emulation/vmware-server/files/2.0.2.203138/011_all_legit-modules-only.patch
new file mode 100644
index 0000000..cbfa05b
--- /dev/null
+++ b/app-emulation/vmware-server/files/2.0.2.203138/011_all_legit-modules-only.patch
@@ -0,0 +1,13 @@
+diff --git a/bin/vmware-config.pl b/bin/vmware-config.pl
+index bb9d04f..458a14b 100755
+--- a/bin/vmware-config.pl
++++ b/bin/vmware-config.pl
+@@ -10315,7 +10315,7 @@ sub main {
+ 
+    if ($gOption{'tools-switch'} == 0) {
+       my @modules = non_vmware_modules_installed();
+-      if (scalar(@modules) > 0) {
++      if (scalar(@modules) < 0) {
+          my $osVersion = direct_command(shell_string($gHelper{'uname'}) . ' -r');
+          chomp($osVersion);
+          error("The following VMware kernel modules have been found on your " .
diff --git a/app-emulation/vmware-server/files/2.0.2.203138/012_all_rc-config.patch b/app-emulation/vmware-server/files/2.0.2.203138/012_all_rc-config.patch
new file mode 100644
index 0000000..f3bc2b3
--- /dev/null
+++ b/app-emulation/vmware-server/files/2.0.2.203138/012_all_rc-config.patch
@@ -0,0 +1,25 @@
+--- bin.old/vmware-config.pl	2009-07-02 17:56:08.873568674 -0400
++++ bin/vmware-config.pl	2009-07-02 17:56:59.000000000 -0400
+@@ -1341,6 +1341,14 @@
+       }
+    }
+ 
++   # Try using Genoot's rc-config
++   if ($gHelper{'rc-config'} ne '') {
++   	if(0 == system(shell_string($gHelper{'rc-config'}) . ' add '
++			. $service . ' default')) {
++		return;
++	}
++   }
++
+    # Set up vmware to start/stop at run levels 2, 3 and 5
+    link_runlevel(2, $service, $S_level, $K_level);
+    link_runlevel(3, $service, $S_level, $K_level);
+@@ -2552,6 +2560,7 @@
+   }
+   $gHelper{'insserv'} = internal_which('insserv');
+   $gHelper{'chkconfig'} = internal_which('/sbin/chkconfig');
++  $gHelper{'rc-config'} = internal_which('/usr/bin/rc-config');
+   if (vmware_product() eq 'server' &&
+       $gHelper{'chkconfig'} eq '') {
+          error('No initscript installer found.' . "\n\n");
diff --git a/app-emulation/vmware-server/files/general/001_all_no-desktop-icon.patch b/app-emulation/vmware-server/files/general/001_all_no-desktop-icon.patch
new file mode 100644
index 0000000..1d864f7
--- /dev/null
+++ b/app-emulation/vmware-server/files/general/001_all_no-desktop-icon.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-server/files/general/002_all_allow-write-access-to-config.patch b/app-emulation/vmware-server/files/general/002_all_allow-write-access-to-config.patch
new file mode 100644
index 0000000..e646b7b
--- /dev/null
+++ b/app-emulation/vmware-server/files/general/002_all_allow-write-access-to-config.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-server/files/general/004_all_do-not-build-modules.patch b/app-emulation/vmware-server/files/general/004_all_do-not-build-modules.patch
new file mode 100644
index 0000000..cec3b3e
--- /dev/null
+++ b/app-emulation/vmware-server/files/general/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-server/files/general/005_all_do-not-overwrite-authd-file.patch b/app-emulation/vmware-server/files/general/005_all_do-not-overwrite-authd-file.patch
new file mode 100644
index 0000000..0c45cad
--- /dev/null
+++ b/app-emulation/vmware-server/files/general/005_all_do-not-overwrite-authd-file.patch
@@ -0,0 +1,44 @@
+--- vmware-server-distrib/bin/vmware-config.pl	2006-03-17 21:13:22.000000000 +0100
++++ vmware-server-distrib/bin/vmware-config.pl	2006-03-17 22:37:00.000000000 +0100
+@@ -6278,10 +6278,30 @@
+   my $authd_conf_file = "$conf_dir/vmware-authd";
+   my $authd = db_get_answer('SBINDIR') . "/vmware-authd";
+ 
++  # Never overwrite an existing conf file unless it has the exact modification 
++  # date as in the database in which case we can be pretty sure that it is the 
++  # one that we wrote and it should be safe to assume that we can overwrite it.
++  if( -f $authd_conf_file ) {
++    my @statbuf = stat( $authd_conf_file );
++    if( ! defined( $statbuf[9] ) ) {
++      error( 
++        'Unable to get the last modification timestamp of file "' 
++        . $authd_conf_file . "\".\n\n" 
++      );
++    }
++    if( 
++      ! db_file_in( $authd_conf_file ) 
++      || db_file_ts( $authd_conf_file ) != $statbuf[9] 
++    ) {
++        if (get_answer('The file "' . $authd_conf_file . '" already exists and seems to have'
++                     . ' been modified manually.  Overwrite?', 'yesno', 'no') eq 'no')
++        { return; }
++    }
++  }
++
+   # Create the new vmware-authd file
+-  # XXX This file should be registered with the installer's database. --hpreg
+   if (not open(CONF, '>' . $authd_conf_file)) {
+-    query('Unable to create the "' . $authd_conf_file . '"file.  '
++    query('Unable to create the "' . $authd_conf_file . '" file.  '
+           . 'Consequently, this program cannot add a "' . $authd . '" entry '
+           . 'in the file.  You will have to do it by hand before running '
+           . vmware_product_name() . '.' .  "\n\n" . 'Hit enter to continue.',
+@@ -6304,6 +6324,8 @@
+ END
+   close CONF;
+ 
++  db_add_file( $authd_conf_file, 0x1 );
++
+   # Make sure the IP service is registered, as RH 9.0's xinetd is picky about
+   # that (was bug 26864). --hpreg
+   if (check_port_not_registered($port) == 1) {
diff --git a/app-emulation/vmware-server/files/general/006_all_xinetd-sendsig-if-possible.patch b/app-emulation/vmware-server/files/general/006_all_xinetd-sendsig-if-possible.patch
new file mode 100644
index 0000000..89c4e16
--- /dev/null
+++ b/app-emulation/vmware-server/files/general/006_all_xinetd-sendsig-if-possible.patch
@@ -0,0 +1,28 @@
+--- vmware-server-distrib/bin/vmware-config.pl	2006-03-20 20:04:45.000000000 +0000
++++ vmware-server-distrib/bin/vmware-config.pl	2006-03-20 20:08:01.000000000 +0000
+@@ -6255,17 +6255,17 @@
+ #Restart xinetd
+ sub restart_xinetd {
+   my $xinetd_restart = db_get_answer('INITSCRIPTSDIR') . '/xinetd';
++  if (!system(shell_string($gHelper{'killall'}) . ' -USR2 xinetd')) {
++    return;
++  }
+   if (-e $xinetd_restart) {
+-    if (!system(shell_string($xinetd_restart) . ' restart')) {
+-      return;
++    if (system(shell_string($xinetd_restart) . ' restart')) {
++      query('Unable to make the Internet super-server (xinetd) re-read its '
++            . 'configuration file.  Please restart xinetd by hand:' . "\n"
++            . '    killall -v -USR2 xinetd' . "\n\n"
++            . 'Hit enter to continue.', '', 0);
+     }
+   }
+-  if (system(shell_string($gHelper{'killall'}) . ' -USR2 xinetd')) {
+-    query('Unable to make the Internet super-server (xinetd) re-read its '
+-          . 'configuration file.  Please restart xinetd by hand:' . "\n"
+-          . '    killall -v -USR2 xinetd' . "\n\n"
+-          . 'Hit enter to continue.', '', 0);
+-  }
+ }
+ 
+ # Update the Internet super-server's configuration file, and make the
diff --git a/app-emulation/vmware-server/files/general/007_all_use-modprobe-over-insmod.patch b/app-emulation/vmware-server/files/general/007_all_use-modprobe-over-insmod.patch
new file mode 100644
index 0000000..5509d24
--- /dev/null
+++ b/app-emulation/vmware-server/files/general/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-server/files/general/008_all_dhcpd-conf-location.patch b/app-emulation/vmware-server/files/general/008_all_dhcpd-conf-location.patch
new file mode 100644
index 0000000..575ab85
--- /dev/null
+++ b/app-emulation/vmware-server/files/general/008_all_dhcpd-conf-location.patch
@@ -0,0 +1,13 @@
+--- 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
+@@ -5448,8 +5448,8 @@
+   my $network;
+   my $netmask;
+ 
+-  if (-r '/etc/dhcpd.conf') {
+-    $conf = '/etc/dhcpd.conf';
++  if (-r '/etc/dhcp/dhcpd.conf') {
++    $conf = '/etc/dhcp/dhcpd.conf';
+   } else {
+     return;
+   }
diff --git a/app-emulation/vmware-server/files/general/009_all_init.d-modules-warning.patch b/app-emulation/vmware-server/files/general/009_all_init.d-modules-warning.patch
new file mode 100644
index 0000000..4eab043
--- /dev/null
+++ b/app-emulation/vmware-server/files/general/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-server/files/vmware-server-2.rc b/app-emulation/vmware-server/files/vmware-server-2.rc
index b8e09f1..ad8b70b 100755
--- a/app-emulation/vmware-server/files/vmware-server-2.rc
+++ b/app-emulation/vmware-server/files/vmware-server-2.rc
@@ -1,7 +1,7 @@
 #!/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-server/files/vmware-server.rc,v 1.6 2007/09/20 17:13:13 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server/files/vmware-server-2.rc,v 1.1 2009/05/09 21:55:17 ikelos Exp $
 
 depend() {
 	need localmount hald
diff --git a/app-emulation/vmware-server/metadata.xml b/app-emulation/vmware-server/metadata.xml
index 3260ec5..91d5f99 100644
--- a/app-emulation/vmware-server/metadata.xml
+++ b/app-emulation/vmware-server/metadata.xml
@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>vmware</herd>
+	<herd>vmware</herd>
+	<maintainer>
+		<email>vadimk@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		VMware Server is a hosted virtualization platform that installs like an
+		application on any existing server hardware and partitions a physical
+		server into multiple virtual machines. 
+	</longdescription>
 </pkgmetadata>
diff --git a/app-emulation/vmware-server/vmware-server-1.0.10.203137.ebuild b/app-emulation/vmware-server/vmware-server-1.0.10.203137.ebuild
new file mode 100644
index 0000000..a0cccb2
--- /dev/null
+++ b/app-emulation/vmware-server/vmware-server-1.0.10.203137.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server/vmware-server-1.0.10.203137.ebuild,v 1.1 2009/12/18 16:14:42 vadimk 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.
+
+inherit eutils versionator vmware
+
+MY_PV=$(replace_version_separator 3 '-' )
+MY_P="VMware-server-${MY_PV}"
+
+DESCRIPTION="VMware Server for Linux"
+HOMEPAGE="http://www.vmware.com/"
+SRC_URI="mirror://vmware/software/vmserver/${MY_P}.tar.gz
+	http://dev.gentoo.org/~ikelos/devoverlay-distfiles/${PN}-perl-fixed-rpath-libs.tar.bz2
+	mirror://gentoo/${PN}-perl-fixed-rpath-libs.tar.bz2"
+
+LICENSE="vmware"
+IUSE=""
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="strip"
+
+DEPEND=">=sys-libs/glibc-2.3.5
+	>=dev-lang/perl-5
+	sys-apps/pciutils
+	sys-apps/findutils
+	virtual/os-headers"
+# vmware-server should not use virtual/libc as this is a
+# precompiled binary package thats linked to glibc.
+RDEPEND=">=sys-libs/glibc-2.3.5
+	amd64? (
+		>=app-emulation/emul-linux-x86-baselibs-2.5.5-r3
+		app-emulation/emul-linux-x86-gtklibs )
+	!amd64? (
+		x11-libs/libX11
+		x11-libs/libXft
+		x11-libs/libXtst
+		x11-libs/libXext
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXrender )
+	>=dev-lang/perl-5
+	!<sys-apps/dbus-0.62
+	!app-emulation/vmware-player
+	!app-emulation/vmware-workstation
+	~app-emulation/vmware-modules-138.10
+	!<app-emulation/vmware-modules-138.10
+	!>=app-emulation/vmware-modules-138.10
+	sys-apps/pciutils
+	virtual/pam
+	sys-apps/xinetd"
+
+S=${WORKDIR}/vmware-server-distrib
+
+RUN_UPDATE="no"
+ANY_ANY=""
+PATCHES=("general")
+
+src_unpack() {
+	EPATCH_SUFFIX="patch"
+	vmware_src_unpack
+	#cd "${WORKDIR}"
+	#unpack ${PN}-perl-fixed-rpath-libs.tar.bz2
+
+	# patch the vmware /etc/pam.d file to ensure that only
+	# vmware group members can log in
+	cp "${FILESDIR}/vmware-authd" "${S}/etc/pam.d/vmware-authd"
+}
+
+src_install() {
+	vmware_src_install
+
+	# Fix the amd64 emulation pam stuff
+	use amd64 && dosed "s:pam_:/lib32/security/pam_:" ${config_dir}/pam.d/vmware-authd
+	  # Remove libpam on amd64 because it's linked against the wrong paths
+	use amd64 && rm "${D}/opt/vmware/server/lib/lib/libpam.so.0/libpam.so"
+
+	echo "${VMWARE_GROUP}" > "${D}${config_dir}/vmwaregroup"
+
+	dosym /etc/init.d/xinetd ${config_dir}/init.d
+}
+
+pkg_config() {
+	einfo "Running ${ROOT}${dir}/bin/vmware-config.pl"
+	"${ROOT}${dir}/bin/vmware-config.pl"
+}
+
+pkg_postinst() {
+	vmware_pkg_postinst
+	elog "Remember by default xinetd only allows connections from localhost"
+	elog "To allow external users access to vmware-server you must edit"
+	elog "    /etc/xinetd.d/vmware-authd"
+	elog "and specify a new 'only_from' line"
+	echo
+	ewarn "VMWare Server also has issues when running on a JFS filesystem.  For more"
+	ewarn "information see http://bugs.gentoo.org/show_bug.cgi?id=122500#c94"
+}
diff --git a/app-emulation/vmware-server/vmware-server-1.0.8.126538.ebuild b/app-emulation/vmware-server/vmware-server-1.0.8.126538.ebuild
new file mode 100644
index 0000000..7e739cf
--- /dev/null
+++ b/app-emulation/vmware-server/vmware-server-1.0.8.126538.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server/vmware-server-1.0.8.126538.ebuild,v 1.4 2009/01/12 21:48:07 maekke 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.
+
+inherit eutils versionator vmware
+
+MY_PV=$(replace_version_separator 3 '-' )
+MY_P="VMware-server-${MY_PV}"
+
+DESCRIPTION="VMware Server for Linux"
+HOMEPAGE="http://www.vmware.com/"
+SRC_URI="mirror://vmware/software/vmserver/${MY_P}.tar.gz
+	http://dev.gentoo.org/~ikelos/devoverlay-distfiles/${PN}-perl-fixed-rpath-libs.tar.bz2
+	mirror://gentoo/${PN}-perl-fixed-rpath-libs.tar.bz2"
+
+LICENSE="vmware"
+IUSE=""
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+RESTRICT="strip"
+
+DEPEND=">=sys-libs/glibc-2.3.5
+	>=dev-lang/perl-5
+	sys-apps/pciutils
+	sys-apps/findutils
+	virtual/os-headers"
+# vmware-server should not use virtual/libc as this is a
+# precompiled binary package thats linked to glibc.
+RDEPEND=">=sys-libs/glibc-2.3.5
+	amd64? (
+		>=app-emulation/emul-linux-x86-baselibs-2.5.5-r3
+		app-emulation/emul-linux-x86-gtklibs )
+	!amd64? (
+		x11-libs/libX11
+		x11-libs/libXft
+		x11-libs/libXtst
+		x11-libs/libXext
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXrender )
+	>=dev-lang/perl-5
+	!<sys-apps/dbus-0.62
+	!app-emulation/vmware-player
+	!app-emulation/vmware-workstation
+	~app-emulation/vmware-modules-138.8
+	!<app-emulation/vmware-modules-138.8
+	!>=app-emulation/vmware-modules-138.8
+	sys-apps/pciutils
+	virtual/pam
+	sys-apps/xinetd"
+
+S=${WORKDIR}/vmware-server-distrib
+
+RUN_UPDATE="no"
+ANY_ANY=""
+PATCHES="general"
+
+src_unpack() {
+	EPATCH_SUFFIX="patch"
+	vmware_src_unpack
+	#cd "${WORKDIR}"
+	#unpack ${PN}-perl-fixed-rpath-libs.tar.bz2
+
+	# patch the vmware /etc/pam.d file to ensure that only
+	# vmware group members can log in
+	cp "${FILESDIR}/vmware-authd" "${S}/etc/pam.d/vmware-authd"
+}
+
+src_install() {
+	vmware_src_install
+
+	# Fix the amd64 emulation pam stuff
+	use amd64 && dosed "s:pam_:/lib32/security/pam_:" ${config_dir}/pam.d/vmware-authd
+	  # Remove libpam on amd64 because it's linked against the wrong paths
+	use amd64 && rm "${D}/opt/vmware/server/lib/lib/libpam.so.0/libpam.so"
+
+	echo "${VMWARE_GROUP}" > "${D}${config_dir}/vmwaregroup"
+
+	dosym /etc/init.d/xinetd ${config_dir}/init.d
+}
+
+pkg_config() {
+	einfo "Running ${ROOT}${dir}/bin/vmware-config.pl"
+	"${ROOT}${dir}/bin/vmware-config.pl"
+}
+
+pkg_postinst() {
+	vmware_pkg_postinst
+	elog "Remember by default xinetd only allows connections from localhost"
+	elog "To allow external users access to vmware-server you must edit"
+	elog "    /etc/xinetd.d/vmware-authd"
+	elog "and specify a new 'only_from' line"
+	echo
+	ewarn "VMWare Server also has issues when running on a JFS filesystem.  For more"
+	ewarn "information see http://bugs.gentoo.org/show_bug.cgi?id=122500#c94"
+}
diff --git a/app-emulation/vmware-server/vmware-server-1.0.9_p156507.ebuild b/app-emulation/vmware-server/vmware-server-1.0.9.156507.ebuild
similarity index 72%
rename from app-emulation/vmware-server/vmware-server-1.0.9_p156507.ebuild
rename to app-emulation/vmware-server/vmware-server-1.0.9.156507.ebuild
index f4c45d5..69547eb 100644
--- a/app-emulation/vmware-server/vmware-server-1.0.9_p156507.ebuild
+++ b/app-emulation/vmware-server/vmware-server-1.0.9.156507.ebuild
@@ -1,20 +1,27 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server/vmware-server-1.0.9.156507.ebuild,v 1.3 2009/08/01 14:24:50 maekke 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.
 
-VM_SRC="VMware-server-${PV/_p/-}.tar.gz"
-VM_SRC_EXTRA="perl-fixed-rpath-libs genpatches-1"
+inherit eutils versionator vmware
 
-inherit eutils vmware-1
+MY_PV=$(replace_version_separator 3 '-' )
+MY_P="VMware-server-${MY_PV}"
 
+DESCRIPTION="VMware Server for Linux"
+HOMEPAGE="http://www.vmware.com/"
+SRC_URI="mirror://vmware/software/vmserver/${MY_P}.tar.gz
+	http://dev.gentoo.org/~ikelos/devoverlay-distfiles/${PN}-perl-fixed-rpath-libs.tar.bz2
+	mirror://gentoo/${PN}-perl-fixed-rpath-libs.tar.bz2"
+
+LICENSE="vmware"
+IUSE=""
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
+RESTRICT="strip"
 
 DEPEND=">=sys-libs/glibc-2.3.5
 	>=dev-lang/perl-5
@@ -27,7 +34,7 @@ RDEPEND=">=sys-libs/glibc-2.3.5
 	amd64? (
 		>=app-emulation/emul-linux-x86-baselibs-2.5.5-r3
 		app-emulation/emul-linux-x86-gtklibs )
-	x86? (
+	!amd64? (
 		x11-libs/libX11
 		x11-libs/libXft
 		x11-libs/libXtst
@@ -42,26 +49,30 @@ RDEPEND=">=sys-libs/glibc-2.3.5
 	!app-emulation/vmware-workstation
 	~app-emulation/vmware-modules-138.9
 	!<app-emulation/vmware-modules-138.9
-	!>app-emulation/vmware-modules-138.9
+	!>=app-emulation/vmware-modules-138.9
 	sys-apps/pciutils
 	virtual/pam
 	sys-apps/xinetd"
 
 S=${WORKDIR}/vmware-server-distrib
 
-src_unpack() {
-	vmware-1_src_unpack
-}
+RUN_UPDATE="no"
+ANY_ANY=""
+PATCHES="general"
+
+src_unpack() {
+	EPATCH_SUFFIX="patch"
+	vmware_src_unpack
+	#cd "${WORKDIR}"
+	#unpack ${PN}-perl-fixed-rpath-libs.tar.bz2
 
-src_prepare() {
-	vmware-1_src_prepare
 	# patch the vmware /etc/pam.d file to ensure that only
 	# vmware group members can log in
 	cp "${FILESDIR}/vmware-authd" "${S}/etc/pam.d/vmware-authd"
 }
 
 src_install() {
-	vmware-1_src_install
+	vmware_src_install
 
 	# Fix the amd64 emulation pam stuff
 	use amd64 && dosed "s:pam_:/lib32/security/pam_:" ${config_dir}/pam.d/vmware-authd
@@ -79,7 +90,7 @@ pkg_config() {
 }
 
 pkg_postinst() {
-	vmware-1_pkg_postinst
+	vmware_pkg_postinst
 	elog "Remember by default xinetd only allows connections from localhost"
 	elog "To allow external users access to vmware-server you must edit"
 	elog "    /etc/xinetd.d/vmware-authd"
diff --git a/app-emulation/vmware-server/vmware-server-2.0.2.203138.ebuild b/app-emulation/vmware-server/vmware-server-2.0.2.203138.ebuild
new file mode 100644
index 0000000..fb576cc
--- /dev/null
+++ b/app-emulation/vmware-server/vmware-server-2.0.2.203138.ebuild
@@ -0,0 +1,312 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server/vmware-server-2.0.2.203138.ebuild,v 1.1 2009/10/29 13:24:13 vadimk 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 pam pax-utils versionator
+
+MY_PV=$(replace_version_separator 3 '-' )
+MY_PN="VMware-server-${MY_PV}"
+
+DESCRIPTION="VMware Server for Linux"
+HOMEPAGE="http://www.vmware.com/"
+DOWNLOAD_URL="http://downloads.vmware.com/d/info/datacenter_downloads/vmware_server/2_0"
+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="fetch strip"
+
+CDEPEND="
+	>=dev-lang/perl-5
+	>=sys-libs/glibc-2.3.5
+	sys-apps/pciutils"
+DEPEND="${CDEPEND}
+	sys-apps/findutils
+	x11-misc/shared-mime-info
+	virtual/os-headers"
+# vmware-server should not use virtual/libc as this is a
+# precompiled binary package thats linked to glibc.
+RDEPEND="${CDEPEND}
+	~app-emulation/vmware-modules-208.2
+	!>app-emulation/vmware-modules-208.2
+	!<app-emulation/vmware-modules-208.2
+	dev-libs/glib
+	dev-libs/libxml2
+	sys-apps/hal
+	sys-fs/fuse
+	sys-libs/zlib
+	virtual/pam
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXt
+	x11-libs/libXtst
+	x11-misc/xdg-utils
+	!<sys-apps/dbus-0.62
+	!app-emulation/vmware-player
+	!app-emulation/vmware-workstation
+	"
+
+PDEPEND="app-emulation/vmware-vix"
+
+S=${WORKDIR}/vmware-server-distrib
+
+pkg_setup() {
+	if use x86; then
+		MY_P="${MY_PN}.i386"
+	elif use amd64; then
+		MY_P="${MY_PN}.x86_64"
+	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_prepare() {
+	VMWARE_GROUP=${VMWARE_GROUP:-vmware}
+	VMWARE_INSTALL_DIR=/opt/${PN//-//}
+
+	shortname="wgs"
+	product="vmware"
+	config_program="vmware-config.pl"
+	config_dir="/etc/vmware"
+	product_name="VMware Server 2"
+
+	enewgroup ${VMWARE_GROUP}
+
+	# Remove PAX MPROTECT flag from all applicable files in /bin, /sbin for
+	# the vmware package only (since modules, tools and console should not
+	# need to generate code on the fly in memory).
+	pax-mark -m $(list-paxables "${S}"/{bin{,-debug},sbin}/{vmware-serverd,vmware-vmx})
+
+	EPATCH_SOURCE="${FILESDIR}"/${PV} EPATCH_SUFFIX="patch" epatch
+
+	# Proper lsmod
+	sed -i -e "s:/sbin/lsmod:/bin/lsmod:" "${S}"/installer/services.sh || die "sed"
+	sed -i -e "s:/sbin/lsmod:/bin/lsmod:" "${S}"/lib/net-services.sh || die "sed"
+
+	# Set the name
+	sed -i -e "s:%LONGNAME%:${product_name}:" "${S}"/installer/services.sh || die "sed"
+	sed -i -e "s:%SHORTNAME%:${shortname}:" "${S}"/installer/services.sh || die "sed"
+
+	# We won't want any perl scripts from VMware once we've finally got all
+	# of the configuration done, but for now, they're necessary.
+	#rm -f *.pl bin/*.pl
+	rm -f *.pl
+	rm -f etc/installer.sh
+
+	# Since with Gentoo we compile everthing it doesn't make sense to keep
+	# the precompiled modules arround. Saves about 4 megs of disk space too.
+	rm -rf "${S}"/lib/modules/binary
+	# We also don't need to keep the icons around, or do we?
+	#rm -rf ${S}/lib/share/icons
+
+	rm -rf "${S}"/etc/pam.d/
+	sed -i -e "s:configure_wgs_pam_d():#&:" "${S}"/bin/vmware-config.pl || die "sed pam_d"
+}
+
+src_install() {
+	# We loop through our directories and copy everything to our system.
+	for x in bin lib sbin
+	do
+		if [[ -e "${S}/${x}" ]]
+		then
+			dodir "${VMWARE_INSTALL_DIR}"/${x}
+			cp -pPR "${S}"/${x}/* "${D}""${VMWARE_INSTALL_DIR}"/${x} \
+				|| die "copying ${x}"
+		fi
+	done
+
+	# Bug 282213
+	mv "${D}"/"${VMWARE_INSTALL_DIR}"/lib/lib/libpng12.so.0/libpng12.so.0 \
+	   "${D}"/"${VMWARE_INSTALL_DIR}"/lib/lib/libpng12.so.0/libpng12.so.0.old
+	dosym /usr/lib/libpng12.so.0 "${VMWARE_INSTALL_DIR}"/lib/lib/libpng12.so.0/libpng12.so.0
+
+	# 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
+	# Then we check for an environment file.
+	if [[ -e "${FILESDIR}/90${PN}" ]]
+	then
+		doenvd "${FILESDIR}"/90${PN} || die "doenvd"
+	fi
+	# 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
+
+	# Do we have vmware-ping/vmware-vmx?  If so, make them setuid.
+	for p in /bin/vmware-ping /lib/bin/vmware-vmx /lib/bin-debug/vmware-vmx /lib/bin/vmware-vmx-debug /sbin/vmware-authd;
+	do
+		if [ -x "${D}${VMWARE_INSTALL_DIR}${p}" ]
+		then
+			fowners root:${VMWARE_GROUP} "${VMWARE_INSTALL_DIR}"${p}
+			fperms 4750 "${VMWARE_INSTALL_DIR}"${p}
+		fi
+	done
+
+	# This removed the user/group warnings
+	# But also broke vmware-server with FEATURES="userpriv" since it removes
+	# the set-UID bit
+	#chown -R root:${VMWARE_GROUP} ${D} || die
+
+	# We like desktop icons.
+	# TODO: Fix up the icon creation, across the board.
+	#make_desktop_entry ${PN} "${product_name}" ${PN}.png
+
+	# Now, we copy in our services.sh file
+	exeinto "${config_dir}"/init.d
+	newexe installer/services.sh ${product} || die "services.sh"
+
+	newinitd "${FILESDIR}/vmware-server-2.rc" vmware
+
+	# startup symlinks
+	dosym ${config_dir}/init.d/${product} ${config_dir}/init.d/vmware-autostart
+	dosym ${config_dir}/init.d/${product} ${config_dir}/init.d/vmware-core
+	dosym ${config_dir}/init.d/${product} ${config_dir}/init.d/vmware-mgmt
+
+	# pam
+	pamd_mimic_system vmware-authd auth account
+
+	# Man pages and docs
+	dodoc doc/*
+	doman man/man1/*
+
+	# VMware authorization service
+	insinto ${config_dir}/hostd
+	doins "${FILESDIR}/authorization.xml"
+
+	# Finally, we run the "Questions"
+	einfo "Adding answers to ${config_dir}/locations"
+	locations="${D}${config_dir}/locations"
+	echo "answer BINDIR ${VMWARE_INSTALL_DIR}/bin" >> ${locations}
+	echo "answer LIBDIR ${VMWARE_INSTALL_DIR}/lib" >> ${locations}
+	echo "answer MANDIR ${VMWARE_INSTALL_DIR}/man" >> ${locations}
+	echo "answer DOCDIR ${VMWARE_INSTALL_DIR}/doc" >> ${locations}
+	echo "answer SBINDIR ${VMWARE_INSTALL_DIR}/sbin" >> ${locations}
+	echo "answer RUN_CONFIGURATOR no" >> ${locations}
+	echo "answer INITDIR ${config_dir}/init.d" >> ${locations}
+	echo "answer INITSCRIPTSDIR ${config_dir}/init.d" >> ${locations}
+	echo "answer VMCI_CONFED yes" >> ${locations}
+	echo "answer VSOCK_CONFED yes" >> ${locations}
+}
+
+pkg_config() {
+	einfo "Running ${VMWARE_INSTALL_DIR}/bin/vmware-config.pl"
+	"${VMWARE_INSTALL_DIR}/bin/vmware-config.pl"
+}
+
+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 "Use "
+	ewarn "  emerge vmware-server --config"
+	ewarn "to configure your installation of ${product_name}."
+
+	ewarn "In order to run ${product_name}, you have to"
+	ewarn "be in the '${VMWARE_GROUP}' group."
+
+	#ewarn "By default xinetd only allows connections from localhost"
+	#ewarn "To allow external users access to vmware-server you must edit"
+	#ewarn "    /etc/xinetd.d/vmware-authd"
+	#ewarn "and specify a new 'only_from' line"
+
+	ewarn "VMWare Server also has issues when running on a JFS filesystem.  For more"
+	ewarn "information see http://bugs.gentoo.org/show_bug.cgi?id=122500#c94"
+}
+
+pkg_prerm() {
+	einfo "Stopping ${product_name} for safe unmerge"
+	/etc/init.d/vmware stop
+}
+
+pkg_postrm() {
+	if ! has_version app-emulation/${PN}; then
+		elog "To remove all traces of ${product} you will need to remove the files"
+		elog "in ${config_dir} and /etc/init.d/${product}."
+		elog "If the vmware-modules package is installed, you may no longer need it."
+	fi
+}