added vmware-tools; removed x.1.4; workstation 7.1.5 small fixes

svn path=/trunk/; revision=503

11 files changed, 21 insertions, 873 deletions

diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest
index 300bb89..9a62e59 100644
--- a/app-emulation/vmware-modules/Manifest
+++ b/app-emulation/vmware-modules/Manifest
@@ -17,8 +17,6 @@ DIST vmware-modules-138.10-genpatches-7.tar.bz2 14498 RMD160 a6927bad3eb2b797eb5
 DIST vmware-modules-208.2.patch.bz2 7239 RMD160 f66781709bb18dc370717c32fa72b2907f0e2b11 SHA1 4fece02cd13f8bafdc62562d2f8e2a4cc66c75a1 SHA256 7b1d16163626b2ea2c1bba82a537368e2f758356580044480994b1fbe0073b47
 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.4-r1.ebuild 1873 RMD160 681c4ccebeb95f2fed04a4c96e61ac2eeb78b7c2 SHA1 cb0182be00360b491b1a786a19e22109433801de SHA256 387ff9118264bb7b4da60676320d1cf464bc45b6c2312ee5b41174ddcf74015a
-EBUILD vmware-modules-238.4.ebuild 1780 RMD160 0c5f9b31e4af93c55096e9a00d4a5fa53acc8c5b SHA1 1a88bb066bbe42a81e3f44a51957db812671d6e7 SHA256 770a9135206ca9f5b90239a38b24349d9b04cd2919a274f6cfc23250c63079aa
 EBUILD vmware-modules-238.5.ebuild 1873 RMD160 681c4ccebeb95f2fed04a4c96e61ac2eeb78b7c2 SHA1 cb0182be00360b491b1a786a19e22109433801de SHA256 387ff9118264bb7b4da60676320d1cf464bc45b6c2312ee5b41174ddcf74015a
 EBUILD vmware-modules-264.0.ebuild 1733 RMD160 a841071b9c267c738da4562749e3d7e3bf15a797 SHA1 b8a9ed3951f7477013271bc65ca9ce66c7ece8b6 SHA256 47b7fd8c4c07cc0deba59de425b596ed553666e649bb35a844889e387cebabbf
 MISC metadata.xml 159 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 SHA1 f46b02a39bcd0165558de67ff4256cfc812418a3 SHA256 8581ae1c90a48f50fa0542c7fb28cb8984baaf12f50fa18f33e467081effb215
