[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-tools/, app-emulation/vmware-player/, ...

[Vadim Kuznetsov]

commit:     918e7e6012dc6081c437cf345ee5f0b177b3605e
Author:     Vadim Kuznetsov <vadimk <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 27 17:26:37 2012 +0000
Commit:     Vadim Kuznetsov <vadimk <AT> gentoo <DOT> org>
CommitDate: Mon Aug 27 17:26:37 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=918e7e60

vmware desktop 9 version bump (Masked)

---
 app-emulation/vmware-modules/files/271-apic.patch  |   12 +
 .../files/271-makefile-include.patch               |   65 +++
 .../vmware-modules/files/271-netdevice.patch       |   24 +
 .../vmware-modules/vmware-modules-271.0.ebuild     |   79 ++++
 app-emulation/vmware-player/Manifest               |    2 +
 .../vmware-player-5.0.0.812388.ebuild              |  238 ++++++++++
 app-emulation/vmware-tools/Manifest                |   12 +
 .../vmware-tools/vmware-tools-9.2.0.812388.ebuild  |   55 +++
 app-emulation/vmware-workstation/Manifest          |    2 +
 .../vmware-workstation/files/vmware-9.0.rc         |   33 ++
 .../vmware-workstation/files/vmware-server-9.0.rc  |   55 +++
 .../vmware-workstation-9.0.0.812388.ebuild         |  472 ++++++++++++++++++++
 profiles/package.mask                              |   18 +-
 13 files changed, 1056 insertions(+), 11 deletions(-)

diff --git a/app-emulation/vmware-modules/files/271-apic.patch b/app-emulation/vmware-modules/files/271-apic.patch
new file mode 100644
index 0000000..66cd459
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-apic.patch
@@ -0,0 +1,12 @@
+diff --git a/vmmon-only/linux/hostif.c b/vmmon-only/linux/hostif.c
+index f1f4b10..c43242f 100644
+--- a/vmmon-only/linux/hostif.c
++++ b/vmmon-only/linux/hostif.c
+@@ -55,6 +55,7 @@
+ #include <linux/kthread.h>
+ #include <linux/wait.h>
+ 
++#include <asm/apic.h>
+ 
+ #include "vmware.h"
+ #include "x86apic.h"

diff --git a/app-emulation/vmware-modules/files/271-makefile-include.patch b/app-emulation/vmware-modules/files/271-makefile-include.patch
new file mode 100644
index 0000000..39c3000
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-makefile-include.patch
@@ -0,0 +1,65 @@
+diff --git a/vmblock-only/Makefile.kernel b/vmblock-only/Makefile.kernel
+index ab7a727..e3ec9d2 100644
+--- a/vmblock-only/Makefile.kernel
++++ b/vmblock-only/Makefile.kernel
+@@ -19,7 +19,7 @@
+ 
+ INCLUDE += -I$(SRCROOT)/include
+ 
+-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
++EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
+ 
+ EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/cachecreate.c, -DVMW_KMEMCR_HAS_DTOR, )
+ EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/cachector.c,   -DVMW_KMEMCR_CTOR_HAS_3_ARGS, )
+diff --git a/vmci-only/Makefile.kernel b/vmci-only/Makefile.kernel
+index ba343ee..861ea83 100644
+--- a/vmci-only/Makefile.kernel
++++ b/vmci-only/Makefile.kernel
+@@ -21,7 +21,7 @@ CC_OPTS += -DVMCI
+ 
+ INCLUDE += -I$(SRCROOT)/shared -I$(SRCROOT)/common -I$(SRCROOT)/linux
+ 
+-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
++EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
+ 
+ obj-m += $(DRIVER).o
+ 
+diff --git a/vmmon-only/Makefile.kernel b/vmmon-only/Makefile.kernel
+index 8770d1d..c4746c3 100644
+--- a/vmmon-only/Makefile.kernel
++++ b/vmmon-only/Makefile.kernel
+@@ -22,7 +22,7 @@ CC_OPTS += -DVMMON -DVMCORE
+ INCLUDE := -I$(SRCROOT)/include -I$(SRCROOT)/common -I$(SRCROOT)/linux \
+ 	   -I$(SRCROOT)/vmcore
+ 
+-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
++EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
+ 
+ EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/smpcall.c, -DVMW_HAVE_SMP_CALL_3ARG, )
+ 
+diff --git a/vmnet-only/Makefile.kernel b/vmnet-only/Makefile.kernel
+index d1e3133..665d428 100644
+--- a/vmnet-only/Makefile.kernel
++++ b/vmnet-only/Makefile.kernel
+@@ -19,7 +19,7 @@
+ 
+ INCLUDE := -I$(SRCROOT)
+ 
+-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
++EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
+ EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netdev_has_net.c,-DVMW_NETDEV_HAS_NET, )
+ EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netdev_has_dev_net.c,-DVMW_NETDEV_HAS_DEV_NET, )
+ EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/nfhook_uses_skb.c,-DVMW_NFHOOK_USES_SKB, )
+diff --git a/vsock-only/Makefile.kernel b/vsock-only/Makefile.kernel
+index b4629ee..264b8cb 100644
+--- a/vsock-only/Makefile.kernel
++++ b/vsock-only/Makefile.kernel
+@@ -25,7 +25,7 @@ INCLUDE += -I$(SRCROOT)/include
+ INCLUDE += -I$(SRCROOT)/linux
+ INCLUDE += -I$(SRCROOT)/common
+ 
+-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
++EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
+ EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/netcreate_num_params.c, -DVMW_NETCREATE_KERNARG, )
+ 
+ 

