vmware-workstation-8.0.0.471780-r1. Bug 382907.

svn path=/trunk/; revision=495

4 files changed, 216 insertions, 98 deletions

diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
index 268c9d2..bb7a298 100644
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@@ -1,11 +1,12 @@
 AUX list-bundle-components.xsl 470 RMD160 c45fe9d1690eac831c79bc63ef68de45d1265891 SHA1 d35982cfe4f3052fff013059d1df495c672ddd0e SHA256 4fe6b25ecbb99b3a4f15cbb8de41be466ff545f8e9fa1110d62ca0cf24e72395
 AUX list-component-files.xsl 545 RMD160 46747c300daf5c6b2c143f02840a94a409f381c4 SHA1 40b6e4cd0bb189ec9997e8b6009c9508082ed51a SHA256 6682c07630ef4586016776e065018f8695a790c5297408597b1ae24692fab629
 AUX vmware-7.0.rc 778 RMD160 ed0dd6d11680d7ced8724970ee1be77efd48e970 SHA1 84d9aae6bbc8a33806842fd00699a2b81a7bb18c SHA256 50aab1855926e6ae808ed85ddc8b7d83d7441f7d7c4b3726cc1e8bebd4da8e63
-AUX vmware-8.0.rc 466 RMD160 0a1e63530f998fe521f479c3c39321f25a65729a SHA1 bae127bd912b0f67d5888fdca91ee79be02ee65b SHA256 94887a85f46c7890e0c6207b11ad12cf41aa418d10cc3bf1627fea70263ca0d8
+AUX vmware-8.0.rc 778 RMD160 ed0dd6d11680d7ced8724970ee1be77efd48e970 SHA1 84d9aae6bbc8a33806842fd00699a2b81a7bb18c SHA256 50aab1855926e6ae808ed85ddc8b7d83d7441f7d7c4b3726cc1e8bebd4da8e63
+AUX vmware-server-8.0.rc 873 RMD160 84b228d2ec1d106c095356a3832d427abe6eab64 SHA1 1a1fa484a11fe46e3b902a1d75346d0129cde9ea SHA256 707a15bede77dee8ddcb092953355e8904544a20dcec8b08d2aaefd909c84f4c
 DIST VMware-Workstation-7.1.4-385536.i386.bundle 131082749 RMD160 84852552195777ce636a6128cf8ff8c539e045dd SHA1 955b3a08375bb1fa39cb9c1c4142f13de604acf6 SHA256 abf63c5b922660307b62e47138d612e3c3ba2d7520b344d6a2d1e2f69a88ddff
 DIST VMware-Workstation-7.1.4-385536.x86_64.bundle 137897638 RMD160 c71a351e5d59f28f468907074170d3c0ca03c98c SHA1 58973839c0ff6f56a9d2371a1ca1b5189b3f7bc5 SHA256 75bcbae6cfdaa6ae920a4172171eaa8c49b36464f485df3ccd29e5d59b9ead73
 DIST VMware-Workstation-Full-8.0.0-471780.i386.bundle 337749469 RMD160 6505d7511ce86f55cff392faa220021c0e5b5e7f SHA1 00a7a255e060fb2883b32c4267b16ad7af204e5c SHA256 6fbdd01c7ee378bc3352b8c230bec0deae352e3aa0e3d0101fe2af3aab6fcff7
 DIST VMware-Workstation-Full-8.0.0-471780.x86_64.bundle 337435853 RMD160 ed5881078e7eb60699f6d0180c305f6a240e4360 SHA1 1e75bda32c0dd7aa81d1953464d35236335ddf6e SHA256 6a9099659484a1de2bee50c96ddd3dc1b91c6ab02b067288e1c17c2b6d5a9f9a
 EBUILD vmware-workstation-7.1.4.385536.ebuild 8149 RMD160 fdd3b8fab6b2d9f12ddc14156be121fed2c8ef2b SHA1 8558030f0614d9f44402565e62dee87c81a12db8 SHA256 d32847886eb59ea30b7a0f59d306873e16e1583a7fb0ebe1ab7bdc9ba069dd85
