added vix

svn path=/trunk/; revision=391

3 files changed, 58 insertions, 10 deletions

diff --git a/app-emulation/vmware-workstation/ChangeLog b/app-emulation/vmware-workstation/ChangeLog
index 4dea942..099cc1f 100644
--- a/app-emulation/vmware-workstation/ChangeLog
+++ b/app-emulation/vmware-workstation/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  16 Mar 2010; Vadim Kuznetsov <vadimk@gentoo.org>
+  vmware-workstation-7.0.1.227600-r3.ebuild:
+  added vix
+
 *vmware-workstation-7.0.1.227600-r3 (09 Mar 2010)
 
   09 Mar 2010; Vadim Kuznetsov <vadimk@gentoo.org>
diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
index f2a70b6..c96bb96 100644
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@@ -21,6 +21,6 @@ DIST VMware-Workstation-7.0.1-227600.i386.bundle 107914468 RMD160 c34c4c5f69cb58
 DIST VMware-Workstation-7.0.1-227600.x86_64.bundle 113783072 RMD160 803b27f1742cec99e9ba2dc04808783b195d10d8 SHA1 dbcd045a889b95ac14828b8106631b678354e30a SHA256 3115f46b9d877bdf53e5db470a904384405a5c0054849f3e6d874ec36d668761
 DIST VMware-Workstation-Full-7.0.1-227600.i386.bundle 286244988 RMD160 9db7f06a3662b4b474cddb61675e36071eb16711 SHA1 f6d0789afa7927ca154973a071603a0bd098e697 SHA256 cc003ff5a811ace83172712e435047d41f0e883320d7d0798e69940389e31d57
 DIST VMware-Workstation-Full-7.0.1-227600.x86_64.bundle 292113593 RMD160 ac519500f4b3cfc2849c8a3f5ba4ddd02db0f9a3 SHA1 a901c45a2a02678b0d1722e8f27152c3af12a7ac SHA256 e188381d0569e8cc1f652df8d12f4572e207e40dd9c726af02d09c42503551d3
-EBUILD vmware-workstation-7.0.1.227600-r3.ebuild 8183 RMD160 e2ce093da294b7d3a2fec77008550872a08d732e SHA1 6dc9acbaa5288e0fa7dc3cd338883f7dafbe4ceb SHA256 733feb63728ac9c71509528c6c2665f7f226b4145bf296e0d9ebcd2e42435753
+EBUILD vmware-workstation-7.0.1.227600-r3.ebuild 9069 RMD160 91f85b427887efc5880a7fe77199317a9cea96f5 SHA1 54a03241506d637729f95b600c24172b278c783b SHA256 b60e9ce679a141594821c64a394eb223bab2a1c140a454c477583a40732ede04
 EBUILD vmware-workstation-7.0.1.227600.ebuild 5583 RMD160 3619a7454b53411695537b5eb73d9213422b4097 SHA1 a4df48dd3c7a87cca8ccea2ca73bb2974db8d360 SHA256 3e6b9d8a80cc668faf4ead014e9681cc7d214a4683ee5ba801d09d058e080591
-MISC ChangeLog 1907 RMD160 15cba6995a1ac22dd873db531faab0e43eaa1366 SHA1 6dce9feeed7b2bfd5f399bb9db65464ad7656a4e SHA256 6002041e4d2449da27e6acf3b0f92d62ad4e830b911e65699753ee57da6a72f1
+MISC ChangeLog 2016 RMD160 5ad804a621dc282c4c99569a73c60a5fe2388e57 SHA1 3183139d30abe27dca61689a2d7e68c53299e2dc SHA256 49459e428fb577eb267b497bb9376714253b43d0f6c835b7a1fe2f6d83125e01
diff --git a/app-emulation/vmware-workstation/vmware-workstation-7.0.1.227600-r3.ebuild b/app-emulation/vmware-workstation/vmware-workstation-7.0.1.227600-r3.ebuild
index b991b63..0fe5e10 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-7.0.1.227600-r3.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-7.0.1.227600-r3.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 LICENSE="vmware"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="+with-tools"
+IUSE="doc vix +with-tools"
 RESTRICT="binchecks fetch mirror strip"
 
 # vmware-workstation should not use virtual/libc as this is a
@@ -67,7 +67,11 @@ pkg_nofetch() {
 
 src_unpack() {
 	bundle_extract_component "${DISTDIR}/${A}" vmware-player-app
+	bundle_extract_component "${DISTDIR}/${A}" vmware-player-setup
 	bundle_extract_component "${DISTDIR}/${A}" vmware-workstation
+	if use vix; then
+		bundle_extract_component "${DISTDIR}/${A}" vmware-vix
+	fi
 	if use with-tools; then
 		bundle_extract_component "${DISTDIR}/${A}" vmware-tools-freebsd
 		bundle_extract_component "${DISTDIR}/${A}" vmware-tools-linux
@@ -103,9 +107,16 @@ src_install() {
 	doins -r share
 
 	# install documentation
-	dodoc doc/*
-
+	if use doc; then
+		dodoc doc/*
+	fi
 	
+	# 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
@@ -123,11 +134,35 @@ src_install() {
 	# install documentation
 	doman man/man1/vmware.1.gz
 
-	# install the tools isos
-	insinto "${VM_INSTALL_DIR}"/lib/vmware/isoimages
+	if use doc; then
+		dodoc -r doc/*
+	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/*
+
+		# install headers
+		insinto /usr/include/vmware-vix
+		doins include/*
+
+		if use doc; then
+			dohtml -r doc/*
+		fi
+	fi
 
+	# install the tools isos
 	if use with-tools; then
-		# install the vmware-tools isos
+		insinto "${VM_INSTALL_DIR}"/lib/vmware/isoimages
+
 		local tool ; for tool in vmware-tools-{freebsd,linux,netware,solaris,windows,winPre2k} ; do
 			cd "${S}"/${tool}
 			doins *.iso *.iso.sig
@@ -143,16 +178,19 @@ src_install() {
 	dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware "${VM_INSTALL_DIR}"/bin/vmware
 
 	# fix up permissions
-	chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware/{bin/*,lib/{libgksu2.so.0/gksu-run-helper,wrapper-gtk24.sh}}
+	chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware/{bin/*,lib/{libgksu2.so.0/gksu-run-helper,wrapper-gtk24.sh},setup/*}
 	chmod 04711 "${D}${VM_INSTALL_DIR}"/sbin/vmware-authd
 	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
 
 	# create the environment
 	local envd="${T}/90vmware"
 	cat > "${envd}" <<-EOF
 		PATH='${VM_INSTALL_DIR}/bin'
 		ROOTPATH='${VM_INSTALL_DIR}/bin'
-		MANPATH='${VM_INSTALL_DIR}/lib/vmware/man'
+		#MANPATH='${VM_INSTALL_DIR}/lib/vmware/man'
 	EOF
 	doenvd "${envd}"
 
@@ -180,6 +218,12 @@ src_install() {
 		workstation.product.version = "${major_minor_revision}"
 	EOF
 
+	if use vix; then
+		cat >> "${D}"/etc/vmware/config <<-EOF
+			vix.libdir = "${VM_INSTALL_DIR}/lib/vmware-vix"
+		EOF
+	fi
+
 	# install the init.d script
 	local initscript="${T}/vmware.rc"
 	sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \