version bumped VMware desktop suite to build 385536

svn path=/trunk/; revision=467

12 files changed, 716 insertions, 4 deletions

diff --git a/app-emulation/vmware-modules/ChangeLog b/app-emulation/vmware-modules/ChangeLog
index 7c72002..dd036c5 100644
--- a/app-emulation/vmware-modules/ChangeLog
+++ b/app-emulation/vmware-modules/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  30 Mar 2011; Matt Whitlock (whitslack) <matt@whitlock.name>
+  +vmware-modules-238.4.ebuild:
+  bumped to 238.4
+
   20 Mar 2011; Vadim Kuznetsov <vadimk@gentoo.org> +files/238-jobserver.patch,
   +files/238-unlocked_ioctl.patch, -files/1.0.0.26-makefile-include.patch,
   vmware-modules-238.3-r8.ebuild, -files/1.0.0.26-makefile-kernel-dir.patch,
diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest
index 96a5239..8522ada 100644
--- a/app-emulation/vmware-modules/Manifest
+++ b/app-emulation/vmware-modules/Manifest
@@ -14,5 +14,6 @@ DIST vmware-modules-208.2.patch.bz2 7239 RMD160 f66781709bb18dc370717c32fa72b290
 EBUILD vmware-modules-138.10.7.ebuild 1825 RMD160 3e4999c91f97217815c9d8ad852a63f0d452995d SHA1 c2bd1e62e0418f62b5f62261811734ba9e8f34b2 SHA256 573f1080031bf394cde783ef5d574da7934546d586e3dc942037fde0b1d2e6be
 EBUILD vmware-modules-208.2.ebuild 1861 RMD160 6641f57a7906ff1eb243e14561c37475eda6d910 SHA1 aab9187681ca6b88b4178b98d259116130c39037 SHA256 140d78cc98da4cd19a24d593bec01417793592212273d632adfc465fe80ff311
 EBUILD vmware-modules-238.3-r8.ebuild 1855 RMD160 e576a15e0e9c5f219ebc0edc7bc0ca04f906ca5f SHA1 c875538b3ae4168d11de2e4ceeca161ea11e168b SHA256 22b63d000b05a06217c927b0b1b5dc54087cd4eb17527c99c3cb8affcdedfa3a
-MISC ChangeLog 4654 RMD160 e1abd6e6b6a86a15b70bc46e77f969f1b5731810 SHA1 2eaa854a7a02dd0dd9581c5dddd50a155d30214c SHA256 4dedb01a572ed8472693ca01c67d75e0a9a45ddfd009c031fbba946115c5aaee
+EBUILD vmware-modules-238.4.ebuild 1780 RMD160 0c5f9b31e4af93c55096e9a00d4a5fa53acc8c5b SHA1 1a88bb066bbe42a81e3f44a51957db812671d6e7 SHA256 770a9135206ca9f5b90239a38b24349d9b04cd2919a274f6cfc23250c63079aa
+MISC ChangeLog 4767 RMD160 38d8e132e4325f359265ead22c760488e6ce40a4 SHA1 6e4bec8077c3f8034fd5ef111b0ddad87a7a3e8e SHA256 1da5fb0c2e96247cdeb4db14706d9250b4e9c9dbc1d9aea7e1c8f9991b0d0012
 MISC metadata.xml 159 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 SHA1 f46b02a39bcd0165558de67ff4256cfc812418a3 SHA256 8581ae1c90a48f50fa0542c7fb28cb8984baaf12f50fa18f33e467081effb215