diff --git a/app-emulation/vmware-modules/vmware-modules-238.4-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-238.4-r1.ebuild
deleted file mode 100644
index a4bb46a..0000000
--- a/app-emulation/vmware-modules/vmware-modules-238.4-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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 && kernel_is lt 2 6 39; 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"
-	kernel_is ge 2 6 39 && epatch "${FILESDIR}/${PV_MAJOR}-2.6.39.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-modules/vmware-modules-238.4.ebuild b/app-emulation/vmware-modules/vmware-modules-238.4.ebuild
deleted file mode 100644
index a6ee13c..0000000
--- a/app-emulation/vmware-modules/vmware-modules-238.4.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# 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
deleted file mode 100644
index 9a4cbb1..0000000
--- a/app-emulation/vmware-player/ChangeLog
+++ /dev/null
@@ -1,157 +0,0 @@
-# ChangeLog for app-emulation/vmware-player
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  05 Oct 2011; Matt Whitlock (whitslack) <matt@whitlock.name>
-  +vmware-player-3.1.5.491717.ebuild:
-  added VMware Player 3.1.5.491717
-
-  20 Sep 2011; Matt Whitlock (whitslack) <matt@whitlock.name>
-  +vmware-player-4.0.0.471780.ebuild:
-  version bump to VMware Player 4.0.0.471780
-
-  15 Apr 2011; Vadim Kuznetsov <vadimk@gentoo.org>
-  -vmware-player-3.1.3.324285.ebuild, vmware-player-3.1.4.385536.ebuild:
-  cleanup; 3.1.4 moved to portage
-
-  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
-
-*vmware-player-3.1.3.324285 (20 Mar 2011)
-
-  20 Mar 2011; Vadim Kuznetsov <vadimk@gentoo.org> files/vmware-3.0.rc,
-  +vmware-player-3.1.3.324285.ebuild, -vmware-player-3.1.3.324285-r1.ebuild:
-  Folks reported hal is not needed. Undo.
-
-*vmware-player-3.1.3.324285-r1 (19 Mar 2011)
-
-  19 Mar 2011; Vadim Kuznetsov <vadimk@gentoo.org> files/vmware-3.0.rc,
-  -vmware-player-3.1.3.324285.ebuild, +vmware-player-3.1.3.324285-r1.ebuild:
-  it uses hal
-
-  19 Mar 2011; Vadim Kuznetsov <vadimk@gentoo.org>
-  -vmware-player-3.0.1.227600-r6.ebuild:
-  removed old unsecure version
-
-  18 Mar 2011; Vadim Kuznetsov <vadimk@gentoo.org>
-  vmware-player-3.1.3.324285.ebuild:
-  require specific version of vmware-modules 
-
-  19 Nov 2010; Matt Whitlock (whitslack) <matt@whitlock.name>
-  +vmware-player-3.1.3.324285.ebuild:
-  version bump
-
-  24 Sep 2010; Matt Whitlock (whitslack) <matt@whitlock.name>
-  -vmware-player-3.1.1.282343-r1.ebuild, +vmware-player-3.1.2.301548.ebuild:
-  version bump
-
-  13 Sep 2010; Matt Whitlock (whitslack) <matt@whitlock.name>
-  vmware-player-3.1.1.282343-r1.ebuild:
-  add RDEPEND on dev-libs/libaio
-
-  10 Sep 2010; Matt Whitlock (whitslack) <matt@whitlock.name>
-  -vmware-player-3.1.0.261024.ebuild, -vmware-player-3.1.1.282343.ebuild,
-  +vmware-player-3.1.1.282343-r1.ebuild:
-  exclude OpenSSL from unbundling until patched with AES-NI
-
-  24 Aug 2010; Matt Whitlock (whitslack) <matt@whitlock.name>
-  vmware-player-3.1.0.261024.ebuild, vmware-player-3.1.1.282343.ebuild:
-  require >=x11-libs/libview-0.6.6
-
-  13 Aug 2010; Matt Whitlock (whitslack) <matt@whitlock.name>
-  +vmware-player-3.1.1.282343.ebuild:
-  version bump to VMware Player 3.1.1.282343
-
-  18 Jul 2010; Matt Whitlock (whitslack) <matt@whitlock.name>
-  vmware-player-3.0.1.227600-r6.ebuild, vmware-player-3.1.0.261024.ebuild:
-  depend on OpenSSL 0.9.8* specifically
-
-  22 May 2010; Matt Whitlock (whitslack) <matt@whitlock.name>
-  vmware-player-3.1.0.261024.ebuild:
-  readded needed dependencies
-
-  22 May 2010; Matt Whitlock (whitslack) <matt@whitlock.name>
-  -vmware-player-3.0.1.227600.ebuild, vmware-player-3.0.1.227600-r6.ebuild,
-  +vmware-player-3.1.0.261024.ebuild:
-  new version of VMware Player
-
-  11 May 2010; Vadim Kuznetsov <vadimk@gentoo.org>
-  vmware-player-3.0.1.227600-r6.ebuild:
-  depend on libpng-1.2
-
-*vmware-player-3.0.1.227600-r6 (24 Apr 2010)
-
-  24 Apr 2010; Vadim Kuznetsov <vadimk@gentoo.org>
-  -vmware-player-3.0.1.227600-r5.ebuild,
-  +vmware-player-3.0.1.227600-r6.ebuild:
-  Matt Whitlock vmware-tools patch.
-  Added vmware-tools ebuild and vmware-bundle.eclass
-
-*vmware-player-3.0.1.227600-r5 (11 Apr 2010)
-
-  11 Apr 2010; Vadim Kuznetsov <vadimk@gentoo.org>
-  -vmware-player-3.0.1.227600-r4.ebuild,
-  +vmware-player-3.0.1.227600-r5.ebuild:
-  fixed dependencies
-
-*vmware-player-3.0.1.227600-r4 (09 Apr 2010)
-
-  09 Apr 2010; Vadim Kuznetsov <vadimk@gentoo.org>
-  -vmware-player-3.0.1.227600-r1.ebuild,
-  -vmware-player-3.0.1.227600-r3.ebuild,
-  +vmware-player-3.0.1.227600-r4.ebuild:
-  experimental: deleted libs, that available in the system
-
-  24 Mar 2010; Vadim Kuznetsov <vadimk@gentoo.org>
-  vmware-player-3.0.1.227600-r3.ebuild:
-  added use flag doc, fixed dependencies, added bunch of "or die"
-
-  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>
-  -vmware-player-3.0.1.227600-r2.ebuild,
-  +vmware-player-3.0.1.227600-r3.ebuild, files/vmware-3.0.rc:
-  vmware-usbarbitrator is added to rc script
-
-*vmware-player-3.0.1.227600-r2 (04 Mar 2010)
-
-  04 Mar 2010; Vadim Kuznetsov <vadimk@gentoo.org>
-  +vmware-player-3.0.1.227600-r2.ebuild, files/vmware-3.0.rc:
-  "Binary-only applications must not be installed outside of /opt"
-
-*vmware-player-3.0.1.227600-r1 (03 Mar 2010)
-
-  03 Mar 2010; Vadim Kuznetsov <vadimk@gentoo.org>
-  vmware-player-3.0.1.227600.ebuild, +vmware-player-3.0.1.227600-r1.ebuild,
-  files/vmware-3.0.rc:
-  Only lib goes to /opt/vmware. Bin installs into /usr/bin. Thus no env.d/90
-  No more player subfolder, just /opt/vmware. 
-  config file is moved inside of ebuild.
-  Added fetch restrictions.
-
-*vmware-player-3.0.1.227600 (01 Mar 2010)
-
-  01 Mar 2010; Vadim Kuznetsov <vadimk@gentoo.org>
-  -vmware-player-1.0.9.126128.ebuild, +files/config-3.0,
-  +vmware-player-3.0.1.227600.ebuild, +files/vmware-3.0.rc,
-  -files/1.0.9.126128, +files/list-bundle-components.xsl,
-  +files/list-component-files.xsl:
-  VMware Player 3.0.1.227600 ebuild submitted by Matt Whitlock . Bug 290831.
-
-  25 Mar 2009; Mike Auty <ikelos@gentoo.org>
-  vmware-player-2.5.1.126130.ebuild:
-  gtkmm's accessibility is now always enabled (see bug #247249)
-
-  16 Jan 2009; Mike Auty <ikelos@gentoo.org>
-  vmware-player-1.0.9.126128.ebuild, vmware-player-2.5.1.126130.ebuild:
-  Stabilize vmware-player to match the main tree.
-
diff --git a/app-emulation/vmware-player/Manifest b/app-emulation/vmware-player/Manifest
index 5c78ed9..9981e9b 100644
--- a/app-emulation/vmware-player/Manifest
+++ b/app-emulation/vmware-player/Manifest
@@ -2,14 +2,10 @@ AUX config-3.0 308 RMD160 4773cf7aba9b54c37f24dddeaef24a3899d2efed SHA1 574e77f2
 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-3.0.rc 779 RMD160 ec0d76cac81573feb43d09d8450fcf6d5d93f580 SHA1 b8503204c5aa9a85ca253edd92b5d4191aca5ef9 SHA256 84620cd3bbe159d163eef37d8cd1bcffa21c8f2b56cd70d35bcd7c1a4a539760