-EBUILD vmware-workstation-8.0.0.471780.ebuild 10622 RMD160 e46b0cf8a9199d968c84a04e513c103db7dbe6e8 SHA1 b532770ce26490f198d5b88bea2cc2319da29296 SHA256 c893ca8273b10671bc7d4d844179eef6e6f7dbd07fad625bf6e37b925636ea04
+EBUILD vmware-workstation-8.0.0.471780-r1.ebuild 12585 RMD160 21d26c223b6550874a48bc26cec828d561211a15 SHA1 eb3c13059993e14102c341455a20d89bfde5807e SHA256 5e937ab8bda766c347284326a10b490306ae2893ba0b20ae984ee3826243cdd7
 MISC metadata.xml 699 RMD160 13003f11d344342b6adffbe4f6be7cd72e64f9a3 SHA1 b85c9bb8a2312f7feab5200a9e3a2d6a45d3533f SHA256 0afdf7eebf72c9c781523ff4e2fff3b7f41b8948065c583ae4aa86e71ce067af
diff --git a/app-emulation/vmware-workstation/files/vmware-8.0.rc b/app-emulation/vmware-workstation/files/vmware-8.0.rc
index 0eb257c..ba9d82b 100644
--- a/app-emulation/vmware-workstation/files/vmware-8.0.rc
+++ b/app-emulation/vmware-workstation/files/vmware-8.0.rc
@@ -9,6 +9,10 @@ depend() {
 }
 
 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 $?
@@ -17,6 +21,10 @@ start() {
 }
 
 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
diff --git a/app-emulation/vmware-workstation/files/vmware-server-8.0.rc b/app-emulation/vmware-workstation/files/vmware-server-8.0.rc
new file mode 100644
index 0000000..e760944
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/vmware-server-8.0.rc
@@ -0,0 +1,34 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+depend() {
+	need localmount
+	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 Workstation Server
+	start-stop-daemon --start --quiet --exec @@BINDIR@@/vmware-hostd \
+	    -- -a -d @@ETCDIR@@/hostd/config.xml
+
+	eend $?
+}
+
+stop() {
+	ebegin Stopping VMware Workstation Server
+	start-stop-daemon --stop --quiet --exec @@BINDIR@@/vmware-hostd 
+	eend $?
+}
diff --git a/app-emulation/vmware-workstation/vmware-workstation-8.0.0.471780.ebuild b/app-emulation/vmware-workstation/vmware-workstation-8.0.0.471780-r1.ebuild
index 4a6ad14..c82335e 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-8.0.0.471780.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-8.0.0.471780-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-7.1.4.385536.ebuild,v 1.1 2011/04/15 12:34:21 vadimk Exp $
+# $Header: vadimk Exp $
 
-EAPI="2"
+EAPI="4"
 
-inherit eutils versionator fdo-mime gnome2-utils vmware-bundle
+inherit eutils versionator fdo-mime gnome2-utils pam vmware-bundle
 
 MY_PN="VMware-Workstation"
 MY_PV="$(replace_version_separator 3 - $PV)"
@@ -84,6 +84,8 @@ PDEPEND="~app-emulation/vmware-modules-264.0
 
 S=${WORKDIR}
 VM_INSTALL_DIR="/opt/vmware"
