vmware-workstation-8: ovf tool is added

svn path=/trunk/; revision=497

3 files changed, 20 insertions, 4 deletions

diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
index 3ad8d0f..b369a5a 100644
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@@ -8,5 +8,5 @@ DIST VMware-Workstation-7.1.4-385536.x86_64.bundle 137897638 RMD160 c71a351e5d59
 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-r2.ebuild 12726 RMD160 fa6bbbf7541540afc1065c1662f6863e8b7fffa0 SHA1 85aa62dfcdba9545457b620898238fa63aa1df2d SHA256 7e270e9de769f6c32cdb1903368eeeba8665074ef2dea50f5dea51d94390b131
-MISC metadata.xml 699 RMD160 13003f11d344342b6adffbe4f6be7cd72e64f9a3 SHA1 b85c9bb8a2312f7feab5200a9e3a2d6a45d3533f SHA256 0afdf7eebf72c9c781523ff4e2fff3b7f41b8948065c583ae4aa86e71ce067af
+EBUILD vmware-workstation-8.0.0.471780-r3.ebuild 13081 RMD160 0004620e059ef33ed1435877a92160353b89e79a SHA1 955ec42c2ff5105197e6618b2bb4aa5af40d996b SHA256 f84b7e09fb3cdc8294a28286afb368421f38211e63c3fd7a7cb23b24ad47bc49
+MISC metadata.xml 821 RMD160 3fe06e26c1f6550712d29d27dbbe1bde8eeb3d29 SHA1 4cacecf9b113a8c46e921e1738d5c191bf693872 SHA256 b5634de5978f816c03495e72d4ee1cb72b372209ee7b8a8e88cec8963aa38647
diff --git a/app-emulation/vmware-workstation/metadata.xml b/app-emulation/vmware-workstation/metadata.xml
index 3927fce..2dc6f42 100644
--- a/app-emulation/vmware-workstation/metadata.xml
+++ b/app-emulation/vmware-workstation/metadata.xml
@@ -10,6 +10,8 @@
 		other operating systems in a virtual environment to run on top of Gentoo.
 	</longdescription>
 	<use>
+		<flag name='ovftool'>Install OVF tool.</flag>
+		<flag name='server'>Install VMware Workstation Server component.</flag>
 		<flag name='vix'>Install VIX. The VIX API allows you to write programs and scripts
 		that automate virtual machine operations, and run programs or manipulate
 		files within guest operating systems.
diff --git a/app-emulation/vmware-workstation/vmware-workstation-8.0.0.471780-r2.ebuild b/app-emulation/vmware-workstation/vmware-workstation-8.0.0.471780-r3.ebuild
index a1ce234..e92fabc 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-8.0.0.471780-r2.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-8.0.0.471780-r3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 LICENSE="vmware"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="cups doc server vix +vmware-tools"
+IUSE="cups doc ovftool server vix vmware-tools"
 RESTRICT="binchecks fetch mirror strip"
 
 # vmware-workstation should not use virtual/libc as this is a
@@ -125,6 +125,10 @@ src_unpack() {
 		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
+	if use ovftool; then
+		vmware-bundle_extract-bundle-component "${DISTDIR}/${A}" vmware-ovftool
+	fi
+
 }
 
 src_prepare() {
@@ -253,6 +257,17 @@ src_install() {
 		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
@@ -317,7 +332,6 @@ src_install() {
 
 	if use server; then
 		cat >> "${D}"/etc/vmware/config <<-EOF
-			#authd.fullpath = "${VM_INSTALL_DIR}/sbin/vmware-authd"
 			authd.client.port = "902"
 			authd.proxy.nfc = "vmware-hostd:ha-nfc"
 			authd.soapserver = "TRUE"