-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
 DIST VMware-Player-3.1.5-491717.i386.bundle 107094686 RMD160 293941018c9dec86eee8161eac82c4079140070c SHA1 4156bdfb7f679114671b416d178028fdc4d3beb4 SHA256 8a614bb32b680ef5fe75f65de7e842ecd32caaab434ef94bc89565df03706b01
 DIST VMware-Player-3.1.5-491717.x86_64.bundle 103019114 RMD160 b1a2544e5718474a1987389136a42034dfbc2ff2 SHA1 a253a486d6c6848620de200ef1837ced903daa1c SHA256 5aa1f01d09a1c39da06f3a314d3e47e75e80b4a345ef76dabe14e538fe3bc511
 DIST VMware-Player-4.0.0-471780.i386.bundle 131366064 RMD160 e4513ea96b557a5067b3a822b399cb5fcb4de426 SHA1 c8cb81e1d35dab000e7dbe3e1aee519fd6aa89fd SHA256 5a88940b92bebc1b5c09caecbfcbe46b05e857b8383e52d392ee62fab822e00b
 DIST VMware-Player-4.0.0-471780.x86_64.bundle 129048195 RMD160 0c4a2174212e80dc62781ef5f3b53cee682f1bcf SHA1 e1452a72895c902cc6b4f85be9f4fb79c85ac809 SHA256 5218c6d2c27b7b0d2019aaaa2573a1411bc202ad7bfa06a1a6c3df913d8dd5c4