diff --git a/app-emulation/vmware-modules/vmware-modules-238.4.ebuild b/app-emulation/vmware-modules/vmware-modules-238.4.ebuild
new file mode 100644
index 0000000..a6ee13c
--- /dev/null
+++ b/app-emulation/vmware-modules/vmware-modules-238.4.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit eutils flag-o-matic linux-info linux-mod 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=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	|| ( =app-emulation/vmware-player-3.1.${PV_MINOR}*
+		 =app-emulation/vmware-workstation-7.1.${PV_MINOR}* )"
+
+S=${WORKDIR}
+
+pkg_setup() {
+	CONFIG_CHECK="~HIGH_RES_TIMERS"
+	if kernel_is ge 2 6 37; 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}-jobserver.patch"
+	kernel_is ge 2 6 37 && epatch "${FILESDIR}/${PV_MAJOR}-sema.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 /etc/udev/rules.d/
+	doins "${udevrules}"
+}
diff --git a/app-emulation/vmware-player/ChangeLog b/app-emulation/vmware-player/ChangeLog
index ac9bc02..41fc2e8 100644
--- a/app-emulation/vmware-player/ChangeLog
+++ b/app-emulation/vmware-player/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  30 Mar 2011; Matt Whitlock (whitslack) <matt@whitlock.name>
+  +vmware-player-3.1.4.385536.ebuild:
+  bumped to 3.1.4.385536
+
   20 Mar 2011; Vadim Kuznetsov <vadimk@gentoo.org>
   -vmware-player-3.1.2.301548.ebuild:
   removed old version
diff --git a/app-emulation/vmware-player/Manifest b/app-emulation/vmware-player/Manifest
index d5872f4..50ca18e 100644
--- a/app-emulation/vmware-player/Manifest
+++ b/app-emulation/vmware-player/Manifest
@@ -4,6 +4,9 @@ AUX list-component-files.xsl 545 RMD160 46747c300daf5c6b2c143f02840a94a409f381c4
 AUX vmware-3.0.rc 779 RMD160 ec0d76cac81573feb43d09d8450fcf6d5d93f580 SHA1 b8503204c5aa9a85ca253edd92b5d4191aca5ef9 SHA256 84620cd3bbe159d163eef37d8cd1bcffa21c8f2b56cd70d35bcd7c1a4a539760
 DIST VMware-Player-3.1.3-324285.i386.bundle 107374882 RMD160 814b7cd883457cf6bbbd3a17b2f71aaa22b0e71e SHA1 4abb87d37706c47a86337ada1d23d390455e4931 SHA256 333697a2812aec9cfbd95a8201f29a7e4b975281e163c43ce3e266240c4daa42
 DIST VMware-Player-3.1.3-324285.x86_64.bundle 103173173 RMD160 a56247dbfe97f139bcd6fb40dbadf68b8c42ace7 SHA1 6608bce64811be4480e667726aefefdc2b71e4e3 SHA256 79122e30e1df20ab7d684cd3427bc0d69d00ed1bc3b37c3d9cd805804b1d6d7d
+DIST VMware-Player-3.1.4-385536.i386.bundle 107830710 RMD160 af440db7c96856528acfe6db9f3c278dbac85525 SHA1 7350051c0fc781604d1d46bc24003434cbcd3b26 SHA256 3ebc950185bd101c34e1728ded4671b1cbc670e835e3ee634b4153663ce7b11e
+DIST VMware-Player-3.1.4-385536.x86_64.bundle 103561067 RMD160 78917bc4fcdf55f781e124ea27c8c5c97129dab3 SHA1 90031375a9c10d9a0a5e32be154c856693ad7526 SHA256 cae705500469587388612ad72ee2cdc6fc0d49fc60a747738c87c6b5e5bee931
 EBUILD vmware-player-3.1.3.324285.ebuild 6189 RMD160 d8ab4a5795986a83a5ed542db337e96336b51853 SHA1 3d721cbe397d2594323e02a94539225b7a4c3d4e SHA256 f89bbf76429dbca9e9bfbb260b415b98e96c496a0abcdd40d1ad71a9b05dfc3f