+VM_DATA_STORE_DIR="/var/lib/vmware/Shared VMs"
+VM_HOSTD_USER="root"
 
 pkg_nofetch() {
 	local bundle
@@ -100,40 +102,38 @@ pkg_nofetch() {
 }
 
 src_unpack() {
-	#bash "${DISTDIR}/${A}" --extract "${WORKDIR}"
-	#vmware-bundle_extract-bundle-component "${DISTDIR}/${A}" vmware-player-app
-	#vmware-bundle_extract-bundle-component "${DISTDIR}/${A}" vmware-player-setup
-	#vmware-bundle_extract-bundle-component "${DISTDIR}/${A}" vmware-workstation
-
-	vmware-bundle_extract-bundle-component "${DISTDIR}/${A}" vmware-installer
-	vmware-bundle_extract-bundle-component "${DISTDIR}/${A}" vmware-network-editor
-	vmware-bundle_extract-bundle-component "${DISTDIR}/${A}" vmware-network-editor-ui
-	vmware-bundle_extract-bundle-component "${DISTDIR}/${A}" vmware-ovftool
-	vmware-bundle_extract-bundle-component "${DISTDIR}/${A}" vmware-player-app
-	vmware-bundle_extract-bundle-component "${DISTDIR}/${A}" vmware-player-setup
-	#vmware-bundle_extract-bundle-component "${DISTDIR}/${A}" vmware-tools-freebsd
-	#vmware-bundle_extract-bundle-component "${DISTDIR}/${A}" vmware-tools-linux
-	#vmware-bundle_extract-bundle-component "${DISTDIR}/${A}" vmware-tools-netware
-	#vmware-bundle_extract-bundle-component "${DISTDIR}/${A}" vmware-tools-solaris
-	#vmware-bundle_extract-bundle-component "${DISTDIR}/${A}" vmware-tools-winPre2k
-	#vmware-bundle_extract-bundle-component "${DISTDIR}/${A}" vmware-tools-windows
-	vmware-bundle_extract-bundle-component "${DISTDIR}/${A}" vmware-usbarbitrator
+	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 "${DISTDIR}/${A}" "${component}" "${S}"
+	done
+
+	if use server; then
+		vmware-bundle_extract-bundle-component "${DISTDIR}/${A}" vmware-workstation-server #"${S}"
+	fi
+
 	if use vix; then
-		vmware-bundle_extract-bundle-component "${DISTDIR}/${A}" vmware-vix-core
-		vmware-bundle_extract-bundle-component "${DISTDIR}/${A}" vmware-vix-lib-Workstation800andvSphere500
+		vmware-bundle_extract-bundle-component "${DISTDIR}/${A}" vmware-vix-core vmware-vix
+		vmware-bundle_extract-bundle-component "${DISTDIR}/${A}" vmware-vix-lib-Workstation800andvSphere500 vmware-vix
 	fi
-	vmware-bundle_extract-bundle-component "${DISTDIR}/${A}" vmware-vmx
-	vmware-bundle_extract-bundle-component "${DISTDIR}/${A}" vmware-workstation
-	vmware-bundle_extract-bundle-component "${DISTDIR}/${A}" vmware-workstation-server
 }
 
 src_prepare() {
-	rm -rf "${S}"/vmware-vmx/bin/vmware-modconfig
-	rm -rf "${S}"/vmware-vmx/lib/modules/binary
+	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
 
 	# remove superfluous libraries
 	ebegin 'Removing superfluous libraries'
-	cd vmware-vmx/lib/lib || die
+	cd lib/lib || die
 	# exclude OpenSSL from unbundling until the AES-NI patch gets into the tree
 	# see http://forums.gentoo.org/viewtopic-t-835867.html
 	#ldconfig -p | sed 's:^\s\+\([^(]*[^( ]\).*=> /.*$:\1:g;t;d' | fgrep -vx 'libcrypto.so.0.9.8 libssl.so.0.9.8' | xargs -d'\n' -r rm -rf
@@ -145,23 +145,6 @@ src_install() {
 	local major_minor_revision=$(get_version_component_range 1-3 "${PV}")
 	local build=$(get_version_component_range 4 "${PV}")
 
-	# install vmware player components
-	cd "${S}"/vmware-vmx
-
-	# install the binaries
-	into "${VM_INSTALL_DIR}"
-	dobin bin/*
-	if use server; then
-		dosbin sbin/*
-	fi
-
-	# install the libraries
-	insinto "${VM_INSTALL_DIR}"/lib/vmware
-	doins -r lib/*
-
-	# install vmware player
-	cd "${S}"/vmware-player-app
-
 	# install the binaries
 	into "${VM_INSTALL_DIR}"
 	dobin bin/*
@@ -178,42 +161,12 @@ src_install() {
 		exeinto $(cups-config --serverbin)/filter
 		doexe extras/thnucups
 
-		insinto "${VM_INSTALL_DIR}"/etc/cups
+		insinto /etc/cups
 		doins -r etc/cups/*
-
-		insinto "${VM_INSTALL_DIR}"/etc/xdg
-		doins -r etc/xdg/*
 	fi
 
-	# commented out until Portage gets OpenSSL 0.9.8 with AES-NI support
-	# see http://forums.gentoo.org/viewtopic-t-835867.html
-	## these two libraries do not like to load from /usr/lib*
-	#local each ; for each in libcrypto.so.0.9.8 libssl.so.0.9.8 ; do
-	#	if [[ ! -f "${VM_INSTALL_DIR}/lib/vmware/lib/${each}" ]] ; then
-	#		dosym "/usr/$(get_libdir)/${each}" \
-	#			"${VM_INSTALL_DIR}/lib/vmware/lib/${each}/${each}"
-	#	fi
-	#done
-
-	# install vmware-config
-	cd "${S}"/vmware-player-setup
-	insinto "${VM_INSTALL_DIR}"/lib/vmware/setup
-	doins vmware-config
-
-	# install vmware-workstation
-	cd "${S}"/vmware-workstation
-
-	# 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
+	insinto /etc/xdg
+	doins -r etc/xdg/*
 
 	# install documentation
 	doman man/man1/vmware.1.gz
@@ -222,22 +175,57 @@ src_install() {
 		dodoc doc/*
 	fi
 
-	# install network editor
-	cd "${S}"/vmware-network-editor
+	insinto "${VM_INSTALL_DIR}"/lib/vmware/setup
+	doins vmware-config
 
-	# install the libraries
-	insinto "${VM_INSTALL_DIR}"/lib/vmware
-	doins -r lib/*
+	# install vmware workstation server
+	if use server; then
+		dosbin sbin/*
 
-	cd "${S}"/vmware-network-editor-ui
+		cd "${S}"/vmware-workstation-server
 
-	# install the binaries
-	into "${VM_INSTALL_DIR}"
-	dobin bin/*
+		# install binaries
+		into "${VM_INSTALL_DIR}"/lib/vmware
+		dobin bin/*
 
-	# install the ancillaries
-	insinto /usr
-	doins -r share
+		# install the libraries
+		insinto "${VM_INSTALL_DIR}"/lib/vmware/lib
+		doins -r lib/*
+
+		into "${VM_INSTALL_DIR}"
+		for tool in  vmware-{hostd,vim-cmd,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
@@ -263,8 +251,8 @@ src_install() {
 	fi
 
 	# create symlinks for the various tools
-	local tool ; for tool in vmware vmplayer{,-daemon} \
-			vmware-{acetool,gksu,fuseUI,modconfig{,-console},netcfg,thnuclnt,tray,unity-helper} ; do
+	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
@@ -272,8 +260,12 @@ src_install() {
 
 	# fix up permissions
 	chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware/{bin/*,lib/wrapper-gtk24.sh,setup/*}
-	chmod 04711 "${D}${VM_INSTALL_DIR}"/sbin/vmware-authd
+	chmod 04711 "${D}${VM_INSTALL_DIR}"/bin/vmware-mount
+	if use server; then
+		chmod 04711 "${D}${VM_INSTALL_DIR}"/sbin/vmware-authd
+	fi
 	chmod 04711 "${D}${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx*
+
 	if use vix; then
 		chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware-vix/setup/*
 	fi
@@ -321,7 +313,7 @@ src_install() {
 
 	if use server; then
 		cat >> "${D}"/etc/vmware/config <<-EOF
-			authd.fullpath = "${VM_INSTALL_DIR}/sbin/vmware-authd"
+			#authd.fullpath = "${VM_INSTALL_DIR}/sbin/vmware-authd"
 			authd.client.port = "902"
 			authd.proxy.nfc = "vmware-hostd:ha-nfc"
 			authd.soapserver = "TRUE"
@@ -334,6 +326,16 @@ src_install() {
 		"${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:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
+			-e "s:@@LIBDIR@@:${VM_INSTALL_DIR}/lib/vmware:g" \
+			"${FILESDIR}/vmware-server-8.0.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}}
@@ -343,6 +345,79 @@ src_install() {
 		-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() {
@@ -360,7 +435,7 @@ pkg_postinst() {
 	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 "Before you can use vmware workstation, you must configure a default network setup."
 	ewarn "You can do this by running 'emerge --config ${PN}'."
 }