diff --git a/app-emulation/vmware-modules/files/271-netdevice.patch b/app-emulation/vmware-modules/files/271-netdevice.patch
new file mode 100644
index 0000000..35231a3
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-netdevice.patch
@@ -0,0 +1,24 @@
+diff --git a/vmnet-only/compat_netdevice.h b/vmnet-only/compat_netdevice.h
+index 7a56304..9ff4548 100644
+--- a/vmnet-only/compat_netdevice.h
++++ b/vmnet-only/compat_netdevice.h
+@@ -47,6 +47,19 @@
+ #   define net_device device
+ #endif
+ 
++/* it looks like these have been removed from the kernel 3.1
++ * probably because the "transition" is considered complete.
++ * so to keep this source compatible we just redefine them like they were
++ * previously
++ */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0)
++#define HAVE_ALLOC_NETDEV		/* feature macro: alloc_xxxdev
++					   functions are available. */
++#define HAVE_FREE_NETDEV		/* free_netdev() */
++#define HAVE_NETDEV_PRIV		/* netdev_priv() */
++#define HAVE_NETIF_QUEUE
++#define HAVE_NET_DEVICE_OPS
++#endif
+ 
+ /*
+  * SET_MODULE_OWNER appeared sometime during 2.3.x. It was setting

diff --git a/app-emulation/vmware-modules/vmware-modules-271.0.ebuild b/app-emulation/vmware-modules/vmware-modules-271.0.ebuild
new file mode 100644
index 0000000..32e64d2
--- /dev/null
+++ b/app-emulation/vmware-modules/vmware-modules-271.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-264.4.ebuild,v 1.1 2012/06/17 13:09:10 vadimk Exp $
+
+EAPI="4"
+
+inherit eutils flag-o-matic linux-info linux-mod user versionator
+
+PV_MAJOR=$(get_major_version)
+PV_MINOR=$(get_version_component_range 2)
+
+DESCRIPTION="VMware kernel modules"
+HOMEPAGE="http://www.vmware.com/"
+
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pax_kernel"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	|| ( =app-emulation/vmware-player-5.0.${PV_MINOR}*
+	=app-emulation/vmware-workstation-9.0.${PV_MINOR}* )"
+
+S=${WORKDIR}
+
+pkg_setup() {
+	CONFIG_CHECK="~HIGH_RES_TIMERS"
+	if kernel_is ge 2 6 37 && kernel_is lt 2 6 39; then
+		CONFIG_CHECK="${CONFIG_CHECK} BKL"
+	fi
+
+	linux-info_pkg_setup
+
+	linux-mod_pkg_setup
+
+	VMWARE_GROUP=${VMWARE_GROUP:-vmware}
+
+	VMWARE_MODULE_LIST="vmblock vmci vmmon vmnet vsock"
+	VMWARE_MOD_DIR="${PN}-${PVR}"
+
+	BUILD_TARGETS="auto-build KERNEL_DIR=${KERNEL_DIR} KBUILD_OUTPUT=${KV_OUT_DIR}"
+
+	enewgroup "${VMWARE_GROUP}"
+	filter-flags -mfpmath=sse
+
+	for mod in ${VMWARE_MODULE_LIST}; do
+		MODULE_NAMES="${MODULE_NAMES} ${mod}(misc:${S}/${mod}-only)"
+	done
+}
+
+src_unpack() {
+	cd "${S}"
+	for mod in ${VMWARE_MODULE_LIST}; do
+		tar -xf /opt/vmware/lib/vmware/modules/source/${mod}.tar
+	done
+}
+
+src_prepare() {
+	#epatch "${FILESDIR}/${PV_MAJOR}-makefile-kernel-dir.patch"
+	epatch "${FILESDIR}/${PV_MAJOR}-makefile-include.patch"
+	epatch "${FILESDIR}/${PV_MAJOR}-netdevice.patch"
+	use pax_kernel && epatch "${FILESDIR}/hardened.patch"
+	epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
+}
+
+src_install() {
+	linux-mod_src_install
+	local udevrules="${T}/60-vmware.rules"
+	cat > "${udevrules}" <<-EOF
+		KERNEL=="vmci",  GROUP="vmware", MODE=660
+		KERNEL=="vmmon", GROUP="vmware", MODE=660
+		KERNEL=="vsock", GROUP="vmware", MODE=660
+	EOF
+	insinto /lib/udev/rules.d/
+	doins "${udevrules}"
+}

diff --git a/app-emulation/vmware-player/Manifest b/app-emulation/vmware-player/Manifest
index 9360254..8680a64 100644
--- a/app-emulation/vmware-player/Manifest
+++ b/app-emulation/vmware-player/Manifest
@@ -4,3 +4,5 @@ DIST VMware-Player-4.0.4-744019.i386.bundle 131985156 SHA256 2fcf6e6440549b7a53c
 DIST VMware-Player-4.0.4-744019.i386.bundle.tar 131993600 SHA256 d06881c512a11fbc76f1c23d7a6c9d7bd3888c613b1678719fa77ed76243d678 SHA512 c1d763374a5d54759cd791669e846479e3ef009dd3d13f16192ca6fdb8727081b5ec510c0b2bf4a311e3e8f3ad905512c0b33be2c70e33e9b4f7037b8349e560 WHIRLPOOL e21bfdf308ee905d8bc6aefb7097b9e30c546186fa7e8750d556a4d3cb144648da36aae2622e54159918cfb5ddab848ee64f225148a0bfb6111264ce763ab067
 DIST VMware-Player-4.0.4-744019.x86_64.bundle 129698390 SHA256 572fa4cb07894c58e0795ef78ca2cfabb1acb02771c303910f3731137bfb22a9 SHA512 228d9f9f8e04e7d58a11a210f9b8268c25b228ac0c1399e3cfea0e9e48e3f1d93e46a4477a051457cc92814713da320cb26ebf8d9868d2d4909637eed10d0acb WHIRLPOOL 1305a9f144741c508b84799d809b7690b3126c08e5c1bb875d81670f89fb10fe3521fbe49951f4b9c4265cddcb583409d7d43dfa7b62f456b7b8cd91a8490fd9
 DIST VMware-Player-4.0.4-744019.x86_64.bundle.tar 129710080 SHA256 8584e18a4cbed8ce19bd239f8e1cbc2cccd17e2d016faba93fd685a160dade21 SHA512 ba3894fc942e67940d4c2f98f567ee46786a77dc21615ced01314b6dca9919469924bf4c96fdf08ab2443365de03f6a652ca595b6cbb13990ca3671282d01679 WHIRLPOOL ed123a9b22eb1d4fd03afa3b854f3e7d1f12400da75882892f561de3f44860ec67a18a779510ec70715534c03aa21c858721dd92be66a2384152d6a964728ce9
+DIST VMware-Player-5.0.0-812388.i386.bundle.tar 215357440 SHA256 5f9c193265004839e28a85e4d6a9130a50999ee88d89d6a31fa281d0d71d2765 SHA512 6e429db4d23213e134389a85ac82623d90fd6cca69403ae53702bc35117395eb3b820ee5a1a73db5709918f1897f2b59ba06cac46cca3e9bd0bd6c92bb17197e WHIRLPOOL 431522fc37cd18c83bb89953830c4b5bc72b18163cba43ab7e080396968485e54abcd8bc5471c29ea46fcf1463c5a82ef948def40d89076e0ba6cdf61bd771e7
+DIST VMware-Player-5.0.0-812388.x86_64.bundle.tar 183685120 SHA256 730cf701c73bbe52b0470a2abe9f9b2ae4845f61cea6e648fb1ae212a59af4be SHA512 c1217b409178c1e774a45702eff523cb1556ad612c89525fae54b5aeef38e4a5e06184296eeadad972d6f0a40e2f9cf8fc86262954ad47ad049053922a6a5b97 WHIRLPOOL 9f2bd41e034332d70aca0728374de1be13ba2b3bca0fd80efab51e19fd24989b5944aae46a37112fa351c8cd8c4c76083afc08c8ffde2d96bbdca7b4a3f06774

diff --git a/app-emulation/vmware-player/vmware-player-5.0.0.812388.ebuild b/app-emulation/vmware-player/vmware-player-5.0.0.812388.ebuild
new file mode 100644
index 0000000..3d10aab
--- /dev/null
+++ b/app-emulation/vmware-player/vmware-player-5.0.0.812388.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/vmware-player-4.0.4.744019-r1.ebuild,v 1.1 2012/06/17 13:09:54 vadimk Exp $
+
+EAPI="4"
+
+inherit eutils versionator fdo-mime gnome2-utils pax-utils vmware-bundle
+
+MY_PN="VMware-Player"
+MY_PV=$(get_version_component_range 1-3)
+PV_MINOR=$(get_version_component_range 3)
+PV_BUILD=$(get_version_component_range 4)
+MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}"
+
+DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
+HOMEPAGE="http://www.vmware.com/products/player/"
+BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/player/${MY_PV}/${PV_BUILD}/linux/core/"
+SRC_URI="
+	x86? ( ${BASE_URI}${MY_P}.i386.bundle.tar )
+	amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar )
+	"
+
+LICENSE="vmware"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="cups doc +vmware-tools"
+RESTRICT="binchecks strip"
+
+# vmware-workstation should not use virtual/libc as this is a
+# precompiled binary package thats linked to glibc.
+RDEPEND="dev-cpp/cairomm
+	dev-cpp/glibmm:2
+	dev-cpp/gtkmm:2.4
+	dev-cpp/libgnomecanvasmm:2.6
+	dev-cpp/libsexymm
+	dev-cpp/pangomm:1.4
+	dev-libs/atk
+	dev-libs/glib:2
+	dev-libs/libaio
+	dev-libs/libsigc++
+	dev-libs/libxml2
+	=dev-libs/openssl-0.9.8*
+	dev-libs/xmlrpc-c
+	gnome-base/libgnomecanvas
+	gnome-base/libgtop:2
+	gnome-base/librsvg:2
+	gnome-base/orbit
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libart_lgpl
+	=media-libs/libpng-1.2*
+	net-misc/curl
+	cups? ( net-print/cups )
+	sys-devel/gcc
+	sys-fs/fuse
+	sys-libs/glibc
+	sys-libs/zlib
+	x11-libs/cairo
+	x11-libs/gtk+:2
+	x11-libs/libgksu
+	x11-libs/libICE
+	x11-libs/libsexy
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXft
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango
+	x11-libs/startup-notification
+	!app-emulation/vmware-workstation"
+PDEPEND="~app-emulation/vmware-modules-271.${PV_MINOR}
+	vmware-tools? ( app-emulation/vmware-tools )"
+
+S=${WORKDIR}
+VM_INSTALL_DIR="/opt/vmware"
+
+src_unpack() {
+	default
+	local bundle=${A%.tar}
+
+	local component ; for component in \
+			vmware-player \
+			vmware-player-app \
+			vmware-vmx \
+			vmware-usbarbitrator \
+			vmware-network-editor \
+			vmware-player-setup
+			#vmware-ovftool
+	do
+		vmware-bundle_extract-bundle-component "${bundle}" "${component}" "${S}"
+	done
+}
+
+src_prepare() {
+	rm -f bin/vmware-modconfig
+	rm -rf lib/modules/binary
+}
+
+clean_bundled_libs() {
+	ebegin 'Removing superfluous libraries'
+	# exclude OpenSSL from unbundling until the AES-NI patch gets into the tree
+	# see http://forums.gentoo.org/viewtopic-t-835867.html
+	# must use shipped libgcr.so.0 or else "undefined symbol: gcr_certificate_widget_new"
+	ldconfig -p | sed 's:^\s\+\([^(]*[^( ]\).*=> \(/.*\)$:\1 \2:g;t;d' | fgrep -v 'libcrypto.so.0.9.8
+libssl.so.0.9.8
+libgcr.so.0' | while read -r libname libpath ; do
+		dosym "${libpath}" "${VM_INSTALL_DIR}/lib/vmware/lib/${libname}/${libname}"
+	done
+	eend
+}
+
+src_install() {
+	# install the binaries
+	into "${VM_INSTALL_DIR}"
+	dobin bin/* || die "failed to install bin"
+
+	# install the libraries
+	insinto "${VM_INSTALL_DIR}"/lib/vmware
+	doins -r lib/*
+
+	# install the ancillaries
+	insinto /usr
+	doins -r share
+
+	if use cups; then
+		exeinto $(cups-config --serverbin)/filter
+		doexe extras/thnucups
+
+		insinto /etc/cups
+		doins -r etc/cups/*
+	fi
+
+	# install documentation
+	if use doc; then
+		dodoc doc/*
+	fi
+
+	exeinto "${VM_INSTALL_DIR}"/lib/vmware/setup
+	doexe vmware-config
+
+	# create symlinks for the various tools
+	local tool ; for tool in thnuclnt vmplayer{,-daemon} \
+			vmware-{acetool,unity-helper,modconfig{,-console},gksu,fuseUI} ; do
+		dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}"
+	done
+	dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer "${VM_INSTALL_DIR}"/bin/vmplayer
+	dosym "${VM_INSTALL_DIR}"/lib/vmware/icu /etc/vmware/icu
+
+	# fix permissions
+	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks}
+	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/{wrapper-gtk24.sh,libgksu2.so.0/gksu-run-helper}
+	fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats}
+
+	pax-mark -m "${D}${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx
+
+	# create the environment
+	local envd="${T}/90vmware"
+	cat > "${envd}" <<-EOF
+		PATH='${VM_INSTALL_DIR}/bin'
+		ROOTPATH='${VM_INSTALL_DIR}/bin'
+	EOF
+	doenvd "${envd}" || die
+
+	# create the configuration
+	dodir /etc/vmware || die
+
+	cat > "${D}"/etc/vmware/bootstrap <<-EOF
+		BINDIR='${VM_INSTALL_DIR}/bin'
+		LIBDIR='${VM_INSTALL_DIR}/lib'
+	EOF
+
+	cat > "${D}"/etc/vmware/config <<-EOF
+		bindir = "${VM_INSTALL_DIR}/bin"
+		libdir = "${VM_INSTALL_DIR}/lib/vmware"
+		initscriptdir = "/etc/init.d"
+		authd.fullpath = "${VM_INSTALL_DIR}/sbin/vmware-authd"
+		gksu.rootMethod = "su"
+		VMCI_CONFED = "yes"
+		VMBLOCK_CONFED = "yes"
+		VSOCK_CONFED = "yes"
+		NETWORKING = "yes"
+		player.product.version = "${MY_PV}"
+		product.buildNumber = "${PV_BUILD}"
+	EOF
+
+	# install the init.d script
+	local initscript="${T}/vmware.rc"
+
+	sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
+		"${FILESDIR}/vmware-3.0.rc" > "${initscript}" || die
+	newinitd "${initscript}" vmware || die
+
+	# fill in variable placeholders
+	sed -e "s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g" \
+		-i "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}} || die
+	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \
+		-i "${D}/usr/share/applications/${PN}.desktop" || die
+}
+
+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 "/etc/env.d was updated. Please run:"
+	ewarn "env-update && source /etc/profile"
+	ewarn ""
+	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 ${PN} 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-tools/Manifest b/app-emulation/vmware-tools/Manifest
index a9b6dfb..f136c9f 100644
--- a/app-emulation/vmware-tools/Manifest
+++ b/app-emulation/vmware-tools/Manifest
@@ -2,23 +2,35 @@ DIST vmware-tools-freebsd-8.4.9-744570.i386.component.tar 18636800 SHA256 14e678
 DIST vmware-tools-freebsd-8.4.9-744570.x86_64.component.tar 18636800 SHA256 555a1d6998b85a33ea1fc4f00e67fa034ef413c0f6e3c48125b5ee94f3ece06f SHA512 331f3d10645813a2b3e879c5e0a523bd908a4508a79425697f4d355a141407a20190c76bee66f67860b40ff22385dd48d2bd5cd3886ba539e9dc8ded07bfab90 WHIRLPOOL 9306e095e7e8749ee134e3be8e0c514a24090c651be400bf272197fcbc94b44d62cf10b01887da6579a7ca3fcc403814a39377477bb72c7a513a717b5eec679f
 DIST vmware-tools-freebsd-8.8.4-744019.i386.component.tar 15667200 SHA256 bfd990e4a9244b075854178b338df397218a2efb11b5e4c12e47c762d3c7678d SHA512 be065b72d8259b0bc8ccc5f6621c0e1ce3e317d5886054eb5f7ed7c3c1ea1cfdd6da66f823af904182a193dd1980d0de8a8db494aa03608941f91d6d8b437e93 WHIRLPOOL 3552d6a7b301bb6e16e03afb90b2d01e3d512c1aaebc59f796777a1265dd29363ecc1bff801182ead1d9d6d15cd7f14ff74f2a2cf17141eab3f9e563e0e30716
 DIST vmware-tools-freebsd-8.8.4-744019.x86_64.component.tar 15667200 SHA256 a2eba283bce8a1b5695e0827cb36d8f5332fc06041d21dab3edcbf919d1c9f5a SHA512 8967473e47a2129d44e38440516590dc539acd8e1de9ae34e53dfa75b46ff3d04fcaa407794484de73710085cc86d36ffcab1cbce2a63c658c870e5999921138 WHIRLPOOL 37677b89d5945be0ba2754b4afb7f688d0a07c33816392f61989857353298c4cc114d287cfff2fc886a75bcc20c64bbd922675220506539557da6b7203a4d816
+DIST vmware-tools-freebsd-9.2.0-812388.i386.component.tar 15185920 SHA256 f8ea21959a5ce40915392f2164e3debad75dc8c648913c21a521838fd172734d SHA512 c4d269e756318135b2fa1530c740c45e6ccd0b0197a9d5be1fbf52bf201a57cfc65e951ad9b4e28936aee14ba2866e88d735f2210ee89fd3f0add7a13b90e8b3 WHIRLPOOL 2b1dff56a6f9909c6726f45d243a7b05b6962d5843cd3b63856e2b7b0d39d83d725a0b81e1f5c614eeda84ae39df19151e45136d07acf20ee1045879846e6604
+DIST vmware-tools-freebsd-9.2.0-812388.x86_64.component.tar 15185920 SHA256 370615af11a6f6bde33f7b2caf194f0917cbfbefe9c5a191b55efe5f64aaaa43 SHA512 72da82238b6e2edd28c06a72a9dfae18de0a9bef75c1d71e5d8e1b9f9c75683da517d67671c266c5f9e90dc05f00227fe77e4b63811c935b78680b6e39f949b9 WHIRLPOOL 07b6a9bcb04db5ca54bdb2cddb6d68d9070701ee4a652ce87ca4d653e84f0e41ec4268033f67bac70306af06b7cf3b25046cad34e0128f178b9297b608990da2
 DIST vmware-tools-linux-8.4.9-744570.i386.component.tar 107786240 SHA256 eb623c34b03dd271e68dc61bf1c02b0a8be6066b2304327f071e06879b9dc8d3 SHA512 dcd6f72de69cb0483b4f03dca7ad7370101eb08edb1ceac2c0eba294d5a17ec9a7c34a64d0de9cbb35203ea07830590f811d8c370e044b1f967c6d444250320a WHIRLPOOL fe2ae28a47c86277447c31a0a1420b1039f50eb1f716661d4acbe4e62bb63101251921e7d9a7e2d93cd83f5229f94ea8c06dbc40336b003fccee0f3ca8fde59a
 DIST vmware-tools-linux-8.4.9-744570.x86_64.component.tar 107786240 SHA256 30c9eec5ebf13d224cf01b321f858d8ef8ee16c823f42c96f94e63eaec1b9566 SHA512 53e82445551d21a283f2521440046c5d0187b0a6b721de588fd1082ea425a853ff7f22067c1f9121c1a48e16cdf25f3c16de027d1f06aabedb3d3df37495c27c WHIRLPOOL 64dbe421a0ac257597f85591a3b33c8f4e09c5825459afbcdb0eb3c7fafceb815ed4aac29f36bc9f940a6304e8ab7046977b4192fc3c23f4e7e0020c23f43e28
 DIST vmware-tools-linux-8.8.4-744019.i386.component.tar 60129280 SHA256 1abac226110078a8fa373f1c8b12efbf2a1438badb2dbe570103b83b8a245641 SHA512 177ac6f66d992551364e243ca5de1dcd742c67b7d848ce11e126017085c22e4f0dbb23f4b3881c0f5eb742f8c5d506f8db00039e6e86a0eadb9a7f0807342f57 WHIRLPOOL 137185d451953656a7677ee645152dd2ce6e6a473eed9eda19756b8ae5500edb2cb8a282853d406e8433d10346dbe2e144bf784097e30a7df2a1b110c6c55156
 DIST vmware-tools-linux-8.8.4-744019.x86_64.component.tar 60129280 SHA256 e704118d03b0303c79b622bc5dde60c0a172e7caaa6a1b7c7c467fe9707f9a1a SHA512 f5311201235732d5012d7ad342661b80e3482190644477699b16502570efa746933be72fa11c1887a5f64a290c11f409975f953b8d62b61ffaf6818e6ebeaf84 WHIRLPOOL 65e35f64e988e4bbb0d411176bf1daa81d17f29d838036f268e51643cb218520fc8210eaf72944da2d21c25d0d333dd8cfc58b739f07f7779400081d7644ce6b
+DIST vmware-tools-linux-9.2.0-812388.i386.component.tar 65566720 SHA256 7c751e31b7f83d185d6d48d870c3ee353e1b5456e7cfeaa11ece4d1e270efad1 SHA512 6ab53259a99f97dac85ebbe230fafa76ec3c2983b6af9e63b046ccc71f6218a91b3c907c3f50bfae8dc6c4002bbaf4cd1c0f2d0da02f67df509b693091aa7243 WHIRLPOOL c5ffcb4e61303e2937c71468fe2aece93853fd78842fb6cecd90537db1ba3e862394be13334aa5b2c2f0ddffa2787dc4d5b51079c1ec3f8591433b3462064c71
+DIST vmware-tools-linux-9.2.0-812388.x86_64.component.tar 65566720 SHA256 d70e6ed3a4d235a5ec4cf47a73efb907180ff9b00f96acbda3dc61318dc29840 SHA512 b0373a47a1f1ece9f0eca329e49e1272e92eff24c3857b5013a5ac7bc096a5808494f38e4b6408cae50680bc0ec29eca685460f4558d8813a06e11d15c747524 WHIRLPOOL e363e2e562078fc03bd2368bdf4e86f51c104ad033a960cf1db7c8664d613332ee16aa5d77ddda41d68a07080a87825d1145d16b2df81d0c5abe358391ff1a4a
 DIST vmware-tools-netware-8.4.9-744570.i386.component.tar 81920 SHA256 97c7acbca92b27084326bab7598534552f8d4537924b0cf7633425f61c306519 SHA512 0452d8b216b8c4b9541d9a02611871dd9523fca1d5c741b0d6f7532cea7b0a8e7238b46254a65ccf8c1b99b72b109f8d13b5c4678cb81f5d0b19d4a9ea5f8c6f WHIRLPOOL dceb43d44bb66bab69700b739a580396459656d937ea6d25e6bdde790644dca161f444469ba16eba91754ad3a2a443375134996a3effef9161c45e1c5d12c2a2
 DIST vmware-tools-netware-8.4.9-744570.x86_64.component.tar 81920 SHA256 a3256cc804c0f73e5e01a1b0e81827a7dfbc42d4cda701e1b19bf6961a617af0 SHA512 c2c8207efb2549aee64f6b55944b750076f801599e06d3459bafc7703f3b3d0bb366239d4d4d53a277db23b156a7cd71abb7ae4190fccc83b39da4c86010084f WHIRLPOOL 04dbec8f78ce8bc0fff960dd015a511000ee519e76c0c23c27150b98b9942de67010ac4c050e8be9b2937569be4705214e3a4b7907be46e7bd24d45af01c0bb8
 DIST vmware-tools-netware-8.8.4-744019.i386.component.tar 81920 SHA256 bc77ece95283d4986c753f7696575d2bfac520a68f150de314cee9ac00877e2a SHA512 704c1d86fad22da21061a8a9d8aea8a10e6f100c06bf2f0de7c4f4c97cc563a60ed47f8c15753f6460801dc2d23e27abbe348379730cfc4ca188df5fe67cd5b5 WHIRLPOOL 41e9b7247fedb9f6d2c53895b3a31449c613191dc115beb6f48b00c0c260885514ea3d094953ada92ddbdb8a8a496274d36492143826d45a9b9a35a55d69df84
 DIST vmware-tools-netware-8.8.4-744019.x86_64.component.tar 81920 SHA256 0ef595aeaf23188bb16599c2c2bf918826c1830a77b6aae967c924eac27cf3be SHA512 11487f536c83ee02ec70fd1bf97be7fe35b3ef4df9173fdd351c167bdf5b72569a6d8f9ee6b4c8fe5d59d464a3065c4a9fc8fc8823b1e06474d6e8f873d9eb57 WHIRLPOOL 871166f6c5f0b27d2bfb66502494bac91873b356b7c4e52f0992487ca768af38347ae0c3f262fb532825429ac909a3e34fddb51483fc5fda3022c01ca42b1b64
+DIST vmware-tools-netware-9.2.0-812388.i386.component.tar 81920 SHA256 9462ec8a8d5a27b348de3f5bf7b0f5eecc28782781f2eefc314577cfc3fa5d45 SHA512 c5218a91b848f39753b8708ac9c259ae649759a198806063d422f099863a651b371026c455e93e6ff2a342c0f9d691a6f51082a42c7e065bccb0804edd20a2f1 WHIRLPOOL 73f7c78558b5fa89fea490b961b22a56251152f75903eb9a2173d0de743bbca8fbfed2639166c69ca9d68728635592f63ca3f5fcc8be8587b4beb1215c20fbec
+DIST vmware-tools-netware-9.2.0-812388.x86_64.component.tar 81920 SHA256 bb85e3a72faac260b43134ebd12cb4828d5e14460353906d4bf59f6b0150c218 SHA512 5ba9dbd24c8de7435ac91d51e09ddd9ea67e6e8a06fa46c573c67584ed2156b955971ceef5071b2e1aa4eb8bfda2f0aa409eb2a775f538f12281a4a41fcd07c7 WHIRLPOOL ca06a34527d4ddb5f8a8be26e72914e381d88af215a1fc8aa0f66d671d8f44218346eaffe893e1e5a72b7b858e64b322d33417130ef4ef84e379f0c0208f8619
 DIST vmware-tools-solaris-8.4.9-744570.i386.component.tar 20049920 SHA256 12f868ff8015de412edd98e51f2bb6d4c016de87244916d207203003c44450fa SHA512 f2b7d5c8a8b25ccbdf6616e7383bbfebb302485040e2aba88f03afaf21761ec87360f64b3d88381e0d3668eb58986ea33fc635e076a2a85a7939fa380267933d WHIRLPOOL 9cdc91ab8f96d5dd5810deebe7b881aadd15b0c190779b3213e8a8b4ee5ff5fe2a097bb3479238010d733e350dc83f0ca38b5739f5cf438b22d95089574ad75c
 DIST vmware-tools-solaris-8.4.9-744570.x86_64.component.tar 20049920 SHA256 d0946fc5d4d798c237b4f8f38a154e288fb8215e1910a0818a18913814e69b59 SHA512 e5d927ea3e54912396914199f83dbe18e400e6fbc4e109341055972944cfdfafaeead0d792f660d0695ce8f02f0ba70260dbe1a4dedc0cf234e1f288bc0280bf WHIRLPOOL a559282842a8da2ddf9a92a44f5e33e2beb31ec58ef36bdaec688b42b44832dada1c15dec71ecf5677cc9fff68290a6a14d298babe8625555766b2c9d5acd953
 DIST vmware-tools-solaris-8.8.4-744019.i386.component.tar 12779520 SHA256 c11c549fff28288f0402169fb23967ced04209511603959e3da434ae293deb9b SHA512 f84ea504a4c2cdfd50c845355e1c94ce77c3c3b47f38bb8c1cd15c7b7aee0ebb233794e1033d14421ea4951e385522e2889e919dc5f691436e313f473048d386 WHIRLPOOL 87a77b407d26c5856fc392b0d9e6e8ee14dd709c8f335567ed5af63590789a1b8de1e98214897496bb42e9f15baaa8acef23ada0aa1eaf0b984483fe861c8b45
 DIST vmware-tools-solaris-8.8.4-744019.x86_64.component.tar 12779520 SHA256 9aa323485ed61a248d0c403578a9a6802fd13486275cc3b40b11510436aab7e4 SHA512 4fbbe16fc5ecd4bd14a6df47c7619faa7e418abf9c58466785b839993ccdf966e21244026acee84e20e2b2ed6f2c2c16b74d1e02171a7ed22711ca4a394833aa WHIRLPOOL 76faa26f5e71b208919fd6a13441cf6ecd9e7467efdd7be9a765b91b0ff70780bb120b95e43f2c9b4b711926b3a618f6e9a5cbf2a9664e8020cfb19adaa9a636
+DIST vmware-tools-solaris-9.2.0-812388.i386.component.tar 12359680 SHA256 f45d43b2bf9e1d5a49d03010b588ae2d79c987d6100b2da3758c27e484a67232 SHA512 f93ad4f21d0cee6e9d03c6f99d9a16045524f70f6d1c318f2fe28436a27c15262fb85fe9dc6c5a50d7031c6e1affcc31bc535282814b16a3209a471e9b4710ad WHIRLPOOL 18f57d938dc3ef214915ea1c0260032ad14ae1527a0d5739edce6c52b00f4ac6315e30b59e2ec149ec4279e4b2f42b1bceec1162cbe38bb10c6310306244ac68
+DIST vmware-tools-solaris-9.2.0-812388.x86_64.component.tar 12359680 SHA256 0b75c69a90db0a14a6831cadbc31716a0d6a1b70865aa0586db1ce235be8d9ff SHA512 a1cef91d94775292561fb0a8e66313dcd4f44a953f6167e583e0b86337c620992a8fa2531f5c6bddc20893eb24b2df699396905e3c1317f05f7488bb0603aca3 WHIRLPOOL 22b5d179a0cb71cc7b699b5bbae3888f30be48690f0fd0bd009b2218be2f68219f080eedc656e22a2046e716bbee24b9f8ee25896506615b15a0329b2101f543
 DIST vmware-tools-winPre2k-8.4.9-744570.i386.component.tar 11059200 SHA256 7e203ff59853450256389b4d7540a6ec30feb9f8fff238d579b1a2057418a94c SHA512 22d2d6b5d6c8abc9af89fc5a5afd1836322f1f9974a1e205873525989473682c5284f7bf959567ad083dfde1cd61d6b91c697564e845f5e0b3a5f01f59741b63 WHIRLPOOL eab49f5f482971b2cbaa6d5dfdfec1b1e73971fb37e08373601b2d2e04b55b0a9e7f3d89bd46e0aba2a3262ef89e41a835a7d547b803d871125f797edfaf7b90
 DIST vmware-tools-winPre2k-8.4.9-744570.x86_64.component.tar 11059200 SHA256 6cc456e8162762f0d1ea8bf2f3595ab6943b9f0bb2954f60f91966c1dcd5dbf5 SHA512 b8976b16953b71b18a575b2dce25d184a0aabbe9408d9c01dc0a136d6339f7e26fd1440fbd08a1897cdb5568c21f9842f6b6a43105697a1f8d473955d5879e4c WHIRLPOOL ce4122f8d053a0ec5a831f3e0f0bafd01519cde9762aa039c4fbd74c653efc4524d99093402c7f59e97d93254576fac7065328d6acff5e4e2182d8fd3302f5df
 DIST vmware-tools-winPre2k-8.8.4-744019.i386.component.tar 11253760 SHA256 71c7c2be7ea2e2c344c6d9cae4883c6c14470ad7693c0228379a597519da8a83 SHA512 3c6196ef217053d8bc99597f8393ab3678b1991ce2d24838f67df6ce97ae884870637f1e043e6c8047006546624831d38a3038fb14b5a2f165117d6d2c3d8dc6 WHIRLPOOL 967b33c3fadd97eb11c2c673317423ea0bd617e03ec958a70e08c5526be9c5a5b95ad26feba2f1189ce5df81f8e3f85818c0e59b2079ee5ae4a5cdc1191b5a10
 DIST vmware-tools-winPre2k-8.8.4-744019.x86_64.component.tar 11253760 SHA256 3d7f8443162096eb3fff52425307b26aba3619304547a650e2807c73dc50e1dc SHA512 e6d0aa710283e6dc95ced5f5f584610c82f2b471febd1b12ce2ca6814078d536e24dc2245963f1d7a45820e6cb196eb928604ee0384fd88ac0b54d2b2b144bdd WHIRLPOOL 89525b3eb4e1ce2b4e222d96e23a68a4fe3e6789282c1e4b806cba5e59e8d553eb3bfaf3cdf37d951e0c491e45d1a97154ccd68bbfe5b2e0c46ad8acb0d09ff4
+DIST vmware-tools-winPre2k-9.2.0-812388.i386.component.tar 11253760 SHA256 6ed035c4d56a420fa054b38ef6ec4b1380cd2d7b37d9dcbbfaa747fba1606649 SHA512 f265ae064e2e5bf8ea27595571d901b2fdddc2af44ca1cdc7d45c9bb3cb019afe1347def33f558e98adf3045991fa05dc3a6f990ae97af359afb3fc07a1842c0 WHIRLPOOL bf262da4e1bee3eb1c5abb53f431f9c517e8041414a23c18d91585c02f5acfb9168500c20f825732f3c975c7b3abbdf6a0b2a6c03d0427164bb5046b7f1a4ff5
+DIST vmware-tools-winPre2k-9.2.0-812388.x86_64.component.tar 11253760 SHA256 5753b13244b79f4448640cdd123c68100d961d662742112ace52bfb5db62875e SHA512 6bf74906671a684e379111008e584faeeb806bcaaa8229619dc9d6b307f63f7e5b711f49c7b5a85ba5a06a67a6d4c922bc41fc6e3675a683ad9a174218bf6bae WHIRLPOOL d599accb83bf86372504cc5d7575e74bae43784cf217994e47f7a3c5cfccec9206e6ab14db9bc871a66dffaed7b57209e47814a495ba12a8414ecd5553d0f183
 DIST vmware-tools-windows-8.4.9-744570.i386.component.tar 38246400 SHA256 27a25495b0028745093968f771d66f186071df3e91760b3c2ca7be56a3acd805 SHA512 a51f9fb2010910948c91a3bd51c1883faff94e71ef89c7446f71f0fa63a49b423033e96e1b9361ddb496fbb3fe46fb36d86c2f58c0950aba61c3c0057c1afa47 WHIRLPOOL c4e428cf0e8888e7f19b76b30b554d6b6ba9f25c272e50eeff6613631e6edabeb530bc0f2da2e212bd32b8fd9778eab32ea690428b6de02000b56c2b3f43e139
 DIST vmware-tools-windows-8.4.9-744570.x86_64.component.tar 38246400 SHA256 424ddb54ea3cd0b3f04af128023a9a7600f753ff46e8bca72294d5c3cbbab90f SHA512 be77a33ca9541d45ed0806742b9745db0bfd743bcd618c7f030e24b9f09b91df3748f6cb60268183671a6277e20dd29e2f4cc61c5c68aab0079d860e94dd73f6 WHIRLPOOL e34f9fcc13a6a7a90681cb41305a31d87dd26edf83fca1c43306aa1be207a86992897a0e01840d4a4052d40147609878b390236ed18a3ffdf8d428b348263227
 DIST vmware-tools-windows-8.8.4-744019.i386.component.tar 52254720 SHA256 60272cfb2ee1df444a29a4ed740ab6fb8f82baec7f2327452046fe2e8bbe92b0 SHA512 23b524e60271771c51cbfb0b369b5f2040d0993d1f7c32e2eba29fd9f82b444d649fad59f028e57bac31f00e5ade33c16a65b94d45379fe944b55d8a91b40fcd WHIRLPOOL a7abb96f97fb16139e3396541a3edb3b4840c3a395ace681a933e5349cba8eac0f7d105512bd56e809ced8c46936b4578129f7ed60d67fedfb556cf3325e922a
 DIST vmware-tools-windows-8.8.4-744019.x86_64.component.tar 52254720 SHA256 c2299b5689cbf8a9a516c91a34cefd4cf0721ab1ac0173ff88756d48c7baa4ba SHA512 706d359a6f94fcc936524e90daf73e957f1f95980e3a232dc268e9a9522fd9f12b1c238b61d30fb70e0f39502c18228528789b133bf67c3d6041af833a107d37 WHIRLPOOL d92a45db451bc6eb54363b0c54638523f5419e16c742cfbf23bbe58d80c1a8e400be36fcf5cbe8b8830f095fe0529c565e27823766e15dd79f9ee3e84db13484
+DIST vmware-tools-windows-9.2.0-812388.i386.component.tar 61736960 SHA256 52e455cd8020ce14f4ef6f54c97f4f8ca004a2446f4a8e3d70deb557c98c9d8a SHA512 821a66ad8d9ada938f713e9bc29554e1c2208cd5cdecfa5ecb09fab8f8948ce285cc1bb2dd13a679a80f01bbe0c0a91aba8a90ec0ad9ad0ca3bebf160d2bacb5 WHIRLPOOL 9f7102851bf376ab114398ec9a58f8e83d535c9ecbc6bf9dfa23e4e11d3178d374e2f440acb6331168d2c14597123c8c518f9fd2f0f6ce3ce3db2ec58e8efa03
+DIST vmware-tools-windows-9.2.0-812388.x86_64.component.tar 61736960 SHA256 b718d4239ba3ea6f5be0e244eefab91f12b10e60e3429ad0bf6adacfcc3db359 SHA512 ba81c41b96331ac915c66a7d906a3d9f4fe464f85e92cbb8f7b25f7a778b0239fe405e81b9de0ea9b7a22c9ebadaddfcc6214d3c790cfdac41f8a57a07fa1848 WHIRLPOOL d39e43fdbe520c2e53f37eeec46259891007559563ee466a2dc8456efa7510316f3dbeaabd826ca4f77634289a59aaa4777c0984eb8074c3309371d507f0151d

diff --git a/app-emulation/vmware-tools/vmware-tools-9.2.0.812388.ebuild b/app-emulation/vmware-tools/vmware-tools-9.2.0.812388.ebuild
new file mode 100644
index 0000000..c1d97f4
--- /dev/null
+++ b/app-emulation/vmware-tools/vmware-tools-9.2.0.812388.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-tools/vmware-tools-8.8.4.744019.ebuild,v 1.1 2012/06/17 13:10:27 vadimk Exp $
+
+inherit versionator vmware-bundle
+
+MY_PV="$(replace_version_separator 3 - $PV)"
+BASE_URI="http://softwareupdate.vmware.com/cds/vmw-desktop/player/5.0.$(get_version_component_range 3)/$(get_version_component_range 4)/linux/packages/"
+
+DESCRIPTION="VMware Tools for guest operating systems"
+HOMEPAGE="http://www.vmware.com/products/player/"
+
+LICENSE="vmware"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="mirror"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+IUSE_VMWARE_GUEST="freebsd linux netware solaris windows winPre2k"
+
+VM_INSTALL_DIR="/opt/vmware"
+
+for guest in ${IUSE_VMWARE_GUEST} ; do
+	SRC_URI+=" vmware_guest_${guest}? (
+		amd64? ( ${BASE_URI}vmware-tools-${guest}-${MY_PV}.x86_64.component.tar )
+		x86? ( ${BASE_URI}vmware-tools-${guest}-${MY_PV}.i386.component.tar )
+		)"
+	IUSE+=" vmware_guest_${guest}"
+done ; unset guest
+
+src_unpack() {
+	local arch
+	if use x86 ; then arch='i386'
+	elif use amd64 ; then arch='x86_64'
+	fi
+	local guest ; for guest in ${IUSE_VMWARE_GUEST} ; do
+		if use "vmware_guest_${guest}" ; then
+			local component="vmware-tools-${guest}-${MY_PV}.${arch}.component"
+			unpack "${component}.tar"
+			vmware-bundle_extract-component "${component}"
+		fi
+	done
+}
+
+src_install() {
+	insinto "${VM_INSTALL_DIR}"/lib/vmware/isoimages
+	local guest ; for guest in ${IUSE_VMWARE_GUEST} ; do
+		if use "vmware_guest_${guest}" ; then
+			doins "${guest}".iso{,.sig}
+		fi
+	done
+}

diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
index b338f29..c16279a 100644
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@@ -2,5 +2,7 @@ DIST VMware-Workstation-7.1.6-744570.i386.bundle 130391795 SHA256 fbeadabe7c0929
 DIST VMware-Workstation-7.1.6-744570.x86_64.bundle 137422513 SHA256 1a0694349393ce326f62c291d76c1c5e8d5473b49bf986476e1485df422a2f8f SHA512 df72b0c770f9e356efd1bbffe2c596909f193bc2100a015cfbab819fea017ee735fcc932180c0cc5ffbe8223fa66a06dcd35e34d183b06f71c7ba937c440e2fd WHIRLPOOL e7b50e706b88e30801ccaeaedf59f5fbdf06342d8566a65b3cb19ec2c433da52768b55f9e5e58e274071c284d38280e0635f8a9c3fd2d01f53037c1082d15af3
 DIST VMware-Workstation-8.0.4-744019.i386.bundle.tar 189839360 SHA256 5b469de4f583fc0d33750253244c23e0f6a9d5b713e8d46ea3dd07f01af2b5ed SHA512 f0b17262594bf613a971c49843eec8fd1182a031c0cdca91824a1c6a0315e87183c0d99f6e37e2aa3a9a9a00f57efbbc6ff155094aa6cc776901177697aa8e49 WHIRLPOOL bf5a7a2f8c7cfc53fe2d0dfbe1b8b1fa9452a3eb0a1b5a70363dab4bd23c86a628a3938b5c5c30301639ea748347230fc3ad0b8977dabc1c2b828f6dde81b1f1
 DIST VMware-Workstation-8.0.4-744019.x86_64.bundle.tar 189552640 SHA256 83cdf3f4cf99afdd3e9685b5cc50f613094cc24e7502a2dc577f05640382a6c5 SHA512 87258301b157f9bade30094a02a5f3749342b00ccb5b1359d10152331d3d257bb1afe23fa7b68c973e2f4e2b9e9afc7ca52e99118041e1d45be3099f8d10d51c WHIRLPOOL 1bf6ce95e63042bb47971c36f55f943ef8ce736c5f9355fe7afbc114a09f716277199a847af041bd467cdb02170414bd660bafa54cce59029347e27ffda6eb73
+DIST VMware-Workstation-9.0.0-812388.i386.bundle.tar 260454400 SHA256 83817a65baf04d435ec7aaab7c10c452334dcec2823edf0ead18a56ada0ffe7d SHA512 fc2641bc2ee6bec92212bcb90d01319ed99d03035cf90ddda92eec002576eb5b2da47d7db5d9424e54f7f2be49d51dd8df2c7b4469f9619671af6150b09ef377 WHIRLPOOL 3024a1e94c191a59db1f531f19ce3ff839d4fae46f87d229f1f1976c415d4e1fb7a9f57aa23d5e40cfe900cf7302c8ad4f0d2fccfde5d9e58e5bd243d3f0f262
+DIST VMware-Workstation-9.0.0-812388.x86_64.bundle.tar 231229440 SHA256 9db082b4c86994923a3f127dbcac847099ff1e45953f866ff24acf3ddb6a5263 SHA512 e5cae5a4fe254beb7800427575b91eef4e0e8255025861a7c6f47eb92632693842ffd7ecf3bc3e0972391490d2732212011a30fc21024cb589a8419431fa1b4a WHIRLPOOL 3aeb234dbb4f3bfe3fcc124265eaad84bfe62142dd973e0a6dae17b7c3f297ee51652e496d4f1e31877fdebaf639303cd05225f02757444db29ae4e4afaaa5e4
 DIST VMware-Workstation-Full-8.0.4-744019.i386.bundle 341955503 SHA256 bdc4298f2733578281370dd08784216b36dadc460fcd767d70c30796530a2477 SHA512 4e228e047438777a6345e7a7de95d2faadc6f02ab2563996ccbeaf8cc8f50786099bcc9fb311fcea8dcbce26cbdf224dcc26b2dd6a0adb2fa418347d8a9357b1 WHIRLPOOL 825097fb2d4cd10a4b6955ecc77c7eea009d4981e44a5284c19fe3b16f33af1cc9ade8735e7d61443e6bd69cf3df97a6564cf49871526e0e174e5ce39d44961d
 DIST VMware-Workstation-Full-8.0.4-744019.x86_64.bundle 341672831 SHA256 ba60f215ef501f89ed97f64e5cd13c4462c7eb6c6d0441008dfd035cb4020f3c SHA512 e7778550a96971dabad732f85495e14583343f9e15dd42bfe5c30f3d63a4d1ac8bd978c4aa069c433633761dcebc3debde24b18aecf0af371c10ad7480c4b006 WHIRLPOOL 0187ef2809e328a8cca200a68f397c162c8ea49e23865dbcac2df17f575931e8ff2f9bb5aaa709f6bbfcd2eed5432641060a2df44b66f4b46c79f0fa3dc34c11

diff --git a/app-emulation/vmware-workstation/files/vmware-9.0.rc b/app-emulation/vmware-workstation/files/vmware-9.0.rc
new file mode 100644
index 0000000..ba9d82b
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/vmware-9.0.rc
@@ -0,0 +1,33 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+depend() {
+	need localmount
+	use net
+}
+
+start() {
+	ebegin Starting VMware USB Arbitrator
+	#start-stop-daemon --start --exec @@BINDIR@@/vmware-usbarbitrator
+	@@BINDIR@@/vmware-usbarbitrator 
+	eend $?
+	ebegin Starting VMware services
+	modprobe -a vmmon vmci vsock vmblock vmnet 
+	eend $?
+	@@BINDIR@@/vmware-networks --start
+	eend $?
+}
+
+stop() {
+	ebegin Stopping VMware USB Arbitrator
+	#start-stop-daemon --stop --exec @@BINDIR@@/vmware-usbarbitrator
+	killall --wait @@BINDIR@@/vmware-usbarbitrator 
+	eend $?
+	@@BINDIR@@/vmware-networks --stop 
+	eend $?
+	ebegin Stopping VMware services
+	modprobe -r vsock vmci vmmon vmblock vmnet
+	eend $?
+}

diff --git a/app-emulation/vmware-workstation/files/vmware-server-9.0.rc b/app-emulation/vmware-workstation/files/vmware-server-9.0.rc
new file mode 100644
index 0000000..302db72
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/vmware-server-9.0.rc
@@ -0,0 +1,55 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+depend() {
+	need localmount vmware
+	use net
+}
+
+checkconfig() {
+	# Check if certificates exist.  If not, we need to generate them, ala sshd.
+	if [ ! -e @@ETCDIR@@/ssl/rui.key -o ! -e @@ETCDIR@@/ssl/rui.crt ]; then
+		mkdir -p @@ETCDIR@@/ssl
+		openssl req -x509 -days 365 -newkey rsa:2048 -keyout @@ETCDIR@@/ssl/rui.key -out @@ETCDIR@@/ssl/rui.crt -config @@ETCDIR@@/ssl/hostd.ssl.config
+		chmod -R 600 @@ETCDIR@@/ssl
+	fi
+}
+
+start() {
+	checkconfig
+
+	ebegin Starting VMware Authentication Daemon
+	start-stop-daemon --start \
+	  --exec @@PREFIX@@/sbin/vmware-authdlauncher
+	eend $?
+	ebegin Starting VMware Workstation Server
+	start-stop-daemon --start \
+	  --pidfile /var/run/vmware/vmware-hostd.PID \
+	  --exec @@BINDIR@@/vmware-hostd \
+	  -- -a -d @@ETCDIR@@/hostd/config.xml
+
+	eend $?
+}
+
+stop() {
+	ebegin "Shutdown VMs in the AutoStart Sequence"
+	local HOHO_ADMIN="$(@@BINDIR@@/vmware-wssc-adminTool "@@ETCDIR@@/hostd/authorization.xml" 2>/dev/null)"
+
+	if [ "x" != "x${HOHO_ADMIN}" ]; then
+		@@BINDIR@@/vmware-vim-cmd -U "${HOHO_ADMIN}" hostsvc/autostartmanager/autostop
+	fi
+	eend $?
+
+	ebegin Stopping VMware Workstation Server
+	start-stop-daemon --stop \
+	  --pidfile /var/run/vmware/vmware-hostd.PID \
+	  --exec @@BINDIR@@/vmware-hostd 
+	eend $?
+	ebegin Stopping VMware Authentication Daemon
+	#start-stop-daemon --stop \
+	#  --exec @@PREFIX@@/sbin/vmware-authdlauncher
+	killall @@PREFIX@@/sbin/vmware-authdlauncher
+	eend $?
+}

diff --git a/app-emulation/vmware-workstation/vmware-workstation-9.0.0.812388.ebuild b/app-emulation/vmware-workstation/vmware-workstation-9.0.0.812388.ebuild
new file mode 100644
index 0000000..2be27da
--- /dev/null
+++ b/app-emulation/vmware-workstation/vmware-workstation-9.0.0.812388.ebuild
@@ -0,0 +1,472 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-8.0.4.744019-r1.ebuild,v 1.1 2012/06/17 13:11:13 vadimk Exp $
+
+EAPI="4"
+
+inherit eutils versionator fdo-mime gnome2-utils pam vmware-bundle
+
+MY_PN="VMware-Workstation"
+MY_PV=$(get_version_component_range 1-3)
+PV_MINOR=$(get_version_component_range 3)
+PV_BUILD=$(get_version_component_range 4)
+MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}"
+
+DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
+HOMEPAGE="http://www.vmware.com/products/workstation/"
+BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/ws/${MY_PV}/${PV_BUILD}/linux/core/"
+SRC_URI="
+	x86? ( ${BASE_URI}${MY_P}.i386.bundle.tar )
+	amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar )
+	"
+LICENSE="vmware"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="cups doc ovftool server vix vmware-tools"
+RESTRICT="binchecks mirror strip"
+
+# vmware-workstation should not use virtual/libc as this is a
+# precompiled binary package thats linked to glibc.
+RDEPEND="dev-cpp/cairomm
+	dev-cpp/glibmm:2
+	dev-cpp/gtkmm:2.4
+	dev-cpp/libgnomecanvasmm
+	dev-cpp/libsexymm
+	dev-cpp/pangomm
+	dev-libs/atk
+	dev-libs/glib:2
+	dev-libs/icu
+	dev-libs/expat
+	dev-libs/libaio
+	dev-libs/libsigc++
+	dev-libs/libxml2
+	=dev-libs/openssl-0.9.8*
+	dev-libs/xmlrpc-c
+	gnome-base/libgnomecanvas
+	gnome-base/libgtop:2
+	gnome-base/librsvg:2
+	gnome-base/orbit
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libart_lgpl
+	=media-libs/libpng-1.2*
+	media-libs/libpng
+	net-misc/curl
+	cups? ( net-print/cups )
+	sys-devel/gcc
+	sys-fs/fuse
+	sys-libs/glibc
+	sys-libs/zlib
+	x11-libs/cairo
+	x11-libs/gtk+:2
+	x11-libs/libgksu
+	x11-libs/libICE
+	x11-libs/libsexy
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXft
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango
+	x11-libs/startup-notification
+	x11-themes/hicolor-icon-theme
+	!app-emulation/vmware-player"
+PDEPEND="~app-emulation/vmware-modules-271.${PV_MINOR}
+	vmware-tools? ( app-emulation/vmware-tools )"
+
+S=${WORKDIR}
+VM_INSTALL_DIR="/opt/vmware"
+VM_DATA_STORE_DIR="/var/lib/vmware/Shared VMs"
+VM_HOSTD_USER="root"
+
+src_unpack() {
+	default
+	local bundle=${A%.tar}
+	local component; for component in \
+		vmware-vmx \
+		vmware-player-app \
+		vmware-player-setup \
+		vmware-workstation \
+		vmware-network-editor \
+		vmware-network-editor-ui \
+		vmware-usbarbitrator
+	do
+		vmware-bundle_extract-bundle-component "${bundle}" "${component}" "${S}"
+	done
+
+	if use server; then
+		vmware-bundle_extract-bundle-component "${bundle}" vmware-workstation-server #"${S}"
+	fi
+
+	if use vix; then
+		vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-core vmware-vix
+		vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-lib-Workstation800andvSphere500 vmware-vix
+	fi
+	if use ovftool; then
+		vmware-bundle_extract-bundle-component "${bundle}" vmware-ovftool
+	fi
+}
+
+src_prepare() {
+	rm -f  bin/vmware-modconfig
+	rm -rf lib/modules/binary
+	if use server; then
+		rm -f vmware-workstation-server/bin/{openssl,configure-hostd.sh}
+	fi
+
+	find "${S}" -name '*.a' -delete
+
+#	clean_bundled_libs
+}
+
+clean_bundled_libs() {
+	ebegin 'Removing superfluous libraries'
+	cd lib/lib || die
+	ldconfig -p | \
+		sed 's:^\s\+\([^(]*[^( ]\).*=> /.*$:\1:g;t;d' | \
+		fgrep -vx 'libcrypto.so.0.9.8
+libssl.so.0.9.8i
+libgcr.so.0
+libglib-2.0.so.0' |
+		xargs -d'\n' -r rm -rf
+	eend
+}
+
+src_install() {
+	local major_minor=$(get_version_component_range 1-2 "${PV}")
+	local major_minor_revision=$(get_version_component_range 1-3 "${PV}")
+	local build=$(get_version_component_range 4 "${PV}")
+
+	# install the binaries
+	into "${VM_INSTALL_DIR}"
+	dobin bin/*
+
+	# install the libraries
+	insinto "${VM_INSTALL_DIR}"/lib/vmware
+	doins -r lib/*
+
+	# install the ancillaries
+	insinto /usr
+	doins -r share
+
+	if use cups; then
+		exeinto $(cups-config --serverbin)/filter
+		doexe extras/thnucups
+
+		insinto /etc/cups
+		doins -r etc/cups/*
+	fi
+
+	insinto /etc/xdg
+	doins -r etc/xdg/*
+
+	# install documentation
+	doman man/man1/vmware.1.gz
+
+	if use doc; then
+		dodoc doc/*
+	fi
+
+	insinto "${VM_INSTALL_DIR}"/lib/vmware/setup
+	doins vmware-config
+
+	# install vmware workstation server
+	if use server; then
+		dosbin sbin/*
+
+		cd "${S}"/vmware-workstation-server
+
+		# install binaries
+		into "${VM_INSTALL_DIR}"/lib/vmware
+		dobin bin/*
+
+		dobin "${FILESDIR}"/configure-hostd.sh
+
+		dobin "${FILESDIR}"/configure-hostd.sh
+
+		# install the libraries
+		insinto "${VM_INSTALL_DIR}"/lib/vmware/lib
+		doins -r lib/*
+
+		into "${VM_INSTALL_DIR}"
+		for tool in  vmware-{hostd,wssc-adminTool} ; do
+			cat > "${T}/${tool}" <<-EOF
+				#!/usr/bin/env bash
+				set -e
+
+				. /etc/vmware/bootstrap
+
+				exec "${VM_INSTALL_DIR}/lib/vmware/lib/wrapper-gtk24.sh" \\
+					"${VM_INSTALL_DIR}/lib/vmware/lib" \\
+					"${VM_INSTALL_DIR}/lib/vmware/bin/${tool}" \\
+					"${VM_INSTALL_DIR}/lib/vmware/libconf" "\$@"
+			EOF
+			dobin "${T}/${tool}"
+		done
+
+		insinto "${VM_INSTALL_DIR}"/lib/vmware
+		doins -r hostd
+
+		# create the configuration
+		insinto /etc/vmware/hostd
+		doins -r config/etc/vmware/hostd/*
+		doins -r etc/vmware/hostd/*
+
+		insinto /etc/vmware/ssl
+		doins etc/vmware/ssl/*
+
+		# pam
+		pamd_mimic_system vmware-authd auth account
+
+		# create directory for shared virtual machines.
+		keepdir "${VM_DATA_STORE_DIR}"
+		keepdir /var/log/vmware
+	fi
+
+	# install vmware-vix
+	if use vix; then
+		cd "${S}"/vmware-vix
+
+		# install the binary
+		into "${VM_INSTALL_DIR}"
+		dobin bin/*
+
+		# install the libraries
+		insinto "${VM_INSTALL_DIR}"/lib/vmware-vix
+		doins -r lib/*
+
+		dosym vmware-vix/libvixAllProducts.so "${VM_INSTALL_DIR}"/lib/libbvixAllProducts.so
+
+		# install headers
+		insinto /usr/include/vmware-vix
+		doins include/*
+
+		if use doc; then
+			dohtml -r doc/*
+		fi
+	fi
+
+	# install ovftool
+	if use ovftool; then
+		cd "${S}"
+
+		insinto "${VM_INSTALL_DIR}"/lib/vmware-ovftool
+		doins -r vmware-ovftool/*
+
+		chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/{ovftool,ovftool.bin}
+		dosym "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/ovftool "${VM_INSTALL_DIR}"/bin/ovftool
+	fi
+
+	# create symlinks for the various tools
+	local tool ; for tool in thnuclnt vmware vmplayer{,-daemon} \
+			vmware-{acetool,enter-serial,gksu,fuseUI,modconfig{,-console},netcfg,tray,unity-helper} ; do
+		dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}"
+	done
+	dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer "${VM_INSTALL_DIR}"/bin/vmplayer
+	dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware "${VM_INSTALL_DIR}"/bin/vmware
+	dosym "${VM_INSTALL_DIR}"/lib/vmware/icu /etc/vmware/icu
+
+	# fix permissions
+	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks}
+	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/{wrapper-gtk24.sh,libgksu2.so.0/gksu-run-helper}
+	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/setup/vmware-config
+	fperms 4711 "${VM_INSTALL_DIR}"/bin/vmware-mount
+	fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats}
+	if use server; then
+		fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-{hostd,wssc-adminTool}
+		fperms 4711 "${VM_INSTALL_DIR}"/sbin/vmware-authd
+		fperms 1777 "${VM_DATA_STORE_DIR}"
+	fi
+	if use vix; then
+		fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware-vix/setup/vmware-config
+	fi
+
+	# create the environment
+	local envd="${T}/90vmware"
+	cat > "${envd}" <<-EOF
+		PATH='${VM_INSTALL_DIR}/bin'
+		ROOTPATH='${VM_INSTALL_DIR}/bin'
+	EOF
+	doenvd "${envd}"
+
+	# create the configuration
+	dodir /etc/vmware
+
+	cat > "${D}"/etc/vmware/bootstrap <<-EOF
+		BINDIR='${VM_INSTALL_DIR}/bin'
+		LIBDIR='${VM_INSTALL_DIR}/lib'
+	EOF
+
+	cat > "${D}"/etc/vmware/config <<-EOF
+		bindir = "${VM_INSTALL_DIR}/bin"
+		libdir = "${VM_INSTALL_DIR}/lib/vmware"
+		initscriptdir = "/etc/init.d"
+		authd.fullpath = "${VM_INSTALL_DIR}/sbin/vmware-authd"
+		gksu.rootMethod = "su"
+		VMCI_CONFED = "yes"
+		VMBLOCK_CONFED = "yes"
+		VSOCK_CONFED = "yes"
+		NETWORKING = "yes"
+		player.product.version = "${major_minor_revision}"
+		product.version = "${major_minor_revision}"
+		product.buildNumber = "${build}"
+		product.name = "VMware Workstation"
+		workstation.product.version = "${major_minor_revision}"
+	EOF
+
+	if use vix; then
+		cat >> "${D}"/etc/vmware/config <<-EOF
+			vmware.fullpath = "${VM_INSTALL_DIR}/bin/vmware"
+			vix.libdir = "${VM_INSTALL_DIR}/lib/vmware-vix"
+			vix.config.version = "1"
+		EOF
+	fi
+
+	if use server; then
+		cat >> "${D}"/etc/vmware/config <<-EOF
+			authd.client.port = "902"
+			authd.proxy.nfc = "vmware-hostd:ha-nfc"
+			authd.soapserver = "TRUE"
+		EOF
+	fi
+
+	# install the init.d script
+	local initscript="${T}/vmware.rc"
+	sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
+		"${FILESDIR}/vmware-${major_minor}.rc" > ${initscript}
+	newinitd "${initscript}" vmware
+
+	if use server; then
+		# install the init.d script
+		local initscript="${T}/vmware-workstation-server.rc"
+		sed -e "s:@@ETCDIR@@:/etc/vmware:g" \
+			-e "s:@@PREFIX@@:${VM_INSTALL_DIR}:g" \
+			-e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
+			-e "s:@@LIBDIR@@:${VM_INSTALL_DIR}/lib/vmware:g" \
+			"${FILESDIR}/vmware-server-${major_minor}.rc" > ${initscript}
+		newinitd "${initscript}" vmware-workstation-server
+	fi
+
+	# fill in variable placeholders
+	sed -e "s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g" \
+		-i "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}}
+	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware:g" \
+		-i "${D}/usr/share/applications/${PN}.desktop"
+	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \
+		-i "${D}/usr/share/applications/vmware-player.desktop"
+	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware-netcfg:g" \
+		-i "${D}/usr/share/applications/vmware-netcfg.desktop"
+
+	if use server; then
+	# Configuration for vmware-workstation-server
+		local hostdUser="${VM_HOSTD_USER:-root}"
+		sed -e "/ACEDataUser/s:root:${hostdUser}:g" \
+			-i "${D}/etc/vmware/hostd/authorization.xml" || die
+
+		# Shared VMs Path: [standard].
+		sed -e "s:##{DS_NAME}##:standard:g" \
+			-e "s:##{DS_PATH}##:${VM_DATA_STORE_DIR}:g" \
+			-i "${D}/etc/vmware/hostd/datastores.xml" || die
+
+		sed -e "s:##{HTTP_PORT}##:-1:g" \
+			-e "s:##{HTTPS_PORT}##:443:g" \
+			-e "s:##{PIPE_PREFIX}##:/var/run/vmware/:g" \
+			-i "${D}/etc/vmware/hostd/proxy.xml" || die
+
+		# See vmware-workstation-server.py for more details.
+		sed -e "s:##{BUILD_CFGDIR}##:/etc/vmware/hostd/:g" \
+			-e "s:##{CFGALTDIR}##:/etc/vmware/hostd/:g" \
+			-e "s:##{CFGDIR}##:/etc/vmware/:g" \
+			-e "s:##{ENABLE_AUTH}##:true:g" \
+			-e "s:##{HOSTDMODE}##:ws:g" \
+			-e "s:##{HOSTD_CFGDIR}##:/etc/vmware/hostd/:g" \
+			-e "s:##{HOSTD_MOCKUP}##:false:g" \
+			-e "s:##{LIBDIR}##:${VM_INSTALL_DIR}/lib/vmware:g" \
+			-e "s:##{LIBDIR_INSTALLED}##:${VM_INSTALL_DIR}/lib/vmware/:g" \
+			-e "s:##{LOGDIR}##:/var/log/vmware/:g" \
+			-e "s:##{LOGLEVEL}##:verbose:g" \
+			-e "s:##{MOCKUP}##:mockup-host-config.xml:g" \
+			-e "s:##{PLUGINDIR}##:./:g" \
+			-e "s:##{SHLIB_PREFIX}##:lib:g" \
+			-e "s:##{SHLIB_SUFFIX}##:.so:g" \
+			-e "s:##{USE_BLKLISTSVC}##:false:g" \
+			-e "s:##{USE_CBRCSVC}##:false:g" \
+			-e "s:##{USE_CIMSVC}##:false:g" \
+			-e "s:##{USE_DIRECTORYSVC}##:false:g" \
+			-e "s:##{USE_DIRECTORYSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_DYNAMIC_PLUGIN_LOADING}##:false:g" \
+			-e "s:##{USE_DYNAMO}##:false:g" \
+			-e "s:##{USE_DYNSVC}##:false:g" \
+			-e "s:##{USE_GUESTSVC}##:false:g" \
+			-e "s:##{USE_HBRSVC}##:false:g" \
+			-e "s:##{USE_HBRSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_HOSTSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_HTTPNFCSVC}##:false:g" \
+			-e "s:##{USE_HTTPNFCSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_LICENSESVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_NFCSVC}##:true:g" \
+			-e "s:##{USE_NFCSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_OVFMGRSVC}##:true:g" \
+			-e "s:##{USE_PARTITIONSVC}##:false:g" \
+			-e "s:##{USE_SECURESOAP}##:false:g" \
+			-e "s:##{USE_SNMPSVC}##:false:g" \
+			-e "s:##{USE_SOLO_MOCKUP}##:false:g" \
+			-e "s:##{USE_STATSSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_VCSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_VDISKSVC}##:false:g" \
+			-e "s:##{USE_VDISKSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_VMSVC_MOCKUP}##:false:g" \
+			-e "s:##{VM_INVENTORY}##:vmInventory.xml:g" \
+			-e "s:##{VM_RESOURCES}##:vmResources.xml:g" \
+			-e "s:##{WEBSERVER_PORT_ENTRY}##::g" \
+			-e "s:##{WORKINGDIR}##:./:g" \
+			-i "${D}/etc/vmware/hostd/config.xml" || die
+
+		sed -e "s:##{ENV_LOCATION}##:/etc/vmware/hostd/env/:g" \
+			-i "${D}/etc/vmware/hostd/environments.xml" || die
+
+		# @@VICLIENT_URL@@=XXX
+		sed -e "s:@@AUTHD_PORT@@:902:g" \
+			-i "${D}${VM_INSTALL_DIR}/lib/vmware/hostd/docroot/client/clients.xml" || die
+	fi
+}
+
+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 "/etc/env.d was updated. Please run:"
+	ewarn "env-update && source /etc/profile"
+	ewarn ""
+	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 ${PN} for safe unmerge"
+	/etc/init.d/vmware stop
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}

diff --git a/profiles/package.mask b/profiles/package.mask
index aea5e82..193c664 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,8 +1,3 @@
-# Vadim Kuznetsov <vadimk@g.o> (13 Jan 2012)
-# 3.1.6 - failed
-# 3.2.0 - OK
-=app-emulation/open-vm-tools-2011.12.20.562307
-=app-emulation/open-vm-tools-kmod-2011.12.20.562307
 
 # Vadim Kuznetsov <vadimk@g.o> (05 Nov 2011)
 # Masked due to end of support (upstream) and
@@ -11,9 +6,10 @@
 <app-emulation/vmware-player-3.1.5
 <app-emulation/vmware-workstation-7.1.5
 
-# multiple vulnerabilities. Bug 374599
-# Bug 354383
-app-emulation/vmware-server
-app-emulation/vmware-server-console
-=app-emulation/vmware-modules-138.10.7
-=app-emulation/vmware-modules-208.2
+
+# Vadim Kuznetsov <vadimk@g.o> (27 Aug 2012)
+# Does not run yet
+=app-emulation/vmware-workstation-9.0.0.812388
+=app-emulation/vmware-player-5.0.0.812388
+=app-emulation/vmware-tools-9.2.0.812388
+=app-emulation/vmware-modules-271.0