-MISC ChangeLog 5113 RMD160 b0d211ada58a7d0c9e25f557d4f9e2554ecf226f SHA1 d28d604d7ca24e5c2be63af72add1233aa494c81 SHA256 eb6aeaf57360d624c93f0be4ed00077074a242485394fde94d7c354c4762fee8
+EBUILD vmware-player-3.1.4.385536.ebuild 6189 RMD160 ffe43a6ec3ecddf5d6c99c20844afe946f8f171a SHA1 f52a7d4a4678177c4800446de86570f2597d39f1 SHA256 6815aa70b88f95674ecc84f4d70182905c5d89586e3bb05e75e3d48943dd1e59
+MISC ChangeLog 5239 RMD160 b03222f9ed59919bd32956738a04262e4d2459c0 SHA1 cf58655afacf1fe63d4116525f1f6599ce7ddd4d SHA256 4c808199e8d79d8ed9177c97d1b7606dd40fb3640a511b0e13d19e32e22e7dc8
 MISC metadata.xml 238 RMD160 beef158e0603e5808d104743feba4be3e7a7e8c4 SHA1 276217c6f03ae24c0196519197240031a6961254 SHA256 8374f3a2a8f05bf0690ab35f79a20980026aefa9fabae93fe81442f54291018b
diff --git a/app-emulation/vmware-player/vmware-player-3.1.4.385536.ebuild b/app-emulation/vmware-player/vmware-player-3.1.4.385536.ebuild
new file mode 100644
index 0000000..e6207c2
--- /dev/null
+++ b/app-emulation/vmware-player/vmware-player-3.1.4.385536.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit eutils versionator fdo-mime gnome2-utils vmware-bundle
+
+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/player/"
+SRC_URI="
+	x86? ( ${MY_P}.i386.bundle )
+	amd64? ( ${MY_P}.x86_64.bundle )
+	"
+
+LICENSE="vmware"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="doc +vmware-tools"
+RESTRICT="binchecks fetch 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
+	dev-cpp/gtkmm
+	dev-cpp/libgnomecanvasmm
+	dev-cpp/libsexymm
+	dev-cpp/pangomm
+	dev-libs/atk
+	dev-libs/glib
+	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
+	gnome-base/librsvg
+	gnome-base/orbit
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libart_lgpl
+	=media-libs/libpng-1.2*
+	net-misc/curl
+	sys-devel/gcc
+	sys-fs/fuse
+	sys-libs/glibc
+	sys-libs/zlib
+	x11-libs/cairo
+	x11-libs/gtk+
+	x11-libs/libgksu
+	x11-libs/libICE
+	x11-libs/libsexy
+	x11-libs/libSM
+	>=x11-libs/libview-0.6.6
+	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-server
+	!app-emulation/vmware-workstation"
+PDEPEND="~app-emulation/vmware-modules-238.4
+	vmware-tools? ( app-emulation/vmware-tools )"
+
+S=${WORKDIR}/vmware-player-app
+VM_INSTALL_DIR="/opt/vmware"
+
+pkg_nofetch() {
+	local bundle
+
+	if use x86; then
+		bundle="${MY_P}.i386.bundle"
+	elif use amd64; then
+		bundle="${MY_P}.x86_64.bundle"
+	fi
+
+	einfo "Please download ${bundle}"
+	einfo "from ${HOMEPAGE}"
+	einfo "and place it in ${DISTDIR}"
+}
+
+src_unpack() {
+	vmware-bundle_extract-bundle-component "${DISTDIR}/${A}" vmware-player-app
+}
+
+src_prepare() {
+	rm -f bin/vmware-modconfig
+	rm -rf lib/modules/binary
+
+	# remove superfluous libraries
+	ebegin 'Removing superfluous libraries'
+	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
+	eend
+}
+
+src_install() {
+	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/* || die "failed to install bin"
+	dosbin sbin/* || die "failed to install sbin"
+
+	# install the libraries
+	insinto "${VM_INSTALL_DIR}"/lib/vmware
+	doins -r lib/* || die "failed to install lib"
+
+	# 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 the ancillaries
+	insinto /usr
+	doins -r share || die "failed to install share"
+
+	# install documentation
+	if use doc; then
+		dodoc doc/* || die "failed to install docs"
+	fi
+
+	# create symlinks for the various tools
+	local tool ; for tool in vmplayer{,-daemon} \
+			vmware-{acetool,unity-helper,modconfig{,-console},gksu,fuseUI} ; do
+		dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}" || die
+	done
+	dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer "${VM_INSTALL_DIR}"/bin/vmplayer || die
+
+	# fix up permissions
+	chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware/{bin/*,lib/wrapper-gtk24.sh}
+	chmod 04711 "${D}${VM_INSTALL_DIR}"/sbin/vmware-authd
+	chmod 04711 "${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 = "${major_minor_revision}"
+		product.buildNumber = "${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/ChangeLog b/app-emulation/vmware-tools/ChangeLog
index c1d1f67..b47170f 100644
--- a/app-emulation/vmware-tools/ChangeLog
+++ b/app-emulation/vmware-tools/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  30 Mar 2011; Matt Whitlock (whitslack) <matt@whitlock.name>
+  +vmware-tools-8.4.6.385536.ebuild:
+  bumped to 8.4.6.385536
+
   20 Mar 2011; Vadim Kuznetsov <vadimk@gentoo.org>
   -vmware-tools-8.4.2.261024.ebuild, -vmware-tools-8.4.4.301548.ebuild,
   vmware-tools-8.4.5.324285.ebuild:
diff --git a/app-emulation/vmware-tools/Manifest b/app-emulation/vmware-tools/Manifest
index 0ae26bf..b6d0536 100644
--- a/app-emulation/vmware-tools/Manifest
+++ b/app-emulation/vmware-tools/Manifest
@@ -1,15 +1,28 @@
 DIST vmware-tools-freebsd-8.4.5-324285.i386.component.tar 18165760 RMD160 c98dd7d03bfd4de19fe3189985bc737ffdc6a674 SHA1 1070f41cd1e88d2eef175c56368d563cf4eeb2f6 SHA256 76b39b6c56d67c1d82beb963a45f0acc578eabf6f3bde4da22e1803160b18b3d
 DIST vmware-tools-freebsd-8.4.5-324285.x86_64.component.tar 18165760 RMD160 696a727bc41c6461381291404007efde7dc49c2c SHA1 dd070850c67889241eb03bc7d8de2e1fb43e3dea SHA256 e2adebf675c3b16120ae00cb6932286438986035b1e83fa60aa7fae492624ee1
+DIST vmware-tools-freebsd-8.4.6-385536.i386.component.tar 18165760 RMD160 a66147db80499270ac91a471b167f1e63203dc30 SHA1 46e3260c52ced75fc59b38ada46561e32c7d0af2 SHA256 06c53da15e8778ea5fcd0b494fef6cd4989dc6b0140ebeaec04da08891979578
+DIST vmware-tools-freebsd-8.4.6-385536.x86_64.component.tar 18165760 RMD160 78436acfec63f124cb9ddd7544a164f3407b3705 SHA1 fe27b71d7bf97fc5cc9382270eeed13b6622f2d1 SHA256 5ff252ceade69d0e0dc4949429349bdff9c4b0e1a3abfbd3c2cd16b393a2a166
 DIST vmware-tools-linux-8.4.5-324285.i386.component.tar 106291200 RMD160 020a3ae58f83d5490186d0cff86671c0e1b60c3a SHA1 4d60c912d2284e30612c2cbf78989b27652eb5f5 SHA256 95d5ddd9d4d9e7848c51fd694d394f41e4f53202c8b3aca039c87933dff5cd92
 DIST vmware-tools-linux-8.4.5-324285.x86_64.component.tar 106291200 RMD160 19ea9fad0badd198b036ce02cfad22e477b908b4 SHA1 743d242da5d4c7b8338ac765d6b20c6e255c4407 SHA256 0644fd171393dbfa64ec74cbd99fa481d258b3fbf49d5858953b2ac3d9be4f9e
+DIST vmware-tools-linux-8.4.6-385536.i386.component.tar 107100160 RMD160 7a89091e58dfb5ff35a4f164f3483e2c30d7ca97 SHA1 d3d6e6cb5830684355816c126ee4b44e2c940fe2 SHA256 8e29d281409c8f15becdda0b67874e0bfed3e44566c16925ba429d08ed71e0e1
+DIST vmware-tools-linux-8.4.6-385536.x86_64.component.tar 107100160 RMD160 0815cee699f4f61a21a829fa0ea9e84ffae6bd18 SHA1 b9f724e1c92f903cc1f870a339236e73c489c3ea SHA256 8705a7820c25efc887fd274cc8f653118aa434cb2174d2f828360efe6af4135e
 DIST vmware-tools-netware-8.4.5-324285.i386.component.tar 81920 RMD160 78d1cb3dd729b369621d995441732edadfb8aa46 SHA1 80970772979bd98286b6e608e08dd6ff89bb5f1f SHA256 f2ac098b2a49b1f5c68649899fbafaff452dc00249d67fefaca3f5525e15a2b2
 DIST vmware-tools-netware-8.4.5-324285.x86_64.component.tar 81920 RMD160 673de9ef5b677a6a1a9adc497f9b38ca675d2f21 SHA1 c629cd22c28b1c7087d4e3dea262cb0420dbed4e SHA256 08efcf0e4264a0b14b3df26adf053d3cfdd0145b2e998cbd7b27172c0473e120
+DIST vmware-tools-netware-8.4.6-385536.i386.component.tar 81920 RMD160 a78adf09c1d4f9adf0be7cbf1e775a0958163f86 SHA1 3a146a3acf790159c5d1cecd4163381ad9d11649 SHA256 d514ed82d72b746904183a90816be74c68da659009b1f6182e3be759bf79e4bb
+DIST vmware-tools-netware-8.4.6-385536.x86_64.component.tar 81920 RMD160 ac912bf101d147c62e921f7a688b93d40cf5fc50 SHA1 e453cf80289bcb5edad6b2ff28dbef2a9f46e202 SHA256 6d1dfd799d99e3b926d4fba907ba82a01881c4ce5f0a573bf96863d287b640e5
 DIST vmware-tools-solaris-8.4.5-324285.i386.component.tar 19589120 RMD160 427bb521a3b79313f580e69c283d60c1f187244c SHA1 6b5aadcc7cae82d4e8a2fa5ec35dfd5a212af079 SHA256 7675fb978b7b66dea159c8c40eb5366c2ab1a0214b848826ac5e8b8a6f7f62f0
 DIST vmware-tools-solaris-8.4.5-324285.x86_64.component.tar 19589120 RMD160 c8259c0f26a38fbef0b723057cc07edf9cfd56ab SHA1 3da24f223d5d0397d68489003bf074ece7a9b997 SHA256 1c12c78ffea917bef3f156681c62e269182016249c601db9ca723b5ec41d7cda
+DIST vmware-tools-solaris-8.4.6-385536.i386.component.tar 19578880 RMD160 9805f425b9ec19bfacc9597118c2b5335551c3c4 SHA1 737384b315228b047a64d02c6b9582e64db763b3 SHA256 9adf0c001d5783c587bc3cf99a734f7029a928275191c4fe291b0541593d3dee
+DIST vmware-tools-solaris-8.4.6-385536.x86_64.component.tar 19578880 RMD160 a52bfac360967fbdf83f7230a953dbc61524f1f4 SHA1 18d0caed05708b7c3b3b9be4def10efce4dc9032 SHA256 270dd7184c7c2ade14e50be6cb023c86b6dc76f020a59e8bcccfd95408ecca62
 DIST vmware-tools-winPre2k-8.4.5-324285.i386.component.tar 11059200 RMD160 aa5b45f24aa3da4b353875e4341f5652ab3ef23b SHA1 5d2ddec6f70bd561e629a2fb8c16373808846a27 SHA256 f75f901ceaf6e54a9683f16c47917e5c41c673bfa4ac53020ebf83aa9b52fb6d
 DIST vmware-tools-winPre2k-8.4.5-324285.x86_64.component.tar 11059200 RMD160 de751be24fb01acf1f2fa4a160235f01c936432a SHA1 f2711189b82d8560b99160282d1fa8ad818b114b SHA256 38be3dc07c80c4c123a8c886833b30c825a3ce638f87f84c5a8d46dc84b17496
+DIST vmware-tools-winPre2k-8.4.6-385536.i386.component.tar 11059200 RMD160 0f74ec2af737c4a14aa5f2e6b367bf2804fb9146 SHA1 ae764a5ef8383fe066f3c193841af589328e659c SHA256 87ae52fb10410d20bf1c798772af4b0368a71bbfc6b2c29091c5bee7af5496ae
+DIST vmware-tools-winPre2k-8.4.6-385536.x86_64.component.tar 11059200 RMD160 bc8ca6f722ce46749358fc33d5db114b8110f9cb SHA1 9da2bf1e40311177e4482bb6d2567b2e2392cfe2 SHA256 2423a8f55fb3f65d8aec53e3a1690434e33ad100ed427f37ee465c07733e4984
 DIST vmware-tools-windows-8.4.5-324285.i386.component.tar 38195200 RMD160 870112d27840af64243ac9adc801f9d0cf6ef019 SHA1 62e6b283c61b006a59a119a68fcab131c7a2f8ee SHA256 0b44dd388bb81a52e7977fac8f53d066ec83f449d99bd3b82cfd44d05329bd78
 DIST vmware-tools-windows-8.4.5-324285.x86_64.component.tar 38195200 RMD160 4e47a537819848ff938e9a288600d9ccb4a01c5f SHA1 883c08ef88cc9af1ad767eb547e565bc99d7f122 SHA256 1dd8f634cfc8e4f9f9a39d223a02379e3221590036d7bae36db035f089aa89f5
+DIST vmware-tools-windows-8.4.6-385536.i386.component.tar 38318080 RMD160 5ce8d6b208a10d78d51997a41ac65fb3e2a697dd SHA1 edd2f2b76b8742f9aba01faffa1c55867d0ce33e SHA256 c8dcaf45d2336a9fbb6a550410b9a7fd17738352913b1026bd6ee1166e97ff46
+DIST vmware-tools-windows-8.4.6-385536.x86_64.component.tar 38318080 RMD160 876c414dca635171c82a1df33dd618f165b85380 SHA1 ea544c4fbd7258c2c7c6d273ccd31609f3a4ffac SHA256 14137e8bc250404028e1f21182373bd9629ade7ff71c44100662e1484632b290
 EBUILD vmware-tools-8.4.5.324285.ebuild 1480 RMD160 57fe741fc052984366e5806755530a38cafce551 SHA1 ec932a04eaeefcb56adfbb2dd9687e6143e59f5f SHA256 b76530055723199d7353bd0d0a58e0c9cf72295988693597a4db047968cfd0db
-MISC ChangeLog 1099 RMD160 7d275d12eab3324fd3d44d40db31c16017505200 SHA1 0c274590a00a3e37b8144c8096f6846091025b7d SHA256 a7b0568ed74a5412ac53ad7c2507e14b1043de5d56e8e26a927ddce03d5db642
+EBUILD vmware-tools-8.4.6.385536.ebuild 1480 RMD160 c3b900691c6fa46083335ef55afeb410708d18f3 SHA1 f9a270748b84b9b1f6c070e6382d4f3c1b104046 SHA256 3d664ed9a2c4b242f763d6aa48713d4a5624f655991e2ab51a853fd00e61dff0
+MISC ChangeLog 1224 RMD160 35645e0de89716972614c4cbf79771c96f1ba165 SHA1 51c1adb5fc8b5bcd3ba98c45b41ce3c7628368ae SHA256 b3f98cdd2aebe1ad54f45e545e009a1dec83c1bb53085b9e7150d231aa91af0b
 MISC metadata.xml 159 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 SHA1 f46b02a39bcd0165558de67ff4256cfc812418a3 SHA256 8581ae1c90a48f50fa0542c7fb28cb8984baaf12f50fa18f33e467081effb215
diff --git a/app-emulation/vmware-tools/vmware-tools-8.4.6.385536.ebuild b/app-emulation/vmware-tools/vmware-tools-8.4.6.385536.ebuild
new file mode 100644
index 0000000..96c3c87
--- /dev/null
+++ b/app-emulation/vmware-tools/vmware-tools-8.4.6.385536.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit versionator vmware-bundle
+
+MY_PV="$(replace_version_separator 3 - $PV)"
+BASE_URI="http://softwareupdate.vmware.com/cds/vmw-desktop/player/3.1.4/385536/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="!<app-emulation/vmware-workstation-7"
+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/ChangeLog b/app-emulation/vmware-workstation/ChangeLog
index aba43dc..21a7b9c 100644
--- a/app-emulation/vmware-workstation/ChangeLog
+++ b/app-emulation/vmware-workstation/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  30 Mar 2011; Matt Whitlock (whitslack) <matt@whitlock.name>
+  +vmware-workstation-7.1.4.385536.ebuild:
+  bumped to 7.1.4.385536
+
   20 Mar 2011; Vadim Kuznetsov <vadimk@gentoo.org>
   -vmware-workstation-7.1.2.301548.ebuild:
   removed old version
diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
index 008c668..8fb01c3 100644
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@@ -4,6 +4,9 @@ AUX list-component-files.xsl 545 RMD160 46747c300daf5c6b2c143f02840a94a409f381c4
 AUX vmware-7.0.rc 778 RMD160 ed0dd6d11680d7ced8724970ee1be77efd48e970 SHA1 84d9aae6bbc8a33806842fd00699a2b81a7bb18c SHA256 50aab1855926e6ae808ed85ddc8b7d83d7441f7d7c4b3726cc1e8bebd4da8e63
 DIST VMware-Workstation-7.1.3-324285.i386.bundle 130627639 RMD160 97e00fe4e0a83bc6f7481291254f25b6e892eac0 SHA1 c588f48b4e57e2268a0f9e587edb7bc978a11427 SHA256 a9a2f9c6d030767a1a168ddb8c2b0aafdf9f52bbaa51f229cb8453278bb28b11
 DIST VMware-Workstation-7.1.3-324285.x86_64.bundle 137498515 RMD160 89f117beb98c5e813ce871e10f64438c1cd0615e SHA1 dd1712f9551fee14efa5b60bf079f70010cc11c7 SHA256 0a865d8724bae23605b2e8b93b0b0b3e256a58c16f43ac1fbae21cc8f37ac0ab
+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
 EBUILD vmware-workstation-7.1.3.324285.ebuild 8125 RMD160 add8bc42e33fd6aba9d5ddcb512781481b4e3a47 SHA1 9f513bf2e9a6b1bb0e8ae84a122d5d300b3085c8 SHA256 706e7e549cdda4dd4e6ac55529a6224c8b1b41a3690ccb55e204f53ce77d8560
-MISC ChangeLog 5671 RMD160 c2da29dff6e2294da8518d0e43f9f4e310b34290 SHA1 da62a4e463b1060f12e8f0a777bd20baa822b6ff SHA256 d04a5d1d20313b0e65b64d3ab403e2681a33b9617c81e70b6550d64114238aae
+EBUILD vmware-workstation-7.1.4.385536.ebuild 8125 RMD160 148afb0aa9cd707bde4f4fec9d8afbd772bb3c72 SHA1 e441ae9692fadc763c58afbf4644d36bc8c61c52 SHA256 2a4be770735bd45c918f9a1612c09b0dca41d8d388c869999a8d453b22d30900
+MISC ChangeLog 5802 RMD160 3773aba8c3f48e97a6436c63524ea27d74cec302 SHA1 8852703682085f15529b1b74eb65667944737e58 SHA256 b2f86a6f975cde83d91fe4002d39e021d9057b156a132bbccd75b058d7c3c88b
 MISC metadata.xml 699 RMD160 13003f11d344342b6adffbe4f6be7cd72e64f9a3 SHA1 b85c9bb8a2312f7feab5200a9e3a2d6a45d3533f SHA256 0afdf7eebf72c9c781523ff4e2fff3b7f41b8948065c583ae4aa86e71ce067af
diff --git a/app-emulation/vmware-workstation/vmware-workstation-7.1.4.385536.ebuild b/app-emulation/vmware-workstation/vmware-workstation-7.1.4.385536.ebuild
new file mode 100644
index 0000000..a988323
--- /dev/null
+++ b/app-emulation/vmware-workstation/vmware-workstation-7.1.4.385536.ebuild
@@ -0,0 +1,310 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit eutils versionator fdo-mime gnome2-utils vmware-bundle
+
+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/workstation/"
+SRC_URI="
+	x86? ( ${MY_P}.i386.bundle )
+	amd64? ( ${MY_P}.x86_64.bundle )
+	"
+
+LICENSE="vmware"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="doc vix +vmware-tools"
+RESTRICT="binchecks fetch 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
+	dev-cpp/gtkmm
+	dev-cpp/libgnomecanvasmm
+	dev-cpp/libsexymm
+	dev-cpp/pangomm
+	dev-libs/atk
+	dev-libs/glib
+	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
+	gnome-base/librsvg
+	gnome-base/orbit
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libart_lgpl
+	=media-libs/libpng-1.2*
+	net-misc/curl
+	sys-devel/gcc
+	sys-fs/fuse
+	sys-libs/glibc
+	sys-libs/zlib
+	x11-libs/cairo
+	x11-libs/gtk+
+	x11-libs/libgksu
+	x11-libs/libICE
+	x11-libs/libsexy
+	x11-libs/libSM
+	>=x11-libs/libview-0.6.6
+	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-server
+	!app-emulation/vmware-player"
+PDEPEND="~app-emulation/vmware-modules-238.4
+	vmware-tools? ( app-emulation/vmware-tools )"
+
+S=${WORKDIR}
+VM_INSTALL_DIR="/opt/vmware"
+
+pkg_nofetch() {
+	local bundle
+
+	if use x86; then
+		bundle="${MY_P}.i386.bundle"
+	elif use amd64; then
+		bundle="${MY_P}.x86_64.bundle"
+	fi
+
+	einfo "Please download ${bundle}"
+	einfo "from ${HOMEPAGE}"
+	einfo "and place it in ${DISTDIR}"
+}
+
+src_unpack() {
+	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
+	if use vix; then
+		vmware-bundle_extract-bundle-component "${DISTDIR}/${A}" vmware-vix
+	fi
+}
+
+src_prepare() {
+	rm -rf "${S}"/vmware-player-app/bin/vmware-modconfig
+	rm -rf "${S}"/vmware-player-app/lib/modules/binary
+
+	# remove superfluous libraries
+	ebegin 'Removing superfluous libraries'
+	cd vmware-player-app/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
+	cd ../../../vmware-workstation/lib/lib || die
+	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
+	eend
+}
+
+src_install() {
+	local major_minor_revision=$(get_version_component_range 1-3 "${PV}")
+	local build=$(get_version_component_range 4 "${PV}")
+
+	cd "${S}"/vmware-player-app
+
+	# install the binaries
+	into "${VM_INSTALL_DIR}"
+	dobin bin/*
+	dosbin sbin/*
+
+	# install the libraries
+	insinto "${VM_INSTALL_DIR}"/lib/vmware
+	doins -r lib/*
+
+	# 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 the ancillaries
+	insinto /usr
+	doins -r share
+
+	# install documentation
+	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
+	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
+
+	# install documentation
+	doman man/man1/vmware.1.gz
+
+	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/*
+
+		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
+
+	# create symlinks for the various tools
+	local tool ; for tool in vmware vmplayer{,-daemon} \
+			vmware-{acetool,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
+
+	# 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}"/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'
+	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.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
+
+	# install the init.d script
+	local initscript="${T}/vmware.rc"
+	sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
+		"${FILESDIR}/vmware-7.0.rc" > ${initscript}
+	newinitd "${initscript}" vmware
+
+	# 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"
+}
+
+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
+}