added vmware-tools to vmware-workstation via with-tools use flag.

svn path=/trunk/; revision=390

6 files changed, 65 insertions, 20 deletions

diff --git a/app-emulation/vmware-player/ChangeLog b/app-emulation/vmware-player/ChangeLog
index 04e5d31..a797df2 100644
--- a/app-emulation/vmware-player/ChangeLog
+++ b/app-emulation/vmware-player/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  09 Mar 2010; Vadim Kuznetsov <vadimk@gentoo.org>
+  vmware-player-3.0.1.227600-r3.ebuild:
+  minor changes.
+
 *vmware-player-3.0.1.227600-r3 (05 Mar 2010)
 
   05 Mar 2010; Vadim Kuznetsov <vadimk@gentoo.org>
diff --git a/app-emulation/vmware-player/Manifest b/app-emulation/vmware-player/Manifest
index 5e09f6c..40086d3 100644
--- a/app-emulation/vmware-player/Manifest
+++ b/app-emulation/vmware-player/Manifest
@@ -5,7 +5,7 @@ AUX vmware-3.0.rc 776 RMD160 21380174fda9e6bdc2a720ecd4c1742bf76b9439 SHA1 c6ec7
 DIST VMware-Player-3.0.1-227600.i386.bundle 84974107 RMD160 4337339976d25d8dbd1f4904ba2ed2b53d1e9c49 SHA1 cff76010f0429576288ea1e5a594cd47a2c64f4a SHA256 9314e49ebb252fd937032481b13d0bea4a3af6409485e79576f797834b978285
 DIST VMware-Player-3.0.1-227600.x86_64.bundle 79959324 RMD160 c6652acadc760bab8ecfed2682706e31f51423ef SHA1 84f25370d24c03a18968a4f4c8e06cef3d21c2df SHA256 8347b3fa0c1cd1c88c3c8049462f3d0d752d6f7daa747a7d2a67667a3f55f190
 EBUILD vmware-player-3.0.1.227600-r1.ebuild 5799 RMD160 16716d99dba58a5512f42a2435aa5a3e1a036c0b SHA1 35192bf8fdb6713b855c92e89f33837eeedf9d03 SHA256 fb0fb0f0e882e343af284fc44d017985d5fdcc5c6012a9f067b5aeaaf1aa1d17
-EBUILD vmware-player-3.0.1.227600-r3.ebuild 6392 RMD160 8e7857b6b5a880807a074f4e34623857f0ce7695 SHA1 b692623d466d93803b6384c1799470a395b29586 SHA256 e331108653655259a8c6f36f680a45ec3456ddfb6bba23a364d2b69221378a8b
+EBUILD vmware-player-3.0.1.227600-r3.ebuild 6402 RMD160 fed7aaeee9a096e29c0d4031b154876c67cd4590 SHA1 fdc0b6a2b6934596e962d82d4553a62cca9cc414 SHA256 82f0ee8accf8e5f076b2f7c57589fd768dbb6e34a142d19915e69e16cc47535e
 EBUILD vmware-player-3.0.1.227600.ebuild 5852 RMD160 b6a1ba2e67a5ed38c3be96c7e31db9dfaf54d3ad SHA1 d910759939a4a977db9411470e32b78b6342ca03 SHA256 cf1722ec1f3be23f3a43f7360bf8f200f28ba24d856faadf32a7c0ef8f80b78a
-MISC ChangeLog 1688 RMD160 45b896c046841e5a9d2df84dc8f3a343f611a6e4 SHA1 def730409beee91f8b60e89ea9e89b310ece8b26 SHA256 f4ac3c21a8dc1595165d0349305f953cb436424582bd1cf68598245b71c4dfaf
+MISC ChangeLog 1797 RMD160 947ba0e7bd210bfcefded359ca0d08a4c3c04d79 SHA1 c088cb574772c4e5c60fe2a50dad88b516f7adcb SHA256 7b2847b37d1e045e95a227ea3c1819c05cfa93b47bfd4f33da2645a8dc053587
 MISC metadata.xml 159 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 SHA1 f46b02a39bcd0165558de67ff4256cfc812418a3 SHA256 8581ae1c90a48f50fa0542c7fb28cb8984baaf12f50fa18f33e467081effb215