-EBUILD vmware-player-3.1.4.385536.ebuild 6334 RMD160 3583e3f09e73e9520fa518a6eebcb2cbe9b92ff5 SHA1 61af3afb8ab8e5b25c9b1b3cd418abee6aa2ab01 SHA256 145e55cea8823e379251f6267c86a7f742a2e79502623363eb59e7e1654bc3d2
 EBUILD vmware-player-3.1.5.491717.ebuild 6334 RMD160 ee39299fbfb01c28c1890c862d3f39a4e3d7c163 SHA1 8b90cfe522e17a5c15b742afbc139d60decf9ca6 SHA256 ea378d1d5d1308689bacf2104f618dec655f732eff2c3e52ee11acb26656c57e
 EBUILD vmware-player-4.0.0.471780.ebuild 6610 RMD160 01058b2a1f928186568cc7a3846a135127ea1a41 SHA1 281d04ddd781c1ac1692ceee19dd89479395ce66 SHA256 49cda31c67e372817a86ac689eb765ac3a702a0791be2f3e33844b5dda5eecd1
-MISC ChangeLog 5680 RMD160 ad10ba5d56ade9f5cb9acece70c4d1581a59ba43 SHA1 89bcf50b98357000206b947d3d8bdead15e536b5 SHA256 fed207d900044d3193f4d80a16c246e16dfa367f37f7b290ef1536bce6a206c4
 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
deleted file mode 100644
index a7662d0..0000000
--- a/app-emulation/vmware-player/vmware-player-3.1.4.385536.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/vmware-player-3.1.4.385536.ebuild,v 1.1 2011/04/15 12:33:18 vadimk Exp $
-
-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:2
-	dev-cpp/gtkmm:2.4
-	dev-cpp/libgnomecanvasmm:2.6
-	dev-cpp/libsexymm
-	dev-cpp/pangomm:1.4
-	dev-libs/atk
-	dev-libs/glib:2
-	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:2
-	gnome-base/librsvg:2
-	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+:2
-	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/Manifest b/app-emulation/vmware-tools/Manifest
index 1b6bee2..945fa31 100644
--- a/app-emulation/vmware-tools/Manifest
+++ b/app-emulation/vmware-tools/Manifest
@@ -1,27 +1,27 @@
-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-freebsd-8.4.8-491717.i386.component.tar 18227200 RMD160 9b5cd2d2ec8a63cbe4d09e16943b5877a87e477e SHA1 da619d2bf8540a2cba612ebc39c509b2acbb0842 SHA256 dce856aed590e13b1cab54c59cdee7cb81c4e8b39beab6e3e6836ab8f1bfca6c
+DIST vmware-tools-freebsd-8.4.8-491717.x86_64.component.tar 18227200 RMD160 4f7c1fa970b94490167cc0aad933154bded40e71 SHA1 207cb57bab3929e4397591edb797157e9e3c4403 SHA256 60974cfdca052f6984ca5c006509a39643bae6f12485aaea98d21086db1580d4
 DIST vmware-tools-freebsd-8.8.0-471780.i386.component.tar 15667200 RMD160 8ad2300a171a5671e5a974ce3114b68206eebbd0 SHA1 287a17f68d5c2da485d8276019fb7b7c03ee6d68 SHA256 d92082a69ca0ca11c7b86108b103edbe5f5022e0fac2dc9abdaabd5d20c32796
 DIST vmware-tools-freebsd-8.8.0-471780.x86_64.component.tar 15667200 RMD160 793732735861c4fca3a1c2e7c56685d2ae39675f SHA1 6973df8b9c47b4acacce04f8e103b0df4eadd4b5 SHA256 65b1bfcb4f9f0e99a950232e42eb033481edf988e3ea9a2f8c0d6d235afaec6a
-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-linux-8.4.8-491717.i386.component.tar 107601920 RMD160 7d9d53337391bf08e4ae8a32f7dca46f39a608f0 SHA1 870443e43d7105db89d6bd1a329764ab3b07685a SHA256 799da75391d7112ee10df068a4c60519aaedb6989eeb94a5efe296b3423045a3
+DIST vmware-tools-linux-8.4.8-491717.x86_64.component.tar 107601920 RMD160 2c355199fa561ad80dfca0ba6f0b477e529ceb44 SHA1 000469569298d3601f7ba961252474f9acbed609 SHA256 924f4c786678dc4405a2bff77f784d020561cd1aa6e59951fc963fb257e84c55
 DIST vmware-tools-linux-8.8.0-471780.i386.component.tar 58624000 RMD160 4efa998414461064c2b829c356c59647830f57a6 SHA1 2f77da6a6e2088a7ca5e32e51c34208b9cfa1736 SHA256 a2c4de59d74e302c24d449d5876a6a16f0f58a334a6f7f313b174471174cf0cc
 DIST vmware-tools-linux-8.8.0-471780.x86_64.component.tar 58624000 RMD160 550f8c2138b78f8dc422c7a20978947220093595 SHA1 1b2c89db0a094245b5d683536e1a910c2a924bee SHA256 2be3d54bd86e1ba6a31e1c26bddeff32edaafe73927b9569d74b85d93536563c
-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-netware-8.4.8-491717.i386.component.tar 81920 RMD160 16d2a8c376c09af2a867fc659d6d72222186ecc2 SHA1 37cc1d311b9a43ba4fbeb5cf00d996b74db3b4f8 SHA256 c862e2f78a2cdb915defa26a1084513c51ea0729c865f57936361cb29187f09f
+DIST vmware-tools-netware-8.4.8-491717.x86_64.component.tar 81920 RMD160 e2f2c6efb63bb55c9e501ed80c692acfc626ac33 SHA1 bace6ea27cd9729dc19ffd5bfbcc83cdba3d4d34 SHA256 dc2f236d3b1dcd56919de26b3437e5073085d4384908b7524df15286edbfa1a0
 DIST vmware-tools-netware-8.8.0-471780.i386.component.tar 81920 RMD160 e491a03dc70b4323c949819aed478c872dd4ea40 SHA1 d97bf25fe62719781e7c4fd33ff7d65ce14594ce SHA256 f833eac59622594b1de0cca9a87eb53db9352a9097e245199806e10abd86a451
 DIST vmware-tools-netware-8.8.0-471780.x86_64.component.tar 81920 RMD160 954bee1d970cb47b302c41d1027eef6a52a0d51f SHA1 f5102c70a39bd4d00a531a59c7d851374cf85446 SHA256 5284defeef28f3a93845dfefeaa389165107ae067e9bd2e323e787e3349d381c
-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-solaris-8.4.8-491717.i386.component.tar 19589120 RMD160 3335405f2ece766d015b088268ccc04e5394e932 SHA1 b94b080633172fdabfe73a218112d4abf9b3855e SHA256 4ba329fce0ad15c666351647e258387afc9ef97dede069e3a969891682e62c92
+DIST vmware-tools-solaris-8.4.8-491717.x86_64.component.tar 19589120 RMD160 85e836fe603908213be643f12a938aed9e46d4c3 SHA1 bf99f0f7d1a136cad62501fb8cf811a979f5ecde SHA256 3776cf65c3457f57933ea499f3479cc5fc0b85e6f54d40f0d05e608609261f5c
 DIST vmware-tools-solaris-8.8.0-471780.i386.component.tar 12769280 RMD160 7d97ac31db7e6186ceaf787301f893d6cc7342b2 SHA1 d02b1bc86315efb0d4e9a99016e85edf6d63fb28 SHA256 d57080526e604ae5b429e40ee354fed10cdd51cf91cff6fca63a08067ef86012
 DIST vmware-tools-solaris-8.8.0-471780.x86_64.component.tar 12769280 RMD160 98ea02780764d302335d656e0523c024e81ced9f SHA1 85e84e2c1b795b6876d176c25b7d3681efcdcc08 SHA256 3d7d6bc2543ea4d53d2505c2adbb15417ee8118692b2175609af6f147c8ba466