diff --git a/app-emulation/vmware-player/vmware-player-3.0.1.227600-r3.ebuild b/app-emulation/vmware-player/vmware-player-3.0.1.227600-r3.ebuild
index 1ac80eb..d2d62c6 100644
--- a/app-emulation/vmware-player/vmware-player-3.0.1.227600-r3.ebuild
+++ b/app-emulation/vmware-player/vmware-player-3.0.1.227600-r3.ebuild
@@ -6,13 +6,15 @@ EAPI="2"
 
 inherit eutils versionator fdo-mime gnome2-utils
 
-MY_PN="VMware-Player-$(replace_version_separator 3 - $PV)"
+MY_PN="VMware-Player"
+MY_PV="$(replace_version_separator 3 - $PV)"
+MY_P="${MY_PN}-${MY_PV}"
 
 DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
-HOMEPAGE="http://www.vmware.com/products/desktop/ws_features.html"
+HOMEPAGE="http://www.vmware.com/products/player/"
 SRC_URI="
-	x86? ( mirror://vmware/software/vmplayer/${MY_PN}.i386.bundle )
-	amd64? ( mirror://vmware/software/vmplayer/${MY_PN}.x86_64.bundle )
+	x86? ( ${MY_P}.i386.bundle )
+	amd64? ( ${MY_P}.x86_64.bundle )
 	"
 
 LICENSE="vmware"
@@ -45,13 +47,16 @@ S=${WORKDIR}
 VM_INSTALL_DIR="/opt/vmware"
 
 pkg_nofetch() {
+	local bundle
+
 	if use x86; then
-		MY_P="${MY_PN}.i386"
+		bundle="${MY_PN}.i386.bundle"
 	elif use amd64; then
-		MY_P="${MY_PN}.x86_64"
+		bundle="${MY_PN}.x86_64.bundle"
 	fi
 
-	einfo "Please download the ${MY_P}.bundle from ${HOMEPAGE}"
+	einfo "Please download the ${bundle} from ${HOMEPAGE}"
+	einfo "and place it in ${DISTDIR}"
 }
 
 src_unpack() {
diff --git a/app-emulation/vmware-workstation/ChangeLog b/app-emulation/vmware-workstation/ChangeLog
index 2cb959e..4dea942 100644
--- a/app-emulation/vmware-workstation/ChangeLog
+++ b/app-emulation/vmware-workstation/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*vmware-workstation-7.0.1.227600-r3 (09 Mar 2010)
+
+  09 Mar 2010; Vadim Kuznetsov <vadimk@gentoo.org>
+  -vmware-workstation-7.0.1.227600-r2.ebuild,
+  +vmware-workstation-7.0.1.227600-r3.ebuild:
+  added vmware-tools isos via with-tools use flag.
+
 *vmware-workstation-7.0.1.227600-r2 (05 Mar 2010)
 
   05 Mar 2010; Vadim Kuznetsov <vadimk@gentoo.org>
diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
index fb344e1..f2a70b6 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-r2.ebuild 7195 RMD160 db4c236893494474f4b33eaa7228953ec5b461a1 SHA1 7fa0f06b02a812b28aeeb5c064190843e9e40539 SHA256 cf04546aae968b0f6d79eac7a98c005331f8f6c70c6bf661cf672b9183c77683
+EBUILD vmware-workstation-7.0.1.227600-r3.ebuild 8183 RMD160 e2ce093da294b7d3a2fec77008550872a08d732e SHA1 6dc9acbaa5288e0fa7dc3cd338883f7dafbe4ceb SHA256 733feb63728ac9c71509528c6c2665f7f226b4145bf296e0d9ebcd2e42435753
 EBUILD vmware-workstation-7.0.1.227600.ebuild 5583 RMD160 3619a7454b53411695537b5eb73d9213422b4097 SHA1 a4df48dd3c7a87cca8ccea2ca73bb2974db8d360 SHA256 3e6b9d8a80cc668faf4ead014e9681cc7d214a4683ee5ba801d09d058e080591
-MISC ChangeLog 1661 RMD160 9a16ce78242e58ec5ed738520e300ab05169dc13 SHA1 ec576a5c4e66cdb792e8c993879026bfba1a8af4 SHA256 1a6676864c7d3270396315fd1ab6041a4db61c8ef6b21c0e3f9285c01c972947
+MISC ChangeLog 1907 RMD160 15cba6995a1ac22dd873db531faab0e43eaa1366 SHA1 6dce9feeed7b2bfd5f399bb9db65464ad7656a4e SHA256 6002041e4d2449da27e6acf3b0f92d62ad4e830b911e65699753ee57da6a72f1
diff --git a/app-emulation/vmware-workstation/vmware-workstation-7.0.1.227600-r2.ebuild b/app-emulation/vmware-workstation/vmware-workstation-7.0.1.227600-r3.ebuild
index 2148d68..b991b63 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-7.0.1.227600-r2.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-7.0.1.227600-r3.ebuild
@@ -6,20 +6,24 @@ EAPI="2"
 
 inherit eutils versionator fdo-mime gnome2-utils
 
-MY_PN="VMware-Workstation-$(replace_version_separator 3 - $PV)"
+MY_PN="VMware-Workstation"
+MY_PV=$(replace_version_separator 3 - $PV)
+MY_P="${MY_PN}-${MY_PV}"
 
 DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
-HOMEPAGE="http://www.vmware.com/products/desktop/ws_features.html"
+HOMEPAGE="http://www.vmware.com/products/workstation/"
 SRC_URI="
-	x86? ( mirror://vmware/software/wkst/${MY_PN}.i386.bundle )
-	amd64? ( mirror://vmware/software/wkst/${MY_PN}.x86_64.bundle )
+	x86? ( with-tools? ( ${MY_PN}-Full-${MY_PV}.i386.bundle ) )
+	x86? ( !with-tools? ( ${MY_PN}-${MY_PV}.i386.bundle ) )
+	amd64? ( with-tools? ( ${MY_PN}-Full-${MY_PV}.x86_64.bundle ) )
+	amd64? ( !with-tools? ( ${MY_PN}-${MY_PV}.x86_64.bundle ) )
 	"
 
 LICENSE="vmware"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="binchecks fetch strip"
+IUSE="+with-tools"
+RESTRICT="binchecks fetch mirror strip"
 
 # vmware-workstation should not use virtual/libc as this is a
 # precompiled binary package thats linked to glibc.
@@ -44,19 +48,34 @@ RDEPEND="
 S=${WORKDIR}
 VM_INSTALL_DIR="/opt/vmware"
 
+
 pkg_nofetch() {
+	local bundle
+
+	if use with-tools; then
+		MY_P=${MY_PN}-Full-${MY_PV}
+	fi
 	if use x86; then
-		MY_P="${MY_PN}.i386"
+		bundle="${MY_P}.i386.bundle"
 	elif use amd64; then
-		MY_P="${MY_PN}.x86_64"
+		bundle="${MY_P}.x86_64.bundle"
 	fi
 
-	einfo "Please download the ${MY_P}.bundle from ${HOMEPAGE}"
+	einfo "Please download the ${bundle} from ${HOMEPAGE}"
+	einfo "and place it in ${DISTDIR}"
 }
 
 src_unpack() {
 	bundle_extract_component "${DISTDIR}/${A}" vmware-player-app
 	bundle_extract_component "${DISTDIR}/${A}" vmware-workstation
+	if use with-tools; then
+		bundle_extract_component "${DISTDIR}/${A}" vmware-tools-freebsd
+		bundle_extract_component "${DISTDIR}/${A}" vmware-tools-linux
+		bundle_extract_component "${DISTDIR}/${A}" vmware-tools-netware
+		bundle_extract_component "${DISTDIR}/${A}" vmware-tools-solaris
+		bundle_extract_component "${DISTDIR}/${A}" vmware-tools-windows
+		bundle_extract_component "${DISTDIR}/${A}" vmware-tools-winPre2k
+	fi
 }
 
 src_prepare() {
@@ -104,6 +123,16 @@ src_install() {
 	# install documentation
 	doman man/man1/vmware.1.gz
 
+	# install the tools isos
+	insinto "${VM_INSTALL_DIR}"/lib/vmware/isoimages
+
+	if use with-tools; then
+		# install the vmware-tools isos
+		local tool ; for tool in vmware-tools-{freebsd,linux,netware,solaris,windows,winPre2k} ; do
+			cd "${S}"/${tool}
+			doins *.iso *.iso.sig
+		done
+	fi
 
 	# create symlinks for the various tools
 	local tool ; for tool in vmware vmplayer{,-daemon} \