-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-winPre2k-8.4.8-491717.i386.component.tar 11059200 RMD160 0622bb424ccd80a62584a248c2927923f078f519 SHA1 bcf6297b9389b43ed081a071a4b321c8086d67c4 SHA256 2ec0f90287324a37bf66a718f792d466edd8bf0f3e3c5039b782a3db6fd763c5
+DIST vmware-tools-winPre2k-8.4.8-491717.x86_64.component.tar 11059200 RMD160 4d12bf4663b154cbd2fee5dbf8570d94823dac0a SHA1 d56d64fb00c764a697609e8c12a4b4e90b192f44 SHA256 34ac2895b39701076034bfd00c9fc8d09994c1d0366abddbac2151d51bde1d15
 DIST vmware-tools-winPre2k-8.8.0-471780.i386.component.tar 11253760 RMD160 4a0a8156574e5bceb7c5424ef29436b2be64adfe SHA1 3d009070ac0284ad3ba1ebfb36a20aec3ceebd61 SHA256 53ec58252a50ed2fe3cc520c81c556cc948752ea642578f7a891527162edf2a0
 DIST vmware-tools-winPre2k-8.8.0-471780.x86_64.component.tar 11253760 RMD160 9b05806f92a4b7df7f6951c31842c6945c865d72 SHA1 5d40ebeb7273454d6fe7b02f38a785a8e3e6f860 SHA256 ebbe1d1918c86ffce7ff4530f190c41253ee4cfd973cfde4a8165c3475f0527b
-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
+DIST vmware-tools-windows-8.4.8-491717.i386.component.tar 38174720 RMD160 675c1a884d781879fb6c71b007f81b0deee701e8 SHA1 7d728676e20dc863a96eef5d253c2a4c8616d803 SHA256 80d79afcd36a0458fb59e2423af9915b676593b9306c12d22e0f339600768b9a
+DIST vmware-tools-windows-8.4.8-491717.x86_64.component.tar 38174720 RMD160 03ce9520fd251b748f8553508bec0d86a783ff61 SHA1 928c8697fa8a14ecf6d2cd43c99c807acdb696d4 SHA256 06ab70677eb1b71f9418f80f956efce877b68d2a7e98814bad6bcc33a468bd0f
 DIST vmware-tools-windows-8.8.0-471780.i386.component.tar 50186240 RMD160 dcc72553137810a3775ca3c842f6ec3ab7b7c66c SHA1 c6d32d571670371abe662b8d4152ceef4d730e95 SHA256 99e8da563516033e0d2bcf06b3303c431491b3e1d17bb4b879defbd1f8195c71
 DIST vmware-tools-windows-8.8.0-471780.x86_64.component.tar 50186240 RMD160 bd18ecd1e4775709d5aa4bf026979a42f349a2db SHA1 4194e50d53d16625cfaaaae2a965ea16ef6d77a1 SHA256 98b9500b0a368cc07a4ace483bc22010a3322479b3d9281c6eb2952cfd1580c8
-EBUILD vmware-tools-8.4.6.385536.ebuild 1480 RMD160 c3b900691c6fa46083335ef55afeb410708d18f3 SHA1 f9a270748b84b9b1f6c070e6382d4f3c1b104046 SHA256 3d664ed9a2c4b242f763d6aa48713d4a5624f655991e2ab51a853fd00e61dff0
+EBUILD vmware-tools-8.4.8.491717.ebuild 1480 RMD160 c6074feba3e1b5416b7fe34f1f5fb2d0946e8e6c SHA1 1cde6668a75b8742465b7630e457a9358153c262 SHA256 fe350f6018e5c0c632fc374eb1da9b42b775081cdb80ef829793f879f01400d2
 EBUILD vmware-tools-8.8.0.471780.ebuild 1480 RMD160 14c8a3f28227882206eb75a97b524c49a616d6f9 SHA1 4cff22449ad052727edfa7f1d091f63ef05028cb SHA256 cd5807768897dc2c50c3e8764c28537c9f0102b8a4a921371c07e3543bbd7ed1
 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.8.491717.ebuild
index 96c3c87..0c8d962 100644
--- a/app-emulation/vmware-tools/vmware-tools-8.4.6.385536.ebuild
+++ b/app-emulation/vmware-tools/vmware-tools-8.4.8.491717.ebuild
@@ -5,7 +5,7 @@
 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/"
+BASE_URI="http://softwareupdate.vmware.com/cds/vmw-desktop/player/3.1.5/491717/linux/packages/"
 
 DESCRIPTION="VMware Tools for guest operating systems"
 HOMEPAGE="http://www.vmware.com/products/player/"
diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
index 7325adf..540183e 100644
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@@ -3,13 +3,10 @@ AUX list-component-files.xsl 545 RMD160 46747c300daf5c6b2c143f02840a94a409f381c4
 AUX vmware-7.0.rc 778 RMD160 ed0dd6d11680d7ced8724970ee1be77efd48e970 SHA1 84d9aae6bbc8a33806842fd00699a2b81a7bb18c SHA256 50aab1855926e6ae808ed85ddc8b7d83d7441f7d7c4b3726cc1e8bebd4da8e63
 AUX vmware-8.0.rc 778 RMD160 ed0dd6d11680d7ced8724970ee1be77efd48e970 SHA1 84d9aae6bbc8a33806842fd00699a2b81a7bb18c SHA256 50aab1855926e6ae808ed85ddc8b7d83d7441f7d7c4b3726cc1e8bebd4da8e63
 AUX vmware-server-8.0.rc 1565 RMD160 e11b805ec016afac18778dc1a4af8db963ea2840 SHA1 62ffb7217b6d50a096a535e4c7016862f9cf6eaa SHA256 d33c1afd281502c7ceb6e1d5b981395b055fca6fd927b6aa98c449efd20e018e
-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-7.1.5-491717.i386.bundle 130351656 RMD160 110bc8a4486bdf24cf9b293a4376fb89e0aff56d SHA1 f112d0e5ad00d285982d998c36a554dad4c43700 SHA256 a0f05693cf82ce2fe49b5009bbd2dfb531606b55f8b6656e7e4b06b051c2655c
 DIST VMware-Workstation-7.1.5-491717.x86_64.bundle 137361206 RMD160 b5f302400a0c33b2bc4a2b68ccc070f9329af047 SHA1 0cca1399008630ed76374d794806d60a93dc3e97 SHA256 857a71e4022a357a49aadc0516dae8909b34abf7a3681fbba5e76d92ee3be90b
 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-7.1.5.491717.ebuild 8149 RMD160 b085136d60e7941a28fda85b1cc6098f4fc3f6fa SHA1 b7a6c5c611d84a721f3d06e9782c24f05591c90e SHA256 a18cf2a48a8fd3b446040f5791e6f22acefcb1bfdd49be712cf6409ef966543c
+EBUILD vmware-workstation-7.1.5.491717.ebuild 8264 RMD160 a90d1e633561f0d47aa252b63812e6c5e331ee94 SHA1 2a73547f67b10dda1d97d8d1c78f0231ebfdfc9f SHA256 b30027da9c1e27f88eb6edf69a53d38cc1f21e8e6d4b92164f5efea8e7111d2f
 EBUILD vmware-workstation-8.0.0.471780-r5.ebuild 13264 RMD160 2fbd1127c11009c69d4e7fdfb45397734511a8f5 SHA1 fd78058d0d5782791dfd61265fa3f51aadd6b889 SHA256 d8ee704a1c1d80fa19b6c710446c416ea7d9b3cd5a522a67faadfdc7adebba82
 MISC metadata.xml 821 RMD160 3fe06e26c1f6550712d29d27dbbe1bde8eeb3d29 SHA1 4cacecf9b113a8c46e921e1738d5c191bf693872 SHA256 b5634de5978f816c03495e72d4ee1cb72b372209ee7b8a8e88cec8963aa38647
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
deleted file mode 100644
index 74cade8..0000000
--- a/app-emulation/vmware-workstation/vmware-workstation-7.1.4.385536.ebuild
+++ /dev/null
@@ -1,301 +0,0 @@
-# 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 $
-
-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:2
-	dev-cpp/gtkmm:2.4
-	dev-cpp/libgnomecanvasmm
-	dev-cpp/libsexymm
-	dev-cpp/pangomm
-	dev-libs/atk
-	dev-libs/glib:2
-	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:2
-	gnome-base/librsvg:2
-	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+:2
-	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 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 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
-}
diff --git a/app-emulation/vmware-workstation/vmware-workstation-7.1.5.491717.ebuild b/app-emulation/vmware-workstation/vmware-workstation-7.1.5.491717.ebuild
index 7817879..5516ab3 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-7.1.5.491717.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-7.1.5.491717.ebuild
@@ -138,6 +138,10 @@ src_install() {
 	insinto "${VM_INSTALL_DIR}"/lib/vmware
 	doins -r lib/*
 
+	# install the ancillaries
+	insinto /usr
+	doins -r share
+
 	# 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*
@@ -172,7 +176,8 @@ src_install() {
 	doman man/man1/vmware.1.gz
 
 	if use doc; then
-		dodoc doc/*
+		dodoc doc/open_source_licenses.txt
+		dodoc doc/vmware-vmci/samples/*
 	fi
 
 	# install vmware-vix