From 1f097b1febc532266f556700ee525096d7769ba2 Mon Sep 17 00:00:00 2001
From: Fabio Rossi <rossi.f@inwind.it>
Date: Sun, 21 May 2017 00:17:29 +0200
Subject: Added latest version 12.5.6.5528349

---
 .../vmware-modules/vmware-modules-308.5.4.ebuild   | 155 ------
 .../vmware-modules/vmware-modules-308.5.6.ebuild   | 155 ++++++
 app-emulation/vmware-player/Manifest               |   2 +-
 .../vmware-player-12.5.4.5192485.ebuild            | 387 -------------
 .../vmware-player-12.5.6.5528349.ebuild            | 387 +++++++++++++
 app-emulation/vmware-tools/Manifest                |   6 +
 .../vmware-tools-10.1.6.5214329.ebuild             |  58 ++
 app-emulation/vmware-workstation/Manifest          |   2 +-
 .../vmware-workstation-12.5.4.5192485.ebuild       | 598 ---------------------
 .../vmware-workstation-12.5.6.5528349.ebuild       | 598 +++++++++++++++++++++
 10 files changed, 1206 insertions(+), 1142 deletions(-)
 delete mode 100644 app-emulation/vmware-modules/vmware-modules-308.5.4.ebuild
 create mode 100644 app-emulation/vmware-modules/vmware-modules-308.5.6.ebuild
 delete mode 100644 app-emulation/vmware-player/vmware-player-12.5.4.5192485.ebuild
 create mode 100644 app-emulation/vmware-player/vmware-player-12.5.6.5528349.ebuild
 create mode 100644 app-emulation/vmware-tools/vmware-tools-10.1.6.5214329.ebuild
 delete mode 100644 app-emulation/vmware-workstation/vmware-workstation-12.5.4.5192485.ebuild
 create mode 100644 app-emulation/vmware-workstation/vmware-workstation-12.5.6.5528349.ebuild

diff --git a/app-emulation/vmware-modules/vmware-modules-308.5.4.ebuild b/app-emulation/vmware-modules/vmware-modules-308.5.4.ebuild
deleted file mode 100644
index 4fcb06c..0000000
--- a/app-emulation/vmware-modules/vmware-modules-308.5.4.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod user versionator udev
-
-PV_MAJOR=$(get_major_version)
-PV_MINOR=$(get_version_component_range 2-3)
-
-DESCRIPTION="VMware kernel modules"
-HOMEPAGE="http://www.vmware.com/"
-
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="pax_kernel +vmci +vsock"
-REQUIRED_USE="!vsock? ( !vmci )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	|| ( =app-emulation/vmware-player-12.${PV_MINOR}*
-	=app-emulation/vmware-workstation-12.${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
-	if use vmci ; then
-		CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI"
-	else
-		CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI"
-	fi
-	if use vsock ; then
-		CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI_VSOCKETS"
-	else
-		CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI_VSOCKETS"
-	fi
-
-	linux-info_pkg_setup
-
-	linux-mod_pkg_setup
-
-	VMWARE_GROUP=${VMWARE_GROUP:-vmware}
-
-	VMWARE_MODULE_LIST_ALL="vmblock vmmon vmnet vmci vsock"
-	VMWARE_MODULE_LIST="vmblock vmmon vmnet"
-	use vmci && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} vmci"
-	use vsock && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} 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 -mavx -mpclmul -maes
-	append-cflags -mno-sse  # Found a problem similar to bug #492964
-
-	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_ALL}; 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}-netdevice.patch"
-	use pax_kernel && epatch "${FILESDIR}/${PV_MAJOR}-hardened.patch"
-	epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
-
-	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-00-dentry.patch"
-	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-01-inode.patch"
-	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-02-control.patch"
-	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-03-inline.patch"
-	kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.11-00-readdir.patch"
-	kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.11-01-filldir.patch"
-	kernel_is ge 3 15 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.15-00-vsock.patch"
-	kernel_is ge 3 18 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.18-00-version-redefined.patch"
-	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-00-compat-namei.patch"
-	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-02-vmblock-path.patch"
-	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-04-iovec.patch"
-	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-05-vmci_qpair.patch"
-	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-06-vsock.patch"
-	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-07-vsock.patch"
-	kernel_is ge 4 1 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.01-00-vsock.patch"
-	kernel_is ge 4 2 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.02-00-nd_set_link.patch"
-	kernel_is ge 4 2 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.02-01-sk_alloc.patch"
-	kernel_is ge 4 3 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.03-00-vmci-misc_deregister.patch"
-	kernel_is ge 4 5 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.05-00-vmblock-follow_link.patch"
-	kernel_is ge 4 6 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.06-00-user-pages-p2.patch"
-	kernel_is ge 4 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.07-01-readlink_copy.patch"
-	kernel_is ge 4 8 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.08-00-nr_anon_mapped.patch"
-	kernel_is ge 4 9 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.09-00-user-pages-p1.patch"
-	kernel_is ge 4 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.10-00-generic_readlink.patch"
-
-	# Allow user patches so they can support RC kernels and whatever else
-	epatch_user
-}
-
-src_install() {
-	linux-mod_src_install
-	local udevrules="${T}/60-vmware.rules"
-	cat > "${udevrules}" <<-EOF
-		KERNEL=="vmci",  GROUP="vmware", MODE="660"
-		KERNEL=="vmw_vmci",  GROUP="vmware", MODE="660"
-		KERNEL=="vmmon", GROUP="vmware", MODE="660"
-		KERNEL=="vsock", GROUP="vmware", MODE="660"
-	EOF
-	udev_dorules "${udevrules}"
-
-	if ! use vmci ; then
-		dodir /etc/modprobe.d/
-
-		cat > "${D}"/etc/modprobe.d/vmware.conf <<-EOF
-			# Support for vmware vmci in kernel module
-			alias vmci	vmw_vmci
-		EOF
-
-		export installed_modprobe_conf=1
-	fi
-	if ! use vsock ; then
-		dodir /etc/modprobe.d/
-		cat >> "${D}"/etc/modprobe.d/vmware.conf <<-EOF
-			# Support for vmware vsock in kernel module
-			alias vsock	vmw_vsock_vmci_transport
-		EOF
-
-		export installed_modprobe_conf=1
-	fi
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	if [ "${installed_modprobe_conf}"x == "x"  ] ; then
-		if [ -f "${ROOT}/etc/modprobe.d/vmware.conf" ] ; then
-			ewarn "Please check the /etc/modprobe.d/vmware.conf file and"
-			ewarn "possible conflicts when using vmci and/or vsock modules built"
-			ewarn "out of kernel"
-		fi
-	fi
-}
diff --git a/app-emulation/vmware-modules/vmware-modules-308.5.6.ebuild b/app-emulation/vmware-modules/vmware-modules-308.5.6.ebuild
new file mode 100644
index 0000000..4fcb06c
--- /dev/null
+++ b/app-emulation/vmware-modules/vmware-modules-308.5.6.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic linux-info linux-mod user versionator udev
+
+PV_MAJOR=$(get_major_version)
+PV_MINOR=$(get_version_component_range 2-3)
+
+DESCRIPTION="VMware kernel modules"
+HOMEPAGE="http://www.vmware.com/"
+
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="pax_kernel +vmci +vsock"
+REQUIRED_USE="!vsock? ( !vmci )"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	|| ( =app-emulation/vmware-player-12.${PV_MINOR}*
+	=app-emulation/vmware-workstation-12.${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
+	if use vmci ; then
+		CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI"
+	else
+		CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI"
+	fi
+	if use vsock ; then
+		CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI_VSOCKETS"
+	else
+		CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI_VSOCKETS"
+	fi
+
+	linux-info_pkg_setup
+
+	linux-mod_pkg_setup
+
+	VMWARE_GROUP=${VMWARE_GROUP:-vmware}
+
+	VMWARE_MODULE_LIST_ALL="vmblock vmmon vmnet vmci vsock"
+	VMWARE_MODULE_LIST="vmblock vmmon vmnet"
+	use vmci && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} vmci"
+	use vsock && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} 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 -mavx -mpclmul -maes
+	append-cflags -mno-sse  # Found a problem similar to bug #492964
+
+	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_ALL}; 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}-netdevice.patch"
+	use pax_kernel && epatch "${FILESDIR}/${PV_MAJOR}-hardened.patch"
+	epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
+
+	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-00-dentry.patch"
+	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-01-inode.patch"
+	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-02-control.patch"
+	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-03-inline.patch"
+	kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.11-00-readdir.patch"
+	kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.11-01-filldir.patch"
+	kernel_is ge 3 15 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.15-00-vsock.patch"
+	kernel_is ge 3 18 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.18-00-version-redefined.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-00-compat-namei.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-02-vmblock-path.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-04-iovec.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-05-vmci_qpair.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-06-vsock.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-07-vsock.patch"
+	kernel_is ge 4 1 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.01-00-vsock.patch"
+	kernel_is ge 4 2 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.02-00-nd_set_link.patch"
+	kernel_is ge 4 2 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.02-01-sk_alloc.patch"
+	kernel_is ge 4 3 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.03-00-vmci-misc_deregister.patch"
+	kernel_is ge 4 5 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.05-00-vmblock-follow_link.patch"
+	kernel_is ge 4 6 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.06-00-user-pages-p2.patch"
+	kernel_is ge 4 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.07-01-readlink_copy.patch"
+	kernel_is ge 4 8 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.08-00-nr_anon_mapped.patch"
+	kernel_is ge 4 9 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.09-00-user-pages-p1.patch"
+	kernel_is ge 4 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.10-00-generic_readlink.patch"
+
+	# Allow user patches so they can support RC kernels and whatever else
+	epatch_user
+}
+
+src_install() {
+	linux-mod_src_install
+	local udevrules="${T}/60-vmware.rules"
+	cat > "${udevrules}" <<-EOF
+		KERNEL=="vmci",  GROUP="vmware", MODE="660"
+		KERNEL=="vmw_vmci",  GROUP="vmware", MODE="660"
+		KERNEL=="vmmon", GROUP="vmware", MODE="660"
+		KERNEL=="vsock", GROUP="vmware", MODE="660"
+	EOF
+	udev_dorules "${udevrules}"
+
+	if ! use vmci ; then
+		dodir /etc/modprobe.d/
+
+		cat > "${D}"/etc/modprobe.d/vmware.conf <<-EOF
+			# Support for vmware vmci in kernel module
+			alias vmci	vmw_vmci
+		EOF
+
+		export installed_modprobe_conf=1
+	fi
+	if ! use vsock ; then
+		dodir /etc/modprobe.d/
+		cat >> "${D}"/etc/modprobe.d/vmware.conf <<-EOF
+			# Support for vmware vsock in kernel module
+			alias vsock	vmw_vsock_vmci_transport
+		EOF
+
+		export installed_modprobe_conf=1
+	fi
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	if [ "${installed_modprobe_conf}"x == "x"  ] ; then
+		if [ -f "${ROOT}/etc/modprobe.d/vmware.conf" ] ; then
+			ewarn "Please check the /etc/modprobe.d/vmware.conf file and"
+			ewarn "possible conflicts when using vmci and/or vsock modules built"
+			ewarn "out of kernel"
+		fi
+	fi
+}
diff --git a/app-emulation/vmware-player/Manifest b/app-emulation/vmware-player/Manifest
index 1f514b5..1d48a34 100644
--- a/app-emulation/vmware-player/Manifest
+++ b/app-emulation/vmware-player/Manifest
@@ -1,4 +1,4 @@
 DIST VMware-Player-12.1.1-3770994.x86_64.bundle.tar 140697600 SHA256 4b2d6c8026f7948cbbc084ccfedaa899a897047152b86c8a2be1bf80fb935a8e SHA512 f00609a1e41355146c5a77732f2eb8f01d30c0ab7822840a29b9b84c01218d129b8e08349e2e6bbf0c900b826d3aba3b4026a61c6705564539ffff17652511ce WHIRLPOOL ee628665689ae03c70a11e3d34bb5ccf1b640ab14eaaed8f93dc4bd50329f9144e44163e83811ea5380fa8749c7196d64139c4809435094c173b39ec2c93b4fb
-DIST VMware-Player-12.5.4-5192485.x86_64.bundle.tar 134256640 SHA256 514537e7ed0f626cce6c9226a08f9479f9e57e65619758d62511d961894b09c7 SHA512 ea70f7f5f3e21c5135549c5fb99a061e7ef97189e4663d0094a192221a9254b77737c1dfe0efa1aa89857f5902c3f631d9dafc407a7a8c002e30aac8c4082846 WHIRLPOOL 17fd48e8ef1ba021d47540f45d44ac0db7c17b06ccabff44c308bacb73d64be9447859c9a9cab7d089cc3bebfb8c5d516ce42b0cc02fefc60caa9bfb3df2b4cb
+DIST VMware-Player-12.5.6-5528349.x86_64.bundle.tar 134215680 SHA256 da910af4aea8ac2c4d4162a68635b4f3eda23d7b07423cd7de26ee71049d4509 SHA512 684acda2c65b21c2b09da29f20a021f2af4a9949cefeba6cd0dc2f2fc46cbc16c3aa10ad077298903feea8b1f5b769a29fdac8eca2a7709856697c1b73f6549f WHIRLPOOL b2061e062025692a3dff63de4d35bd56a4112199789506760fc3944bf4eb684e9cea63efc15c0b0b86f154a0f2291f9a04685de9b5ff733bea6c4a4fe41add1c
 DIST VMware-Player-7.1.2-2780323.x86_64.bundle.tar 211128320 SHA256 baa60996b3bed5ba89db1a0fd9a2cc263ea07ac1cf2d6f3aab68c728cc960efc SHA512 c4465a4cbf97b9fe3aa2d6a1c690047251a37929867e0b3cbddf6643b59ef8e618809973543150e6cd9a3bdba0c9c04fb55171616c2179a0ff80ee7302e07fc2 WHIRLPOOL f0bc539647a5f3838a486d62506881f752e426e2e7299b20f2828c285cb041c777f93f3d29627ff4187edfd92e43e37e70647828ce537adb67db0fe3e99fccb0
 DIST vmware-systemd-gentoo-02.tgz 14064 SHA256 7ab23cb41bb8fbeca43bfd3baee35928731177620ae374ebb3b19b827d1a3210 SHA512 3a382bfd5f1eb2b218d8012588ea55c1f22786dba35a1fc0fdfdb4e40b05e0e735ed09c6961684f6442e863c3ed72024ce01f19113bbd9ca47c32e3f43c55f42 WHIRLPOOL dd7ac934584894f4a0ae86a9122080c49a4d09924011bc12dc1530ac6b5ee11fac6d55d6e5b306bb24d749a509236d3e39870b4d6b2ff5de37f6e54707ff8bb6
diff --git a/app-emulation/vmware-player/vmware-player-12.5.4.5192485.ebuild b/app-emulation/vmware-player/vmware-player-12.5.4.5192485.ebuild
deleted file mode 100644
index 5375681..0000000
--- a/app-emulation/vmware-player/vmware-player-12.5.4.5192485.ebuild
+++ /dev/null
@@ -1,387 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils versionator readme.gentoo-r1 fdo-mime gnome2-utils pax-utils systemd vmware-bundle
-
-MY_PN="VMware-Player"
-MY_PV=$(get_version_component_range 1-3)
-PV_MODULES="308.$(get_version_component_range 2-3)"
-PV_BUILD=$(get_version_component_range 4)
-MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}"
-
-SYSTEMD_UNITS_TAG="gentoo-02"
-
-DESCRIPTION="Emulate a complete PC without the performance overhead of most emulators"
-HOMEPAGE="http://www.vmware.com/products/player/"
-BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/player/${MY_PV}/${PV_BUILD}/linux/core/"
-SRC_URI="
-	${BASE_URI}${MY_P}.x86_64.bundle.tar
-	https://github.com/akhuettel/systemd-vmware/archive/${SYSTEMD_UNITS_TAG}.tar.gz -> vmware-systemd-${SYSTEMD_UNITS_TAG}.tgz
-"
-
-LICENSE="vmware GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="bundled-libs cups doc ovftool +vmware-tools"
-RESTRICT="mirror strip"
-
-BUNDLED_LIBS_DIR=/opt/vmware/lib/vmware/lib
-
-BUNDLED_LIBS="
-	libXau.so.6
-	libXcomposite.so.1
-	libXcursor.so.1
-	libXdamage.so.1
-	libXdmcp.so.6
-	libXfixes.so.3
-	libXft.so.2
-	libXinerama.so.1
-	libXrandr.so.2
-	libXrender.so.1
-	libaio.so.1
-	libatk-1.0.so.0
-	libatkmm-1.6.so.1
-	libatspi.so.0
-	libcairo.so.2
-	libcairomm-1.0.so.1
-	libcrypto.so.1.0.1
-	libcurl.so.4
-	libdbus-1.so.3
-	libfontconfig.so.1
-	libfreetype.so.6
-	libfuse.so.2
-	libgailutil.so.18
-	libgcc_s.so.1
-	libgcrypt.so.11
-	libgdk-x11-2.0.so.0
-	libgdk_pixbuf-2.0.so.0
-	libgdkmm-2.4.so.1
-	libgio-2.0.so.0
-	libgiomm-2.4.so.1
-	libglib-2.0.so.0
-	libglibmm-2.4.so.1
-	libglibmm_generate_extra_defs-2.4.so.1
-	libgmodule-2.0.so.0
-	libgobject-2.0.so.0
-	libgpg-error.so.0
-	libgthread-2.0.so.0
-	libgtk-x11-2.0.so.0
-	libgtkmm-2.4.so.1
-	libpango-1.0.so.0
-	libpangocairo-1.0.so.0
-	libpangoft2-1.0.so.0
-	libpangomm-1.4.so.1
-	libpangox-1.0.so.0
-	libpangoxft-1.0.so.0
-	libpcsclite.so.1
-	libpixman-1.so.0
-	libpng12.so.0
-	librsvg-2.so.2
-	libsigc-2.0.so.0
-	libssl.so.1.0.1
-	libstdc++.so.6
-	libxml2.so.2
-"
-
-BUNDLED_LIB_DEPENDS="
-	dev-cpp/atkmm
-	dev-cpp/cairomm
-	dev-cpp/glibmm:2
-	dev-cpp/gtkmm:2.4
-	dev-cpp/pangomm
-	dev-libs/atk
-	dev-libs/glib:2
-	dev-libs/libgcrypt:11/11
-	dev-libs/libgpg-error
-	dev-libs/libsigc++:2
-	dev-libs/libxml2
-	dev-libs/openssl:0
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/libpng:1.2
-	net-misc/curl
-	sys-fs/fuse
-	sys-libs/zlib
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/libXau
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/pango
-	x11-libs/pixman
-"
-
-# vmware should not use virtual/libc as this is a
-# precompiled binary package thats linked to glibc.
-RDEPEND="
-	media-libs/alsa-lib
-	net-print/cups
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libXtst
-	x11-libs/startup-notification
-	x11-themes/hicolor-icon-theme
-	bundled-libs? (
-		media-libs/tiff:3
-		x11-libs/libICE
-		x11-libs/libSM
-		virtual/jpeg:62
-	)
-	!bundled-libs? ( ${BUNDLED_LIB_DEPENDS} )
-	!app-emulation/vmware-workstation
-"
-PDEPEND="~app-emulation/vmware-modules-${PV_MODULES}
-	vmware-tools? ( app-emulation/vmware-tools )"
-DEPEND=">=dev-util/patchelf-0.9"
-
-S=${WORKDIR}
-VM_INSTALL_DIR="/opt/vmware"
-
-QA_PREBUILT="/opt/*"
-
-QA_WX_LOAD="opt/vmware/lib/vmware/tools-upgraders/vmware-tools-upgrader-32 opt/vmware/lib/vmware/bin/vmware-vmx-stats opt/vmware/lib/vmware/bin/vmware-vmx-debug opt/vmware/lib/vmware/bin/vmware-vmx"
-
-src_unpack() {
-	default
-	local bundle=${MY_P}.x86_64.bundle
-
-	local component; for component in \
-		vmware-player \
-		vmware-player-app \
-		vmware-player-setup \
-		vmware-vmx \
-		vmware-network-editor \
-		vmware-usbarbitrator
-	do
-		vmware-bundle_extract-bundle-component "${bundle}" "${component}" "${S}"
-	done
-
-	if use ovftool; then
-		vmware-bundle_extract-bundle-component "${bundle}" vmware-ovftool
-	fi
-}
-
-clean_bundled_libs() {
-	if ! use bundled-libs ; then
-		einfo "Removing bundled libraries"
-		for libname in ${BUNDLED_LIBS} ; do
-			rm -rv "${S}"/lib/lib/${libname} || die "Failed removing bundled ${libname}"
-		done
-
-		rm -rv "${S}"/lib/libconf || die "Failed removing bundled gtk conf libs"
-
-		# Among the bundled libs there are libcrypto.so.1.0.1 and libssl.so.1.0.1
-		# (needed by libcds.so) which seem to be compiled from openssl-1.0.1h.
-		# Upstream real sonames are *so.1.0.0 so it's necessary to fix DT_NEEDED link
-		# in libcds.so to be able to use system libs.
-		pushd >/dev/null .
-		einfo "Patching libcds.so"
-		cd "${S}"/lib/lib/libcds.so || die
-		patchelf --replace-needed libssl.so.1.0.{1,0} \
-				 --replace-needed libcrypto.so.1.0.{1,0} \
-				 libcds.so || die
-		popd >/dev/null
-
-		# vmware-player seems to use a custom version of libgksu2.so, for this reason
-		# we leave the bundled version. The libvmware-gksu.so library declares simply DT_NEEDED
-		# libgksu2.so.0 but it uses at runtime the bundled version, patch the lib to avoid portage
-		# preserve-libs mechanism to be triggered when a system lib is available (but not required)
-		pushd >/dev/null .
-		einfo "Patching libvmware-gksu.so"
-		cd "${S}"/lib/lib/libvmware-gksu.so || die
-		patchelf --set-rpath "\$ORIGIN/../libgksu2.so.0" \
-				 libvmware-gksu.so || die
-		popd >/dev/null
-	else
-		# if librsvg is not installed in the system then vmware doesn't start
-		pushd >/dev/null .
-		einfo "Patching svg_loader.so"
-		cd "${S}"/lib/libconf/lib/gtk-2.0/2.10.0/loaders || die
-		patchelf --set-rpath "\$ORIGIN/../../../../../lib/librsvg-2.so.2" \
-				 svg_loader.so || die
-		popd >/dev/null
-	fi
-}
-
-src_prepare() {
-	rm -f bin/vmware-modconfig
-	rm -rf lib/modules/binary
-	# Bug 459566
-	mv lib/libvmware-netcfg.so lib/lib/
-
-	clean_bundled_libs
-
-	DOC_CONTENTS="
-/etc/env.d is updated during ${PN} installation. Please run:\n
-env-update && source /etc/profile\n
-Before you can use ${PN}, you must configure a default network setup.
-You can do this by running 'emerge --config ${PN}'.\n
-To be able to run ${PN} your user must be in the vmware group.\n
-You MUST set USE=bundled-libs if you are running gcc-5, otherwise vmware will not start.
-"
-}
-
-src_install() {
-	local major_minor=$(get_version_component_range 1-2 "${PV}")
-
-	# revdep-rebuild entry
-	insinto /etc/revdep-rebuild
-	echo "SEARCH_DIRS_MASK=\"${VM_INSTALL_DIR}\"" >> ${T}/10${PN}
-	doins "${T}"/10${PN}
-
-	# install the binaries
-	into "${VM_INSTALL_DIR}"
-	dobin bin/*
-
-	# install the libraries
-	insinto "${VM_INSTALL_DIR}"/lib/vmware
-	doins -r lib/*
-
-	# workaround for hardcoded search paths needed during shared objects loading
-	if ! use bundled-libs ; then
-		dosym /usr/$(get_libdir)/libglib-2.0.so.0 \
-			"${VM_INSTALL_DIR}"/lib/vmware/lib/libglib-2.0.so.0/libglib-2.0.so.0
-		# Bug 432918
-		dosym /usr/$(get_libdir)/libcrypto.so.1.0.0 \
-			"${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.1.0.1/libcrypto.so.1.0.1
-		dosym /usr/$(get_libdir)/libssl.so.1.0.0 \
-			"${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.1.0.1/libssl.so.1.0.1
-	fi
-
-	# install the ancillaries
-	insinto /usr
-	doins -r share
-
-	if use cups; then
-		exeinto $(cups-config --serverbin)/filter
-		doexe extras/thnucups
-
-		insinto /etc/cups
-		doins -r etc/cups/*
-	fi
-
-	if use doc; then
-		dodoc doc/*
-	fi
-
-	exeinto "${VM_INSTALL_DIR}"/lib/vmware/setup
-	doexe vmware-config
-
-	# install ovftool
-	if use ovftool; then
-		cd "${S}"
-
-		insinto "${VM_INSTALL_DIR}"/lib/vmware-ovftool
-		doins -r vmware-ovftool/*
-
-		chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/{ovftool,ovftool.bin}
-		dosym "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/ovftool "${VM_INSTALL_DIR}"/bin/ovftool
-	fi
-
-	# create symlinks for the various tools
-	local tool ; for tool in thnuclnt vmplayer{,-daemon} \
-			vmware-{acetool,modconfig{,-console},gksu,fuseUI} ; 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/icu /etc/vmware/icu
-
-	# fix permissions
-	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks}
-	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/wrapper-gtk24.sh
-	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/libgksu2.so.0/gksu-run-helper
-	fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats}
-
-	pax-mark -m "${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
-	use bundled-libs && echo 'VMWARE_USE_SHIPPED_LIBS=1' >> "${envd}"
-
-	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 = "${MY_PV}"
-		product.buildNumber = "${PV_BUILD}"
-	EOF
-
-	# install the init.d script
-	local initscript="${T}/vmware.rc"
-	sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
-		"${FILESDIR}/vmware-${major_minor}.rc" > "${initscript}" || die
-	newinitd "${initscript}" vmware
-
-	# fill in variable placeholders
-	if use bundled-libs ; then
-		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
-	fi
-	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \
-		-e "/^Encoding/d" \
-		-i "${D}/usr/share/applications/vmware-player.desktop" || die
-
-	# install systemd unit files
-	systemd_dounit "${WORKDIR}/systemd-vmware-${SYSTEMD_UNITS_TAG}/"*.{service,target}
-
-	readme.gentoo_create_doc
-}
-
-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
-	readme.gentoo_print_elog
-
-	ewarn "${P} is using an old version of libgcrypt library which"
-	ewarn "is going to be soon removed from portage due to security reasons"
-	ewarn "(see https://bugs.gentoo.org/show_bug.cgi?id=541564)."
-	ewarn "Until vmware is fixed upstream you're exposed to security issues!"
-}
-
-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-player/vmware-player-12.5.6.5528349.ebuild b/app-emulation/vmware-player/vmware-player-12.5.6.5528349.ebuild
new file mode 100644
index 0000000..5375681
--- /dev/null
+++ b/app-emulation/vmware-player/vmware-player-12.5.6.5528349.ebuild
@@ -0,0 +1,387 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils versionator readme.gentoo-r1 fdo-mime gnome2-utils pax-utils systemd vmware-bundle
+
+MY_PN="VMware-Player"
+MY_PV=$(get_version_component_range 1-3)
+PV_MODULES="308.$(get_version_component_range 2-3)"
+PV_BUILD=$(get_version_component_range 4)
+MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}"
+
+SYSTEMD_UNITS_TAG="gentoo-02"
+
+DESCRIPTION="Emulate a complete PC without the performance overhead of most emulators"
+HOMEPAGE="http://www.vmware.com/products/player/"
+BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/player/${MY_PV}/${PV_BUILD}/linux/core/"
+SRC_URI="
+	${BASE_URI}${MY_P}.x86_64.bundle.tar
+	https://github.com/akhuettel/systemd-vmware/archive/${SYSTEMD_UNITS_TAG}.tar.gz -> vmware-systemd-${SYSTEMD_UNITS_TAG}.tgz
+"
+
+LICENSE="vmware GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="bundled-libs cups doc ovftool +vmware-tools"
+RESTRICT="mirror strip"
+
+BUNDLED_LIBS_DIR=/opt/vmware/lib/vmware/lib
+
+BUNDLED_LIBS="
+	libXau.so.6
+	libXcomposite.so.1
+	libXcursor.so.1
+	libXdamage.so.1
+	libXdmcp.so.6
+	libXfixes.so.3
+	libXft.so.2
+	libXinerama.so.1
+	libXrandr.so.2
+	libXrender.so.1
+	libaio.so.1
+	libatk-1.0.so.0
+	libatkmm-1.6.so.1
+	libatspi.so.0
+	libcairo.so.2
+	libcairomm-1.0.so.1
+	libcrypto.so.1.0.1
+	libcurl.so.4
+	libdbus-1.so.3
+	libfontconfig.so.1
+	libfreetype.so.6
+	libfuse.so.2
+	libgailutil.so.18
+	libgcc_s.so.1
+	libgcrypt.so.11
+	libgdk-x11-2.0.so.0
+	libgdk_pixbuf-2.0.so.0
+	libgdkmm-2.4.so.1
+	libgio-2.0.so.0
+	libgiomm-2.4.so.1
+	libglib-2.0.so.0
+	libglibmm-2.4.so.1
+	libglibmm_generate_extra_defs-2.4.so.1
+	libgmodule-2.0.so.0
+	libgobject-2.0.so.0
+	libgpg-error.so.0
+	libgthread-2.0.so.0
+	libgtk-x11-2.0.so.0
+	libgtkmm-2.4.so.1
+	libpango-1.0.so.0
+	libpangocairo-1.0.so.0
+	libpangoft2-1.0.so.0
+	libpangomm-1.4.so.1
+	libpangox-1.0.so.0
+	libpangoxft-1.0.so.0
+	libpcsclite.so.1
+	libpixman-1.so.0
+	libpng12.so.0
+	librsvg-2.so.2
+	libsigc-2.0.so.0
+	libssl.so.1.0.1
+	libstdc++.so.6
+	libxml2.so.2
+"
+
+BUNDLED_LIB_DEPENDS="
+	dev-cpp/atkmm
+	dev-cpp/cairomm
+	dev-cpp/glibmm:2
+	dev-cpp/gtkmm:2.4
+	dev-cpp/pangomm
+	dev-libs/atk
+	dev-libs/glib:2
+	dev-libs/libgcrypt:11/11
+	dev-libs/libgpg-error
+	dev-libs/libsigc++:2
+	dev-libs/libxml2
+	dev-libs/openssl:0
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libpng:1.2
+	net-misc/curl
+	sys-fs/fuse
+	sys-libs/zlib
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/libXau
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/pango
+	x11-libs/pixman
+"
+
+# vmware should not use virtual/libc as this is a
+# precompiled binary package thats linked to glibc.
+RDEPEND="
+	media-libs/alsa-lib
+	net-print/cups
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libXtst
+	x11-libs/startup-notification
+	x11-themes/hicolor-icon-theme
+	bundled-libs? (
+		media-libs/tiff:3
+		x11-libs/libICE
+		x11-libs/libSM
+		virtual/jpeg:62
+	)
+	!bundled-libs? ( ${BUNDLED_LIB_DEPENDS} )
+	!app-emulation/vmware-workstation
+"
+PDEPEND="~app-emulation/vmware-modules-${PV_MODULES}
+	vmware-tools? ( app-emulation/vmware-tools )"
+DEPEND=">=dev-util/patchelf-0.9"
+
+S=${WORKDIR}
+VM_INSTALL_DIR="/opt/vmware"
+
+QA_PREBUILT="/opt/*"
+
+QA_WX_LOAD="opt/vmware/lib/vmware/tools-upgraders/vmware-tools-upgrader-32 opt/vmware/lib/vmware/bin/vmware-vmx-stats opt/vmware/lib/vmware/bin/vmware-vmx-debug opt/vmware/lib/vmware/bin/vmware-vmx"
+
+src_unpack() {
+	default
+	local bundle=${MY_P}.x86_64.bundle
+
+	local component; for component in \
+		vmware-player \
+		vmware-player-app \
+		vmware-player-setup \
+		vmware-vmx \
+		vmware-network-editor \
+		vmware-usbarbitrator
+	do
+		vmware-bundle_extract-bundle-component "${bundle}" "${component}" "${S}"
+	done
+
+	if use ovftool; then
+		vmware-bundle_extract-bundle-component "${bundle}" vmware-ovftool
+	fi
+}
+
+clean_bundled_libs() {
+	if ! use bundled-libs ; then
+		einfo "Removing bundled libraries"
+		for libname in ${BUNDLED_LIBS} ; do
+			rm -rv "${S}"/lib/lib/${libname} || die "Failed removing bundled ${libname}"
+		done
+
+		rm -rv "${S}"/lib/libconf || die "Failed removing bundled gtk conf libs"
+
+		# Among the bundled libs there are libcrypto.so.1.0.1 and libssl.so.1.0.1
+		# (needed by libcds.so) which seem to be compiled from openssl-1.0.1h.
+		# Upstream real sonames are *so.1.0.0 so it's necessary to fix DT_NEEDED link
+		# in libcds.so to be able to use system libs.
+		pushd >/dev/null .
+		einfo "Patching libcds.so"
+		cd "${S}"/lib/lib/libcds.so || die
+		patchelf --replace-needed libssl.so.1.0.{1,0} \
+				 --replace-needed libcrypto.so.1.0.{1,0} \
+				 libcds.so || die
+		popd >/dev/null
+
+		# vmware-player seems to use a custom version of libgksu2.so, for this reason
+		# we leave the bundled version. The libvmware-gksu.so library declares simply DT_NEEDED
+		# libgksu2.so.0 but it uses at runtime the bundled version, patch the lib to avoid portage
+		# preserve-libs mechanism to be triggered when a system lib is available (but not required)
+		pushd >/dev/null .
+		einfo "Patching libvmware-gksu.so"
+		cd "${S}"/lib/lib/libvmware-gksu.so || die
+		patchelf --set-rpath "\$ORIGIN/../libgksu2.so.0" \
+				 libvmware-gksu.so || die
+		popd >/dev/null
+	else
+		# if librsvg is not installed in the system then vmware doesn't start
+		pushd >/dev/null .
+		einfo "Patching svg_loader.so"
+		cd "${S}"/lib/libconf/lib/gtk-2.0/2.10.0/loaders || die
+		patchelf --set-rpath "\$ORIGIN/../../../../../lib/librsvg-2.so.2" \
+				 svg_loader.so || die
+		popd >/dev/null
+	fi
+}
+
+src_prepare() {
+	rm -f bin/vmware-modconfig
+	rm -rf lib/modules/binary
+	# Bug 459566
+	mv lib/libvmware-netcfg.so lib/lib/
+
+	clean_bundled_libs
+
+	DOC_CONTENTS="
+/etc/env.d is updated during ${PN} installation. Please run:\n
+env-update && source /etc/profile\n
+Before you can use ${PN}, you must configure a default network setup.
+You can do this by running 'emerge --config ${PN}'.\n
+To be able to run ${PN} your user must be in the vmware group.\n
+You MUST set USE=bundled-libs if you are running gcc-5, otherwise vmware will not start.
+"
+}
+
+src_install() {
+	local major_minor=$(get_version_component_range 1-2 "${PV}")
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	echo "SEARCH_DIRS_MASK=\"${VM_INSTALL_DIR}\"" >> ${T}/10${PN}
+	doins "${T}"/10${PN}
+
+	# install the binaries
+	into "${VM_INSTALL_DIR}"
+	dobin bin/*
+
+	# install the libraries
+	insinto "${VM_INSTALL_DIR}"/lib/vmware
+	doins -r lib/*
+
+	# workaround for hardcoded search paths needed during shared objects loading
+	if ! use bundled-libs ; then
+		dosym /usr/$(get_libdir)/libglib-2.0.so.0 \
+			"${VM_INSTALL_DIR}"/lib/vmware/lib/libglib-2.0.so.0/libglib-2.0.so.0
+		# Bug 432918
+		dosym /usr/$(get_libdir)/libcrypto.so.1.0.0 \
+			"${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.1.0.1/libcrypto.so.1.0.1
+		dosym /usr/$(get_libdir)/libssl.so.1.0.0 \
+			"${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.1.0.1/libssl.so.1.0.1
+	fi
+
+	# install the ancillaries
+	insinto /usr
+	doins -r share
+
+	if use cups; then
+		exeinto $(cups-config --serverbin)/filter
+		doexe extras/thnucups
+
+		insinto /etc/cups
+		doins -r etc/cups/*
+	fi
+
+	if use doc; then
+		dodoc doc/*
+	fi
+
+	exeinto "${VM_INSTALL_DIR}"/lib/vmware/setup
+	doexe vmware-config
+
+	# install ovftool
+	if use ovftool; then
+		cd "${S}"
+
+		insinto "${VM_INSTALL_DIR}"/lib/vmware-ovftool
+		doins -r vmware-ovftool/*
+
+		chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/{ovftool,ovftool.bin}
+		dosym "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/ovftool "${VM_INSTALL_DIR}"/bin/ovftool
+	fi
+
+	# create symlinks for the various tools
+	local tool ; for tool in thnuclnt vmplayer{,-daemon} \
+			vmware-{acetool,modconfig{,-console},gksu,fuseUI} ; 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/icu /etc/vmware/icu
+
+	# fix permissions
+	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks}
+	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/wrapper-gtk24.sh
+	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/libgksu2.so.0/gksu-run-helper
+	fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats}
+
+	pax-mark -m "${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
+	use bundled-libs && echo 'VMWARE_USE_SHIPPED_LIBS=1' >> "${envd}"
+
+	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 = "${MY_PV}"
+		product.buildNumber = "${PV_BUILD}"
+	EOF
+
+	# install the init.d script
+	local initscript="${T}/vmware.rc"
+	sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
+		"${FILESDIR}/vmware-${major_minor}.rc" > "${initscript}" || die
+	newinitd "${initscript}" vmware
+
+	# fill in variable placeholders
+	if use bundled-libs ; then
+		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
+	fi
+	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \
+		-e "/^Encoding/d" \
+		-i "${D}/usr/share/applications/vmware-player.desktop" || die
+
+	# install systemd unit files
+	systemd_dounit "${WORKDIR}/systemd-vmware-${SYSTEMD_UNITS_TAG}/"*.{service,target}
+
+	readme.gentoo_create_doc
+}
+
+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
+	readme.gentoo_print_elog
+
+	ewarn "${P} is using an old version of libgcrypt library which"
+	ewarn "is going to be soon removed from portage due to security reasons"
+	ewarn "(see https://bugs.gentoo.org/show_bug.cgi?id=541564)."
+	ewarn "Until vmware is fixed upstream you're exposed to security issues!"
+}
+
+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 e02ea81..044361f 100644
--- a/app-emulation/vmware-tools/Manifest
+++ b/app-emulation/vmware-tools/Manifest
@@ -2,6 +2,7 @@ DIST vmware-tools-freebsd-10.0.10-4301679.x86_64.component.tar 15349760 SHA256 8
 DIST vmware-tools-freebsd-10.0.5-3228253.x86_64.component.tar 15349760 SHA256 14cc57924327bec553804cf601e561465acdd0b01299dbedc89bf0e63ea8bcee SHA512 3b7fabb26b6a0aeaa05603b8635166a1f4fad223b90e4564f6656f158a9bb47171dc023c3b83698d1cb114b0517acf82054767a99336b3e5ded1f2d702bb4e3a WHIRLPOOL bb6c808019c294861064d8b358c01e11ccad03db6b4548a5979f5680bd3cfa4b8b1227fca95a0e6756af4626b428e377aae04cc190f6280751a8a5585ccb5edf
 DIST vmware-tools-freebsd-10.0.6-3595377.x86_64.component.tar 15349760 SHA256 550948fc344afe30dd7b30cfa7dea82ef6a4823b2728ffea6b1d3e483ea1eb86 SHA512 af323adc9f60fca2069ad680758843febe727fc31abd96b95069d3f725d340159d202e87ff7481475d2cebfc76ee09b2d32a2f047d8a265f0f5645a56770d2e3 WHIRLPOOL 72954349e1a14fba734482bbc7d4489107703b394504f7bf079b8563e970e16f5fe3093aa7307c690492cf70c7766645439e03d885994316bb33509f8959aca2
 DIST vmware-tools-freebsd-10.1.5-5055693.x86_64.component.tar 17018880 SHA256 2bee82923d2cea972081f653d91fdf4424cbe3084b3e8787e24172f34cc768b8 SHA512 d3b274031306aa134f013d9b6724e9d960f86b57c063795692d00a3b88a03dfb49d7309dc19e0b6eec9052c985bfaef637d6f5dcd79c42f2fd2ad5ff62245100 WHIRLPOOL ee210be18a4bbb63095340dd98864876001b817da50533b2efaabb9ce1e7a9a6708a4af8b666bf5d2091280237cb2604c98c51d2bd8a9d5e5c57d087e7ec1f6f
+DIST vmware-tools-freebsd-10.1.6-5214329.x86_64.component.tar 17018880 SHA256 ec7cd266d29d058850f8911e9cedee57d0cc4a1e6023fd6d22fbb1e7dc3a481a SHA512 f9a9219d207012861120a9856726a291de2232787a8eb2f31623c48285406fdc010326cbf56e0adb513ca21d67f4ce8356e0b9923c476f0fdce29cb815aebabf WHIRLPOOL b7f0ee65c1e651b4758c8ce764370733cc33d8972c7b62674fa3ce3bc477c54c42f110f36e4a3fd8ca91e7808f0559782f90a7af9f3426bfd8d2f9045384d23f
 DIST vmware-tools-freebsd-9.6.5-2700073.i386.component.tar 15216640 SHA256 d900d0ee4f9f185f1914f80cb9b0a7df8fcf027e1009def7c2b81a7ac15e5d0b SHA512 5e070544e85137b7f032e2c1e4567233adadac274abc727b4dcfdfdddd455bc5f080499b306c6bdf7e5bbe17f6610fdece1c2ef541d5b89081ec5d342145071e WHIRLPOOL 1cc29331cefb25628425553707b8c8572eddc1b208856eac409d0123901918677d95fe82cc6028f0debcd7b28a8d524e1f29357b399629c30653eced80d12a7b
 DIST vmware-tools-freebsd-9.6.5-2700073.x86_64.component.tar 15216640 SHA256 7a2435330281b039727ab8a10736a95393bc143e6b3bfea6e9b7d18a7bf4ba15 SHA512 e78b1d85bcff951d4661374eb687c388d0b299d3d1cd6e4344d3a0439219f82a1e59f335cd5284fb371304223038ef358b59006504b061d702981bec7afa3408 WHIRLPOOL 42ea166a2b5ec8986d4d7b04dc2d13c76fb2509d6f9993d1dcceb7479332de0032589acfc749996a255b5487173f8ec03dc859b897a5f894fd2dde964db45220
 DIST vmware-tools-freebsd-9.9.2-2496824.x86_64.component.tar 15267840 SHA256 92331cc0c1b6340e23c7f06f36fef6d2945385527f9f49f06c1d9099bbec03d9 SHA512 d58ddaa59b8c939484aa60fe27f2ae857564cb3e607ec76163aec9c02b11115c0d592cb77dfe123397b0700ca7617c2a69e624a6279b6e4fb99101e5ced43bbd WHIRLPOOL e02783002ab5b862c69de1f5d68ec7690b2c6cd9013cdffd2df6b7337bc8e2b532438568cfa503d5b9d23af8c1d35512097522ccc2e4a92dca71e04225d4ff8f
@@ -12,6 +13,7 @@ DIST vmware-tools-linux-10.0.10-4301679.x86_64.component.tar 72202240 SHA256 2c8
 DIST vmware-tools-linux-10.0.5-3228253.x86_64.component.tar 72038400 SHA256 bdc01737a53ec49998fa7195ed74a5beeefe9ab18ace195a8ed4d79a311351e7 SHA512 6b087a02b925e146c319f561f6e2e4b712113137672dff508f247fe1389b6022a1cc067c22bb33269f6fa97f66e1d38aed5c2c72dc3cc2a8a3f5c7b2d3b259b2 WHIRLPOOL 8c73f475a1f31fe20ae3c52dd685fb2dbe5573be702e9cd8114ca8c68d2232dbd5a678f5925a7ca47f0f4adf028ebcbe6a9adf870bf13511c4db2b9e6e039746
 DIST vmware-tools-linux-10.0.6-3595377.x86_64.component.tar 72099840 SHA256 ca24a954e6f636abdf38cc14e6d668ef0b40ba07707701c21fc88eea640a9ba1 SHA512 33c3815e1f70a663090adeb00f5a5c58d06146bca95181bdaef30dd19b09b38f8441cb1722fd882eb7c83436a963843d12d05cd57767a7b6514fd5bcc69d939a WHIRLPOOL c465dafba0e9d716d02e0795c38dfad5c163398675c886a7c60059c57114543ab04dc26e4f5af56d867dcd0cc272409fef4b391408a413feac29d06578726199
 DIST vmware-tools-linux-10.1.5-5055693.x86_64.component.tar 55736320 SHA256 50123da782c3c360d82b65ce886f94029afd47d0637c30ad411c2555daec088a SHA512 ac0adba58692e9a5f99de0f2020f6cbe9028fc31e3705a4c98838469f8aa064bed474151a4ab6479a87e3967d9c8660258610657963e98a5316b22f01b917b6c WHIRLPOOL 185ae637af721a817589c34881ec5a87ae308cb7ad71ec3599266e96a29dd266c074ffdaa64c4fbead2cb166d3961b33d23b79fa990e240f24ab483b6de31697
+DIST vmware-tools-linux-10.1.6-5214329.x86_64.component.tar 55818240 SHA256 1d2a18bb06ef69c2a25a0b12402fe924c0e3cd5273923045e6b6e5e7b15edd93 SHA512 9548cdebd8495837328fc95c1268bce4e98fd308368892fd407c0284376c6920685cef395b3230eddee8b797fbc0814a8cc8f18d350e2de0eb5bfc997100f8d8 WHIRLPOOL 63feea13b3537fdd375faa05a3577e08603911875e7142747943854dd226949cce9c3ef1be770f3189061c994c9bb278b455ee6ce1da8187b75cf1cda399da11
 DIST vmware-tools-linux-9.6.5-2700073.i386.component.tar 61337600 SHA256 aad21f54da7bb37169dc85fd84062f3976618ce63034c6785235bd6d5aa580f4 SHA512 133c4958d904755ef9a4fdc13ea686aa69b325301c435a8cf7ea77a246a072099864c3b3654d5ad35bfda2b849d3c0e31afdc8654959f0ca2df07c9d822bf9f7 WHIRLPOOL 66ceb444996985f264892d7bbee5ab8a7122796691fedf321e108e1bc81c54646ca3fe325688f4824ef781e7f9ae7058d4f440e2f0219bd58c985195eb9332b2
 DIST vmware-tools-linux-9.6.5-2700073.x86_64.component.tar 61337600 SHA256 dd1fea6f4e99f676cef89d6ad1f9880e28d324f5051a95a6216cb48045c39ea8 SHA512 a607713f410a405ff8364adc7a300223ffa26d5cfd8f0612ec39c371057d6a65744de5e4a2eb552e488cdcb9dbc9ae6ddff7e89b533a9cbe531969453eefe291 WHIRLPOOL 5d851d3a3b9e7ab3b5ff48fa43f40330e88c6cdf083b9a975032b9d2868e9ad3e6e73d9c64db5fba0838eebcf182d9406434abf20d4fe76f74b136a00948684c
 DIST vmware-tools-linux-9.9.2-2496824.x86_64.component.tar 62044160 SHA256 3b08dc7dedb9312ddb465c96435120f87053cd1e456e42dc60fba9e0367044f1 SHA512 8bf3022715f40440838225b1ab2e0fb265c7920da3445a252898d3a4d845e93cbd1af34829e470da0bf9427342adeefd2e5b3df915ec63417fa33d9fa995b783 WHIRLPOOL ba49c9e645528ffb59187937a1b1dc01026da9386ddbcf489b25a3ff7d0b1d799c60beb7c820e5472b6b001c56f7b1bdbf6af1e22f8d78fc1ec4c6d32b7aa9d4
@@ -22,6 +24,7 @@ DIST vmware-tools-netware-10.0.10-4301679.x86_64.component.tar 81920 SHA256 abba
 DIST vmware-tools-netware-10.0.5-3228253.x86_64.component.tar 81920 SHA256 897565e9cf18c9531d153843610e524c6ec390c6cccc10d670a9684a16127ed5 SHA512 0e2469f7312736f75bc985313675501c6973fa8bb4cc20669fbd086432d8a49e128ca007b1b87a14f94adc751a017cd1ba5c8cd0a18fe1d30451c019293bd906 WHIRLPOOL d5e18eabc933fa18ea1f08dcbac9ef77b443f51a56defe29e0c6399741af53ad24fa3bfd434ea7b41c0adeeb8bebe45b9a80e8379ef5e1bd2f3ef02dedbaeac2
 DIST vmware-tools-netware-10.0.6-3595377.x86_64.component.tar 81920 SHA256 1522ed88a1ca11cd803f08adcd4d48a9aef69a5a85308f3ac4db616f515a3c84 SHA512 b3a1bfe9fe2bfa5a394b90986c271b5441096724df7b3dec0a0bd7e7d64f42673f2966d987cdd40cf5729d4cd312b8ae42491278fb945cea88821041fae135b1 WHIRLPOOL 1b3271ea925495f553feb70c5ffebac4cb1c3238c8771c578839b4160cdbdf3612fef8e4f4fe8908ae47f574b1ae24db2f18e0e7a9f72c46c0b7d5be90861d45
 DIST vmware-tools-netware-10.1.5-5055693.x86_64.component.tar 81920 SHA256 153eb22b530f4ed2cdca95ed7ed55d03b2ef5fe5284979c0f575192e50171740 SHA512 1534758132eab21da0f24a6f16169cc4c1af26cbda0e4e3baeff508608e67fada222515c7c091f3e002dae59a0f8d56b88769ce6e1933614ab76c34f18d2a5e7 WHIRLPOOL bb55d092be2efe56e43fac5e46eb7ab8f8d53eddf07e1b2965c25ed5505d536e5815c375f26d5906651e9a7193c4a70b07488a63b0fe7124faeef81a5095b5b4
+DIST vmware-tools-netware-10.1.6-5214329.x86_64.component.tar 81920 SHA256 98fdf6d2fcfc77e2e6bd5d369eb5b3269c3b6e34cac4c8cc356ebc979a431bf0 SHA512 6807e9fb9559dfd25acbb689f675e49f26753271bf0f4371ce7a5e23ee16eaf5f821ed89d39fe0475bb61d9e1e26f146d2e5229bef3a75634c3d2d03c225c3a8 WHIRLPOOL 73b10aae360d43313e405a211f244dde054e1d336398a3dada175f4c74173018b1da99b038b33146d90a841c1fe511e558f911e6700e1a0a00e95e7ca06ce181
 DIST vmware-tools-netware-9.6.5-2700073.i386.component.tar 81920 SHA256 5ec311062c98a8bd86fa86d2b762b89ad2642c0ba7d95f8d42734c43f3dc7139 SHA512 d5ad09faee4fc5e4d3e9f5ab0423dc4a28cd316b70193277dfc4e26b8daef372af4ba3e9994ed488a6a051ab4f0e2980f6e8a1ab0b911f7f93d29556d3826617 WHIRLPOOL a911c63efece39e149f4086cfdd8e5c29adce1f2553481328988bc946ab6c6653033f967b7f8970c3b859bb245c57e4d70a432bda3a618da9c5b740f8303e24b
 DIST vmware-tools-netware-9.6.5-2700073.x86_64.component.tar 81920 SHA256 78d3a8e66efeeb831658e50fe012e1d1d6bc4cfdf426008c6a21456757e5238c SHA512 bb6a37252beb66c6843ee851dbb71d169f1eace25f2874ec6c577d32ba1df5791e046fb5039e09ee11f536cb0078685665070d2399756130c3bdd6bad2a43e20 WHIRLPOOL 05c41c61715f9cddc89cadf1d2891be9bc13933a1649761087022b592e28b08db5a12b69ea3055750bb7f19688be1f18df4422ebb0650133e2711a30a7bafec6
 DIST vmware-tools-netware-9.9.2-2496824.x86_64.component.tar 81920 SHA256 a590932c3b0294b14ea16c93c76547f2ff7a552019ca79646422d0f5025fd20f SHA512 df18e77a2cb6be56d0009f75d4fb040d5275191456c6dbe44d1d69f741edbabd48cefc0ac6c0a29a8b624bd635accc1665c79c3b7c185d0f4cb3047c5839b7f1 WHIRLPOOL 56f11f4e98bc186519338ff31fd742d0ab16790f1cdf9d8a739fedf53fc88acbe15500c04df892a64b19b042ae20a302ec9326a835ab072b4d51da0cd1ffea04
@@ -32,6 +35,7 @@ DIST vmware-tools-solaris-10.0.10-4301679.x86_64.component.tar 12810240 SHA256 7
 DIST vmware-tools-solaris-10.0.5-3228253.x86_64.component.tar 12800000 SHA256 c4fc2137808dc1c099185950cc92c6b0e4c22743468c27f3d7148b7e55757ca8 SHA512 4caebd4d4c4ca7c0526830fd8eadfdfceea0cdd21d2f832edb12c48adb5ed82de7eef1c155dec1a167747f1550580e74f202c741a38e87c58058e180f4c6c610 WHIRLPOOL 7f28ff039058cfc74a0666855715ca8837e855333cf7c812433566f937762262f689e0d690caca54af271ef1f5cf427d228b1ecba4c506b2dceca33b342e948a
 DIST vmware-tools-solaris-10.0.6-3595377.x86_64.component.tar 12800000 SHA256 93f43bee9e5ca273d7dabfdc36bacc6a9ce387dd649cbf62d7a772f8627aec28 SHA512 7e2eae371f6f88a101423a5d987af0b96665227c0fe188252f9215fa87eb6f0d3ce2673658b80b6a3b6fcb5ce89197844608111c725ca776598a6edc5d9f961b WHIRLPOOL a11f117ce1a1ea8ef5d5065daf5fb474216faf2f4a568ea3357b5d11f856305f8e5568ff561820edd80998885d9c37e2309da9f4b106f77bb88c6fe7b4143e11
 DIST vmware-tools-solaris-10.1.5-5055693.x86_64.component.tar 16107520 SHA256 c94960366fcbb548e1194fa318546ccb2a59d24fba41b6f6cade5beed35ce8ec SHA512 8b99be4cc76d1afd1d7ca9263e0549cb493bbc4ba3f86934c4c216584b9ef174d55ffc52b6462e1f7b3c04692092d9b6fa42db19175730d7fd5f7d46dfdf5891 WHIRLPOOL fc1eab22ec8f4940a314751f495ebe78ae968da2c66edd7e414e3fc53e933adba2a34ce7e2f171a388a21e19dd22704b0aa10fb3812e5da5432a87298fab27c5
+DIST vmware-tools-solaris-10.1.6-5214329.x86_64.component.tar 16107520 SHA256 b6fdfb4d12735c68ec15139fa9b3a28d3e331397a55a99f3a72365e62de5c869 SHA512 73a349b9785fa33e12ec17dbc52a5ed7dd41e2ccebee73b9bd60767a7637e527cdd9c246e6bff9c66c648efc529d8c0d7cc16538de4f7d0d10542b6c74c66164 WHIRLPOOL ed4d66462a6ea82be750e3539ffa08d1c4e43f55390a3925223f1ea1b59d9fdee8eb1d4b8b73e15c16be9260e07887e71b0a8c42cff9d95136161a34f57b7233
 DIST vmware-tools-solaris-9.6.5-2700073.i386.component.tar 12830720 SHA256 dfff56bd05aea2f732d893be9bd7b52d5b0a3f4f993bb8a275a429fabedd03d5 SHA512 e5c51665119fce5655cc24cc6ff5815250cd291ab7216eaa5eba6056b70e31734c111ae33189c4cb78c9f95336141f012c35c61cbf1ac2887dd264af8e5d7823 WHIRLPOOL 6429b2ed61a1ecba0ab290a9e37c642350782f257364b984abdda3b448e0b11996c0c1c909811620074b1b18a1206cc5f7a6872765766b3d0dcb2d1a978cc784
 DIST vmware-tools-solaris-9.6.5-2700073.x86_64.component.tar 12830720 SHA256 4995ee79f2aa8093fd8caa9bf5e9d2085f3b9a5b6de6b105069c68a97a01ef11 SHA512 f36aa070959bfe94dca921f7c776f878a56a116b5ab7a0da6a55acd34943b7b9631a4184d3aaa773387aed303922aa8d7e9f5b3f24c5d8d9eafbf3d02fb9bf88 WHIRLPOOL 558aa2a21da94b4741d3dc6195ee705e918947511408560ca836937ca094fe66efd2582e967e7fac941dabbaee86b4727f7010782eded8abdcfc05d66fe779a7
 DIST vmware-tools-solaris-9.9.2-2496824.x86_64.component.tar 13015040 SHA256 af2974298a6149a869532fe9c2fa1afff68565340d50a3712d72326c29a40f08 SHA512 2c399b37e539b4cd4419e4c34b8af22baf621bd45fb39640936b0c30724719f45ac49ff470121a1453ff4dac9f4ce06192c653a75dc12fb49e3122f6692ce046 WHIRLPOOL b950ecf772d902dea333270dc65d44fbbb3c4b388ffcf7b7e5f6f00c23b8ae7ea2bef567563d14f8236418b1af5c5800ce4797d0e486d0deba295bdcb71868d2
@@ -42,6 +46,7 @@ DIST vmware-tools-winPre2k-10.0.10-4301679.x86_64.component.tar 11530240 SHA256
 DIST vmware-tools-winPre2k-10.0.5-3228253.x86_64.component.tar 11530240 SHA256 9719a09f8630b685fbf44e9eee89ea0855dfedc70ccc8ca212bf42102b41b4e0 SHA512 b120d88ab8483383f258f54299daf3c2893ae6df96262fbe40a8e29390b5bca1978b6be1a8dafc46f2a72ec0bd8fe0d17469538e09f5c4527ae664e9331d2d1c WHIRLPOOL fc0e2668951a18a7345f13ba7ce0a7caab3431d8481e7dfe3f7affd31a9136445eeb84a24ed6864ed314a18f142709e1a169059b6e94e165b73bfb9c9dde0e77
 DIST vmware-tools-winPre2k-10.0.6-3595377.x86_64.component.tar 11530240 SHA256 f5695f14340656d931953774dce585b5ca2a65ed48ea6c848b7dd8c67133b586 SHA512 00dcaf095b63ab0b537f920ae1d56004c642805c473528fd4f3f70217cf3d28c11eb3e6afc93799503563afa213ac540c416c1707aafc7825b470183b9cc0dc1 WHIRLPOOL 15f9b8e2685d46df4f690038a3b2dc856580fb5185aa54773f41e89d6563575ebec4ea7c0346a3a0401c4ab61f278a47224109ed7a725b71273e7f1f3ca2c393
 DIST vmware-tools-winPre2k-10.1.5-5055693.x86_64.component.tar 11530240 SHA256 f7a45c0660acd0a83e2f810ad8d0ba8d68498f5fb576108571d392c4552379a9 SHA512 0bf7429484ddbd3dd9dca75fd25888267676936cfb12ec8b743fc6b404e1ef6da9f1fc8230e94dea1c8e92b1d5dc20f0ccd2108afeb6d8e8e3ae708cb40d92ea WHIRLPOOL 98b0cf0549b79ce45272ebbca941b31cf607cbc095bbf15275a4a2e30392e9aa287ca220474bdf2c6b8c9274d2a42760300bf05fad88b0333ea669056264b458
+DIST vmware-tools-winPre2k-10.1.6-5214329.x86_64.component.tar 11530240 SHA256 0b7098e7a00ce7d4bc3e32a0b6440d2bedbed15d2692c9bbd0e431da88f78ee9 SHA512 8ec328019380da0a967404e35230f192d30298a192bef61cdeef0a2ec989afe72024dfccb08d5a0207739a71dd163e375dcdb7fba7d13bef431a851141decaf7 WHIRLPOOL f2d6e3347e007121edbaae1ecb78e5a23301d03eb2075737990bdca8157360ccb84e82b165617c00355553b9197df416b3bcfde4f15eb515e9db7032502e2756
 DIST vmware-tools-winPre2k-9.6.5-2700073.i386.component.tar 11458560 SHA256 8b381b1c787466a96bf0f9536df05f58aa62c5c10d6fdeaedd136c6a49e09b8c SHA512 17bcbc4aa84e5e212732860cf34d4c4d8b4c806bd137b497e6dab9f023cf26af5a43a83f6f4d30f9d6e7df87f85b7a33e8ab0626c56450ea024b17e45ab1e1db WHIRLPOOL c3b45bbf5cc49f8b9dd64517dbd9e258ae60de59ea6beeed0b88745f7ba8beef1da9cba577d7829fa25dccf2c51ca919f36db5e7c141e7a4e1d62abe5b9fd187
 DIST vmware-tools-winPre2k-9.6.5-2700073.x86_64.component.tar 11458560 SHA256 55e856f7a701174c3f1f0257d2a8054b836b5e14b328cadcd21e792db03afd3f SHA512 bbc80f18ec0e08d26850220124d0e9187fe9d80472dbd55269c63d05b51ecc7374d7e6066aa5e9fc9bcd027b218925084fb30ddd48dc3828df9c09a9c3579699 WHIRLPOOL f01ad51f8944a167e19abc876f31a6e08f85920d1e17272edff44e4c4871090694e87749cdbd83ffab6deba8569cfec4b600b9de5f930e57405e831dc73a0cd9
 DIST vmware-tools-winPre2k-9.9.2-2496824.x86_64.component.tar 11530240 SHA256 af08bcc956943bc0ed09e37e03bf2005f32cabdd5697d0398f32b6c1943677c3 SHA512 bdce5073ee5937f7e6cf0944360fda5c5e136f7f19f00bbc5fffb7c6e8ce328494309697e4dfabeece73380421f9e6fa34dadaf3c6d540e676a491245de79d36 WHIRLPOOL b59a72c2d63368119998e3d26267f032f8923f792e0031cbd4805911cf65e0a3d39be3d5bb1489b5fac84fba50554d212b9fcaabec726810ed35f1c36e94defe
@@ -52,6 +57,7 @@ DIST vmware-tools-windows-10.0.10-4301679.x86_64.component.tar 94023680 SHA256 d
 DIST vmware-tools-windows-10.0.5-3228253.x86_64.component.tar 90511360 SHA256 6d1bf0cb3e5f8f840a2f69ed61392b81a7c362d470e99bbae58a623255450244 SHA512 c9b797b9b563175978f714b923502fd14fc471d6360daa708aeca9928d38bf030b89e6cdc6c9fa534f9d334ae1e01573f898fc68f5e274edd2ef062f2e8da271 WHIRLPOOL f73d3faadd83f6bd05b66ce04280154eb8a2a21ed205b4194a77ba3bf305cf04a8f6b13192879371cf06e9a5366402bf5aac5a98647af3b06d078587484338cd
 DIST vmware-tools-windows-10.0.6-3595377.x86_64.component.tar 90777600 SHA256 4d0682f76f7787e05a156e47c9c6ca87f3d617934a3ca0993d468f62a6d3ca59 SHA512 e51c309987f79a5f96fa4a89735e045d93ced151f14ca365eb88ffbc2fa7eaa5106945782f139afb0aed520626672e95c4bd35238dfd1257e2835268e9e8bf65 WHIRLPOOL a7e736e172e056683e20a0faec07da95f3efe6400823492a97becd6f1f931cd66721a71bf5ebf50eeea849f32b38e0e3dfccf66e3f9d10522872d618bea36381
 DIST vmware-tools-windows-10.1.5-5055693.x86_64.component.tar 83630080 SHA256 11bd9c1df726db714dd87e768fa3aca4617ee47dfa57bd8fb67c447397c8db2a SHA512 eac764a4e7df1af1558ce066f172aa56fde92bc31a205ffc709c4a372552c4c10d043879d3086af20ef03f81775222b7e9277bb7547412c254aa02d6305d9761 WHIRLPOOL 3013d6ec249c3403d748279f427c99e35ba0a6c155b7cffe8bc621f1092074949eca6e9f2266c5feedfd1d250d5c0cb5f398d9850f1d359d7ba951b3efa362dd
+DIST vmware-tools-windows-10.1.6-5214329.x86_64.component.tar 83640320 SHA256 fa12352507af0e097c9e8e6a0c638f93a3d5a3326b3218384438a58b8d0bd933 SHA512 040da7f2504ea77c0c3bd54a93f480d24752a0f5d29c40abe00e2d1d9e217f5a35d115a670fabbe2db5f36833f40d6cc8e28251fe745cc9bcc619e2c217aa7e2 WHIRLPOOL b80e049f9037aea47004983f3576939b00a52ed550d1c3864a6ed02d810542367ad6c10b993852b358de550e116fd9127e8cffa1844b47b6848781ef17937810
 DIST vmware-tools-windows-9.6.5-2700073.i386.component.tar 69294080 SHA256 6aba23b1bd9f7877c7fd54102f634dbf6d0d61fe2640d2e56f280395ad595f45 SHA512 fb63d93dd2ca26aeae42f27ce4b0dcda4991f10e0077a8384b8c7bbc3dbf73fa1f62f986a6c5661b70aed59e3841dc9a63b0de76c637ef62d919f9b667149dae WHIRLPOOL 8969ab16cc660b39626f40af69563bd85f40547d4656e156c4ef79221b6d71f8c9cd1b9ec6e0657f1c61f7104748cf84c356a5ff50339462f998d677a762eee5
 DIST vmware-tools-windows-9.6.5-2700073.x86_64.component.tar 69294080 SHA256 effeb7d57c0c916de4b18f80df4cd8d9fcf00d0dda886b2ba0ce23179b3ad0fa SHA512 bcf036d3fa54b1b0ae98370a54f0e5d95ba68a6476fc79f60615d5754f370b8724d0ccaa6c826f843ebb3e1eb1afceb03701214774ff0b1e40742be5e9adad3f WHIRLPOOL 595918763b0b31ab07725b19c9642730bfb4ed14cec44ed4920bed0aed38b3d71ffab9a931b2923aef63514ff180f4f2221e1b6694418578ca1d2960531e4438
 DIST vmware-tools-windows-9.9.2-2496824.x86_64.component.tar 71485440 SHA256 3ef86f0bfce6f9396b4868d2fc067baa425cf9d1db2c4361dad81adb8fb02b69 SHA512 0c1df24026f96d160c3e3f4afac127d82f5ba1a4aabff4ca8fa64a60cde4b67b648601144d54a97bc760636bea1f9e71229b05bdc1c6d2959b3be93c1dc421eb WHIRLPOOL 090e49c1452987a77010e20f23f24f747e3158d4cc7ab6604d3fada16bb42410b34631c82d1580611bb7364faa1174108cce037ec4cc873821fe68e3d745cb3c
diff --git a/app-emulation/vmware-tools/vmware-tools-10.1.6.5214329.ebuild b/app-emulation/vmware-tools/vmware-tools-10.1.6.5214329.ebuild
new file mode 100644
index 0000000..d159603
--- /dev/null
+++ b/app-emulation/vmware-tools/vmware-tools-10.1.6.5214329.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit versionator vmware-bundle
+
+MY_PV="$(replace_version_separator 3 - $PV)"
+BASE_URI="http://softwareupdate.vmware.com/cds/vmw-desktop/ws/12.5.6/5528349/linux/packages/"
+
+DESCRIPTION="VMware Tools for guest operating systems"
+HOMEPAGE="http://www.vmware.com/products/player/"
+
+LICENSE="vmware"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+RESTRICT="mirror"
+IUSE=""
+
+DEPEND=""
+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 )
+		)"
+	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 somethingdone;
+	local guest ; for guest in ${IUSE_VMWARE_GUEST} ; do
+		if use "vmware_guest_${guest}" ; then
+			doins "${guest}".iso{,.sig}
+			somethingdone=yes
+		fi
+	done
+
+	[ -n "${somethingdone}" ] || ewarn  "You should set VMWARE_GUEST in make.conf to specify which operating systems you need."
+}
diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
index eeb96f3..ed99615 100644
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@@ -1,6 +1,6 @@
 DIST VMware-Workstation-11.1.3-3206955.x86_64.bundle.tar 259594240 SHA256 a8d333d6f6677eb1d70b3572e5bf8f34ebb6cb77bdee4b94d6ea8033f579ed5d SHA512 8cb4781dc388bcaeb82f19d18e0bf2608d393f18c4e255a1c89c9090954bbee5e78ebde5cec6df06d9c037ed4f0595a7a801d76b3a8e2b960f6822bbf1094d1b WHIRLPOOL 5ba631502ff4dbf0e480e932e9a21cbb06d25d68b9ac412beb41680d3d0e678c630ba692e7e52cda2399574b28698ca5deb6a6c54b4614ab752159b6036a0094
 DIST VMware-Workstation-11.1.4-3848939.x86_64.bundle.tar 259563520 SHA256 3f48c42154a1b4687eb448abf7f9e15a7771977858388127df4ef78935658f3b SHA512 57aa62d53b4eae08c281959b559635e28877e7f8c5b6c0909dcec16129ae4ea130175410e698724b6164cbfb9d08f6bbf8a48f2d78471d6232868ff4bed23cca WHIRLPOOL d663a7901f153f0e6e1432b7047077b4b6bf8542926ccf0ac4ad4eeae42359096050cfe04e811fc044b45e85153eb91fddf704a43ea3de8a2cdc113cca0a6ba5
 DIST VMware-Workstation-12.1.1-3770994.x86_64.bundle.tar 176445440 SHA256 a2c1888e6360245cf65fd19e86b7f74c63788e652145dc9a786aebbda0dd9e15 SHA512 55880e7aa6f7c968d82c88f36c1f406f587cccc9e25bdb9d1de1ffcfccb609811c525967bb2fefcf6375ce59f0f78d4dcc258c006b4a0db642dc3233e8fc9556 WHIRLPOOL 833eceedc1e9b7f3a0b73a039d1647faa9a5966a8a34e26c4955348092ebd9983f2f0ba2b8acb37805b339f492278916d06d68db7bb52a219126d7e78b02c469
-DIST VMware-Workstation-12.5.4-5192485.x86_64.bundle.tar 165754880 SHA256 b39c58325a067a9232dfaf40afc1ff8416b3fb40c646fbdc77486cfba921c194 SHA512 0ea262ab8b1b0ff4b13d1b2a39117e4ce61de0ec29f783d2636d94cef249c7fb5049a0e28dff45bb18682018f73a5d3922a34541923adf6dd2b5261490be8875 WHIRLPOOL 20f14f033222960ec655842cabd039914f8eeec6be0504daf71016aeacd623f9ce1b46a9d3f0529b919653a20e8645873484961062ad6999a1cb05aef78b5f66
+DIST VMware-Workstation-12.5.6-5528349.x86_64.bundle.tar 165724160 SHA256 c7d5ecb72cb62f8d8538f581cff4513f7ede261671a1f6c50a54afa5d05fec39 SHA512 cce68510e01245aa8bf66dbb108121f1d94c69ba7fcc33b7fe9c16a40910a553fb4a43cbf5b5c5f0445bda90686568af56f28e16a3b321b760da3c084554359b WHIRLPOOL 06dc3de1665c8cd6ad54ad4c1678003e153e4f1dc14c831e5ee7350042c1ec80478565291ea099da1568878333c737b829d9124545322e7988ebc2c19accfd4d
 DIST vmware-systemd-gentoo-01.tgz 1884 SHA256 e92c694865f1b29f4d7a39efa1dd87bc71dc5f922573f00a3d31ee8e27a8c335 SHA512 454ab93997781bd0a9accddb2ac7bb446f07ea7cddef5640369025c30e03592e14869e0f0f7b4457db2f1ada31c98051426016c86201afa8bc8e3aa4ccc2f875 WHIRLPOOL 9202583b617532ab2612b384da307218e7c93c2962f0d233e28bea066b07163c9bc51c0a599309f9d703c5575ebeb292d787716225624dc1c2fdff3c44fa3513
 DIST vmware-systemd-gentoo-02.tgz 14064 SHA256 7ab23cb41bb8fbeca43bfd3baee35928731177620ae374ebb3b19b827d1a3210 SHA512 3a382bfd5f1eb2b218d8012588ea55c1f22786dba35a1fc0fdfdb4e40b05e0e735ed09c6961684f6442e863c3ed72024ce01f19113bbd9ca47c32e3f43c55f42 WHIRLPOOL dd7ac934584894f4a0ae86a9122080c49a4d09924011bc12dc1530ac6b5ee11fac6d55d6e5b306bb24d749a509236d3e39870b4d6b2ff5de37f6e54707ff8bb6
diff --git a/app-emulation/vmware-workstation/vmware-workstation-12.5.4.5192485.ebuild b/app-emulation/vmware-workstation/vmware-workstation-12.5.4.5192485.ebuild
deleted file mode 100644
index 73ad701..0000000
--- a/app-emulation/vmware-workstation/vmware-workstation-12.5.4.5192485.ebuild
+++ /dev/null
@@ -1,598 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils versionator readme.gentoo-r1 fdo-mime gnome2-utils pam systemd vmware-bundle
-
-MY_PN="VMware-Workstation"
-MY_PV=$(get_version_component_range 1-3)
-PV_MODULES="308.$(get_version_component_range 2-3)"
-PV_BUILD=$(get_version_component_range 4)
-MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}"
-
-SYSTEMD_UNITS_TAG="gentoo-02"
-
-DESCRIPTION="Emulate a complete PC without the performance overhead of most emulators"
-HOMEPAGE="http://www.vmware.com/products/workstation/"
-BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/ws/${MY_PV}/${PV_BUILD}/linux/core/"
-SRC_URI="
-	amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar )
-	https://github.com/akhuettel/systemd-vmware/archive/${SYSTEMD_UNITS_TAG}.tar.gz -> vmware-systemd-${SYSTEMD_UNITS_TAG}.tgz
-	"
-
-LICENSE="vmware GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="bundled-libs cups doc ovftool server vix +vmware-tools"
-RESTRICT="mirror strip"
-
-BUNDLED_LIBS_DIR=/opt/vmware/lib/vmware/lib
-
-BUNDLED_LIBS="
-	libXau.so.6
-	libXcomposite.so.1
-	libXcursor.so.1
-	libXdamage.so.1
-	libXdmcp.so.6
-	libXfixes.so.3
-	libXft.so.2
-	libXinerama.so.1
-	libXrandr.so.2
-	libXrender.so.1
-	libaio.so.1
-	libatk-1.0.so.0
-	libatkmm-1.6.so.1
-	libatspi.so.0
-	libcairo.so.2
-	libcairomm-1.0.so.1
-	libcrypto.so.1.0.1
-	libcurl.so.4
-	libdbus-1.so.3
-	libfontconfig.so.1
-	libfreetype.so.6
-	libfuse.so.2
-	libgailutil.so.18
-	libgcc_s.so.1
-	libgcrypt.so.11
-	libgdk-x11-2.0.so.0
-	libgdk_pixbuf-2.0.so.0
-	libgdkmm-2.4.so.1
-	libgio-2.0.so.0
-	libgiomm-2.4.so.1
-	libglib-2.0.so.0
-	libglibmm-2.4.so.1
-	libglibmm_generate_extra_defs-2.4.so.1
-	libgmodule-2.0.so.0
-	libgobject-2.0.so.0
-	libgpg-error.so.0
-	libgthread-2.0.so.0
-	libgtk-x11-2.0.so.0
-	libgtkmm-2.4.so.1
-	libpango-1.0.so.0
-	libpangocairo-1.0.so.0
-	libpangoft2-1.0.so.0
-	libpangomm-1.4.so.1
-	libpangox-1.0.so.0
-	libpangoxft-1.0.so.0
-	libpcsclite.so.1
-	libpixman-1.so.0
-	libpng12.so.0
-	librsvg-2.so.2
-	libsigc-2.0.so.0
-	libssl.so.1.0.1
-	libstdc++.so.6
-	libxml2.so.2
-"
-
-BUNDLED_LIB_DEPENDS="
-	dev-cpp/atkmm
-	dev-cpp/cairomm
-	dev-cpp/glibmm:2
-	dev-cpp/gtkmm:2.4
-	dev-cpp/pangomm
-	dev-libs/atk
-	dev-libs/glib:2
-	dev-libs/libgcrypt:11/11
-	dev-libs/libgpg-error
-	dev-libs/libsigc++:2
-	dev-libs/libxml2
-	dev-libs/openssl:0
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/libpng:1.2
-	net-misc/curl
-	sys-fs/fuse
-	sys-libs/zlib
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/libXau
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/pango
-	x11-libs/pixman
-"
-
-# vmware should not use virtual/libc as this is a
-# precompiled binary package thats linked to glibc.
-RDEPEND="
-	media-libs/alsa-lib
-	net-print/cups
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libXtst
-	x11-libs/startup-notification
-	x11-themes/hicolor-icon-theme
-	bundled-libs? (
-		media-libs/tiff:3
-		x11-libs/libICE
-		x11-libs/libSM
-		virtual/jpeg:62
-	)
-	!bundled-libs? ( ${BUNDLED_LIB_DEPENDS} )
-	!app-emulation/vmware-player
-"
-PDEPEND="~app-emulation/vmware-modules-${PV_MODULES}
-	vmware-tools? ( app-emulation/vmware-tools )"
-DEPEND=">=dev-util/patchelf-0.9"
-
-S=${WORKDIR}
-VM_INSTALL_DIR="/opt/vmware"
-VM_DATA_STORE_DIR="/var/lib/vmware/Shared VMs"
-VM_HOSTD_USER="root"
-
-QA_PREBUILT="/opt/*"
-
-QA_WX_LOAD="opt/vmware/lib/vmware/tools-upgraders/vmware-tools-upgrader-32 opt/vmware/lib/vmware/bin/vmware-vmx-stats opt/vmware/lib/vmware/bin/vmware-vmx-debug opt/vmware/lib/vmware/bin/vmware-vmx"
-
-src_unpack() {
-	default
-	local bundle=${MY_P}.x86_64.bundle
-
-	local component; for component in \
-		vmware-workstation \
-		vmware-player-app \
-		vmware-player-setup \
-		vmware-vmx \
-		vmware-network-editor \
-		vmware-network-editor-ui \
-		vmware-usbarbitrator \
-		vmware-vprobe
-	do
-		vmware-bundle_extract-bundle-component "${bundle}" "${component}" "${S}"
-	done
-
-	if use ovftool; then
-		vmware-bundle_extract-bundle-component "${bundle}" vmware-ovftool
-	fi
-
-	if use server; then
-		vmware-bundle_extract-bundle-component "${bundle}" vmware-workstation-server #"${S}"
-	fi
-
-	if use vix; then
-		vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-core vmware-vix
-		vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-lib-Workstation1200 vmware-vix
-	fi
-}
-
-clean_bundled_libs() {
-	if ! use bundled-libs ; then
-		einfo "Removing bundled libraries"
-		for libname in ${BUNDLED_LIBS} ; do
-			rm -rv "${S}"/lib/lib/${libname} || die "Failed removing bundled ${libname}"
-		done
-
-		rm -rv "${S}"/lib/libconf || die "Failed removing bundled gtk conf libs"
-
-		# Among the bundled libs there are libcrypto.so.1.0.1 and libssl.so.1.0.1
-		# (needed by libcds.so) which seem to be compiled from openssl-1.0.1h.
-		# Upstream real sonames are *so.1.0.0 so it's necessary to fix DT_NEEDED link
-		# in libcds.so to be able to use system libs.
-		pushd >/dev/null .
-		einfo "Patching libcds.so"
-		cd "${S}"/lib/lib/libcds.so || die
-		patchelf --replace-needed libssl.so.1.0.{1,0} \
-				 --replace-needed libcrypto.so.1.0.{1,0} \
-				 libcds.so || die
-		popd >/dev/null
-
-		# vmware-workstation seems to use a custom version of libgksu2.so, for this reason
-		# we leave the bundled version. The libvmware-gksu.so library declares simply DT_NEEDED
-		# libgksu2.so.0 but it uses at runtime the bundled version, patch the lib to avoid portage
-		# preserve-libs mechanism to be triggered when a system lib is available (but not required)
-		pushd >/dev/null .
-		einfo "Patching libvmware-gksu.so"
-		cd "${S}"/lib/lib/libvmware-gksu.so || die
-		patchelf --set-rpath "\$ORIGIN/../libgksu2.so.0" \
-				 libvmware-gksu.so || die
-		popd >/dev/null
-	else
-		# if librsvg is not installed in the system then vmware doesn't start
-		pushd >/dev/null .
-		einfo "Patching svg_loader.so"
-		cd "${S}"/lib/libconf/lib/gtk-2.0/2.10.0/loaders || die
-		patchelf --set-rpath "\$ORIGIN/../../../../../lib/librsvg-2.so.2" \
-				 svg_loader.so || die
-		popd >/dev/null
-	fi
-}
-
-src_prepare() {
-	rm -f bin/vmware-modconfig
-	rm -rf lib/modules/binary
-	# Bug 459566
-	mv lib/libvmware-netcfg.so lib/lib/
-
-	if use server; then
-		rm -f vmware-workstation-server/bin/{openssl,configure-hostd.sh}
-	fi
-
-	clean_bundled_libs
-
-	DOC_CONTENTS="
-/etc/env.d is updated during ${PN} installation. Please run:\n
-env-update && source /etc/profile\n
-Before you can use ${PN}, you must configure a default network setup.
-You can do this by running 'emerge --config ${PN}'.\n
-To be able to run ${PN} your user must be in the vmware group.\n
-You MUST set USE=bundled-libs if you are running gcc-5, otherwise vmware will not start.
-"
-}
-
-src_install() {
-	local major_minor=$(get_version_component_range 1-2 "${PV}")
-
-	# revdep-rebuild entry
-	insinto /etc/revdep-rebuild
-	echo "SEARCH_DIRS_MASK=\"${VM_INSTALL_DIR}\"" >> ${T}/10${PN}
-	doins "${T}"/10${PN}
-
-	# install the binaries
-	into "${VM_INSTALL_DIR}"
-	dobin bin/*
-
-	# install the libraries
-	insinto "${VM_INSTALL_DIR}"/lib/vmware
-	doins -r lib/*
-
-	# workaround for hardcoded search paths needed during shared objects loading
-	if ! use bundled-libs ; then
-		dosym /usr/$(get_libdir)/libglib-2.0.so.0 \
-			"${VM_INSTALL_DIR}"/lib/vmware/lib/libglib-2.0.so.0/libglib-2.0.so.0
-		# Bug 432918
-		dosym /usr/$(get_libdir)/libcrypto.so.1.0.0 \
-			"${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.1.0.1/libcrypto.so.1.0.1
-		dosym /usr/$(get_libdir)/libssl.so.1.0.0 \
-			"${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.1.0.1/libssl.so.1.0.1
-	fi
-
-	# install the ancillaries
-	insinto /usr
-	doins -r share
-
-	if use cups; then
-		exeinto $(cups-config --serverbin)/filter
-		doexe extras/thnucups
-
-		insinto /etc/cups
-		doins -r etc/cups/*
-	fi
-
-	if use doc; then
-		dodoc doc/*
-	fi
-
-	exeinto "${VM_INSTALL_DIR}"/lib/vmware/setup
-	doexe vmware-config
-
-	# install vmware workstation server
-	if use server; then
-		dosbin sbin/*
-
-		cd "${S}"/vmware-workstation-server
-
-		# install binaries
-		into "${VM_INSTALL_DIR}"/lib/vmware
-		dobin bin/*
-
-		dobin "${FILESDIR}"/configure-hostd.sh
-
-		dobin "${FILESDIR}"/configure-hostd.sh
-
-		# install the libraries
-		insinto "${VM_INSTALL_DIR}"/lib/vmware/lib
-		doins -r lib/*
-
-		into "${VM_INSTALL_DIR}"
-		for tool in vmware-hostd wssc-adminTool ; do
-			cat > "${T}/${tool}" <<-EOF
-				#!/usr/bin/env bash
-				set -e
-
-				. /etc/vmware/bootstrap
-
-				exec "${VM_INSTALL_DIR}/lib/vmware/lib/wrapper-gtk24.sh" \\
-					"${VM_INSTALL_DIR}/lib/vmware/lib" \\
-					"${VM_INSTALL_DIR}/lib/vmware/bin/${tool}" \\
-					"${VM_INSTALL_DIR}/lib/vmware/libconf" "\$@"
-			EOF
-			dobin "${T}/${tool}"
-		done
-
-		insinto "${VM_INSTALL_DIR}"/lib/vmware
-		doins -r hostd
-
-		# create the configuration
-		insinto /etc/vmware/hostd
-		doins -r config/etc/vmware/hostd/*
-		doins -r etc/vmware/hostd/*
-
-		insinto /etc/vmware/ssl
-		doins etc/vmware/ssl/*
-
-		# pam
-		pamd_mimic_system vmware-authd auth account
-
-		# create directory for shared virtual machines.
-		keepdir "${VM_DATA_STORE_DIR}"
-		keepdir /var/log/vmware
-	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
-
-	# install ovftool
-	if use ovftool; then
-		cd "${S}"
-
-		insinto "${VM_INSTALL_DIR}"/lib/vmware-ovftool
-		doins -r vmware-ovftool/*
-
-		chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/{ovftool,ovftool.bin}
-		dosym "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/ovftool "${VM_INSTALL_DIR}"/bin/ovftool
-	fi
-
-	# create symlinks for the various tools
-	local tool ; for tool in thnuclnt vmware vmplayer{,-daemon} licenseTool vmamqpd \
-			vmware-{acetool,enter-serial,gksu,fuseUI,modconfig{,-console},netcfg,tray,zenity} ; 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
-	dosym "${VM_INSTALL_DIR}"/lib/vmware/icu /etc/vmware/icu
-
-	# fix permissions
-	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks}
-	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/wrapper-gtk24.sh
-	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/libgksu2.so.0/gksu-run-helper
-	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/setup/vmware-config
-	fperms 4711 "${VM_INSTALL_DIR}"/bin/vmware-mount
-	fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats}
-	if use server; then
-		fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{vmware-hostd,wssc-adminTool}
-		fperms 4711 "${VM_INSTALL_DIR}"/sbin/vmware-authd
-		fperms 1777 "${VM_DATA_STORE_DIR}"
-	fi
-	if use vix; then
-		fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware-vix/setup/vmware-config
-	fi
-
-	# create the environment
-	local envd="${T}/90vmware"
-	cat > "${envd}" <<-EOF
-		PATH='${VM_INSTALL_DIR}/bin'
-		ROOTPATH='${VM_INSTALL_DIR}/bin'
-	EOF
-	use bundled-libs && echo 'VMWARE_USE_SHIPPED_LIBS=1' >> "${envd}"
-
-	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 = "${MY_PV}"
-		product.buildNumber = "${PV_BUILD}"
-		product.version = "${MY_PV}"
-		product.name = "VMware Workstation"
-		workstation.product.version = "${MY_PV}"
-	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
-
-	if use server; then
-		cat >> "${D}"/etc/vmware/config <<-EOF
-			authd.client.port = "902"
-			authd.proxy.nfc = "vmware-hostd:ha-nfc"
-			authd.soapserver = "TRUE"
-		EOF
-	fi
-
-	# install the init.d script
-	local initscript="${T}/vmware.rc"
-	sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
-		"${FILESDIR}/vmware-${major_minor}.rc" > "${initscript}" || die
-	newinitd "${initscript}" vmware
-
-	if use server; then
-		# install the init.d script
-		local initscript="${T}/vmware-workstation-server.rc"
-		sed -e "s:@@ETCDIR@@:/etc/vmware:g" \
-			-e "s:@@PREFIX@@:${VM_INSTALL_DIR}:g" \
-			-e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
-			-e "s:@@LIBDIR@@:${VM_INSTALL_DIR}/lib/vmware:g" \
-			"${FILESDIR}/vmware-server-${major_minor}.rc" > ${initscript} || die
-		newinitd "${initscript}" vmware-workstation-server
-	fi
-
-	# fill in variable placeholders
-	if use bundled-libs ; then
-		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
-	fi
-	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \
-		-e "/^Encoding/d" \
-		-i "${D}/usr/share/applications/vmware-player.desktop" || die
-	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware:g" \
-		-e "/^Encoding/d" \
-		-i "${D}/usr/share/applications/vmware-workstation.desktop" || die
-	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware-netcfg:g" \
-		-e "/^Encoding/d" \
-		-i "${D}/usr/share/applications/vmware-netcfg.desktop" || die
-
-	if use server; then
-	# Configuration for vmware-workstation-server
-		local hostdUser="${VM_HOSTD_USER:-root}"
-		sed -e "/ACEDataUser/s:root:${hostdUser}:g" \
-			-i "${D}/etc/vmware/hostd/authorization.xml" || die
-
-		# Shared VMs Path: [standard].
-		sed -e "s:##{DS_NAME}##:standard:g" \
-			-e "s:##{DS_PATH}##:${VM_DATA_STORE_DIR}:g" \
-			-i "${D}/etc/vmware/hostd/datastores.xml" || die
-
-		sed -e "s:##{HTTP_PORT}##:-1:g" \
-			-e "s:##{HTTPS_PORT}##:443:g" \
-			-e "s:##{PIPE_PREFIX}##:/var/run/vmware/:g" \
-			-i "${D}/etc/vmware/hostd/proxy.xml" || die
-
-		# See vmware-workstation-server.py for more details.
-		sed -e "s:##{BUILD_CFGDIR}##:/etc/vmware/hostd/:g" \
-			-e "s:##{CFGALTDIR}##:/etc/vmware/hostd/:g" \
-			-e "s:##{CFGDIR}##:/etc/vmware/:g" \
-			-e "s:##{ENABLE_AUTH}##:true:g" \
-			-e "s:##{HOSTDMODE}##:ws:g" \
-			-e "s:##{HOSTD_CFGDIR}##:/etc/vmware/hostd/:g" \
-			-e "s:##{HOSTD_MOCKUP}##:false:g" \
-			-e "s:##{LIBDIR}##:${VM_INSTALL_DIR}/lib/vmware:g" \
-			-e "s:##{LIBDIR_INSTALLED}##:${VM_INSTALL_DIR}/lib/vmware/:g" \
-			-e "s:##{LOGDIR}##:/var/log/vmware/:g" \
-			-e "s:##{LOGLEVEL}##:verbose:g" \
-			-e "s:##{MOCKUP}##:mockup-host-config.xml:g" \
-			-e "s:##{PLUGINDIR}##:./:g" \
-			-e "s:##{SHLIB_PREFIX}##:lib:g" \
-			-e "s:##{SHLIB_SUFFIX}##:.so:g" \
-			-e "s:##{USE_BLKLISTSVC}##:false:g" \
-			-e "s:##{USE_CBRCSVC}##:false:g" \
-			-e "s:##{USE_CIMSVC}##:false:g" \
-			-e "s:##{USE_DIRECTORYSVC}##:false:g" \
-			-e "s:##{USE_DIRECTORYSVC_MOCKUP}##:false:g" \
-			-e "s:##{USE_DYNAMIC_PLUGIN_LOADING}##:false:g" \
-			-e "s:##{USE_DYNAMO}##:false:g" \
-			-e "s:##{USE_DYNSVC}##:false:g" \
-			-e "s:##{USE_GUESTSVC}##:false:g" \
-			-e "s:##{USE_HBRSVC}##:false:g" \
-			-e "s:##{USE_HBRSVC_MOCKUP}##:false:g" \
-			-e "s:##{USE_HOSTSVC_MOCKUP}##:false:g" \
-			-e "s:##{USE_HTTPNFCSVC}##:false:g" \
-			-e "s:##{USE_HTTPNFCSVC_MOCKUP}##:false:g" \
-			-e "s:##{USE_LICENSESVC_MOCKUP}##:false:g" \
-			-e "s:##{USE_NFCSVC}##:true:g" \
-			-e "s:##{USE_NFCSVC_MOCKUP}##:false:g" \
-			-e "s:##{USE_OVFMGRSVC}##:true:g" \
-			-e "s:##{USE_PARTITIONSVC}##:false:g" \
-			-e "s:##{USE_SECURESOAP}##:false:g" \
-			-e "s:##{USE_SNMPSVC}##:false:g" \
-			-e "s:##{USE_SOLO_MOCKUP}##:false:g" \
-			-e "s:##{USE_STATSSVC_MOCKUP}##:false:g" \
-			-e "s:##{USE_VCSVC_MOCKUP}##:false:g" \
-			-e "s:##{USE_VDISKSVC}##:false:g" \
-			-e "s:##{USE_VDISKSVC_MOCKUP}##:false:g" \
-			-e "s:##{USE_VMSVC_MOCKUP}##:false:g" \
-			-e "s:##{VM_INVENTORY}##:vmInventory.xml:g" \
-			-e "s:##{VM_RESOURCES}##:vmResources.xml:g" \
-			-e "s:##{WEBSERVER_PORT_ENTRY}##::g" \
-			-e "s:##{WORKINGDIR}##:./:g" \
-			-i "${D}/etc/vmware/hostd/config.xml" || die
-
-		sed -e "s:##{ENV_LOCATION}##:/etc/vmware/hostd/env/:g" \
-			-i "${D}/etc/vmware/hostd/environments.xml" || die
-
-		# @@VICLIENT_URL@@=XXX
-		sed -e "s:@@AUTHD_PORT@@:902:g" \
-			-i "${D}${VM_INSTALL_DIR}/lib/vmware/hostd/docroot/client/clients.xml" || die
-	fi
-
-	# install systemd unit files
-	systemd_dounit "${WORKDIR}/systemd-vmware-${SYSTEMD_UNITS_TAG}/"*.{service,target}
-
-	readme.gentoo_create_doc
-}
-
-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
-	readme.gentoo_print_elog
-
-	ewarn "${P} is using an old version of libgcrypt library which"
-	ewarn "is going to be soon removed from portage due to security reasons"
-	ewarn "(see https://bugs.gentoo.org/show_bug.cgi?id=541564)."
-	ewarn "Until vmware is fixed upstream you're exposed to security issues!"
-}
-
-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-12.5.6.5528349.ebuild b/app-emulation/vmware-workstation/vmware-workstation-12.5.6.5528349.ebuild
new file mode 100644
index 0000000..73ad701
--- /dev/null
+++ b/app-emulation/vmware-workstation/vmware-workstation-12.5.6.5528349.ebuild
@@ -0,0 +1,598 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils versionator readme.gentoo-r1 fdo-mime gnome2-utils pam systemd vmware-bundle
+
+MY_PN="VMware-Workstation"
+MY_PV=$(get_version_component_range 1-3)
+PV_MODULES="308.$(get_version_component_range 2-3)"
+PV_BUILD=$(get_version_component_range 4)
+MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}"
+
+SYSTEMD_UNITS_TAG="gentoo-02"
+
+DESCRIPTION="Emulate a complete PC without the performance overhead of most emulators"
+HOMEPAGE="http://www.vmware.com/products/workstation/"
+BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/ws/${MY_PV}/${PV_BUILD}/linux/core/"
+SRC_URI="
+	amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar )
+	https://github.com/akhuettel/systemd-vmware/archive/${SYSTEMD_UNITS_TAG}.tar.gz -> vmware-systemd-${SYSTEMD_UNITS_TAG}.tgz
+	"
+
+LICENSE="vmware GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="bundled-libs cups doc ovftool server vix +vmware-tools"
+RESTRICT="mirror strip"
+
+BUNDLED_LIBS_DIR=/opt/vmware/lib/vmware/lib
+
+BUNDLED_LIBS="
+	libXau.so.6
+	libXcomposite.so.1
+	libXcursor.so.1
+	libXdamage.so.1
+	libXdmcp.so.6
+	libXfixes.so.3
+	libXft.so.2
+	libXinerama.so.1
+	libXrandr.so.2
+	libXrender.so.1
+	libaio.so.1
+	libatk-1.0.so.0
+	libatkmm-1.6.so.1
+	libatspi.so.0
+	libcairo.so.2
+	libcairomm-1.0.so.1
+	libcrypto.so.1.0.1
+	libcurl.so.4
+	libdbus-1.so.3
+	libfontconfig.so.1
+	libfreetype.so.6
+	libfuse.so.2
+	libgailutil.so.18
+	libgcc_s.so.1
+	libgcrypt.so.11
+	libgdk-x11-2.0.so.0
+	libgdk_pixbuf-2.0.so.0
+	libgdkmm-2.4.so.1
+	libgio-2.0.so.0
+	libgiomm-2.4.so.1
+	libglib-2.0.so.0
+	libglibmm-2.4.so.1
+	libglibmm_generate_extra_defs-2.4.so.1
+	libgmodule-2.0.so.0
+	libgobject-2.0.so.0
+	libgpg-error.so.0
+	libgthread-2.0.so.0
+	libgtk-x11-2.0.so.0
+	libgtkmm-2.4.so.1
+	libpango-1.0.so.0
+	libpangocairo-1.0.so.0
+	libpangoft2-1.0.so.0
+	libpangomm-1.4.so.1
+	libpangox-1.0.so.0
+	libpangoxft-1.0.so.0
+	libpcsclite.so.1
+	libpixman-1.so.0
+	libpng12.so.0
+	librsvg-2.so.2
+	libsigc-2.0.so.0
+	libssl.so.1.0.1
+	libstdc++.so.6
+	libxml2.so.2
+"
+
+BUNDLED_LIB_DEPENDS="
+	dev-cpp/atkmm
+	dev-cpp/cairomm
+	dev-cpp/glibmm:2
+	dev-cpp/gtkmm:2.4
+	dev-cpp/pangomm
+	dev-libs/atk
+	dev-libs/glib:2
+	dev-libs/libgcrypt:11/11
+	dev-libs/libgpg-error
+	dev-libs/libsigc++:2
+	dev-libs/libxml2
+	dev-libs/openssl:0
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libpng:1.2
+	net-misc/curl
+	sys-fs/fuse
+	sys-libs/zlib
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/libXau
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/pango
+	x11-libs/pixman
+"
+
+# vmware should not use virtual/libc as this is a
+# precompiled binary package thats linked to glibc.
+RDEPEND="
+	media-libs/alsa-lib
+	net-print/cups
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libXtst
+	x11-libs/startup-notification
+	x11-themes/hicolor-icon-theme
+	bundled-libs? (
+		media-libs/tiff:3
+		x11-libs/libICE
+		x11-libs/libSM
+		virtual/jpeg:62
+	)
+	!bundled-libs? ( ${BUNDLED_LIB_DEPENDS} )
+	!app-emulation/vmware-player
+"
+PDEPEND="~app-emulation/vmware-modules-${PV_MODULES}
+	vmware-tools? ( app-emulation/vmware-tools )"
+DEPEND=">=dev-util/patchelf-0.9"
+
+S=${WORKDIR}
+VM_INSTALL_DIR="/opt/vmware"
+VM_DATA_STORE_DIR="/var/lib/vmware/Shared VMs"
+VM_HOSTD_USER="root"
+
+QA_PREBUILT="/opt/*"
+
+QA_WX_LOAD="opt/vmware/lib/vmware/tools-upgraders/vmware-tools-upgrader-32 opt/vmware/lib/vmware/bin/vmware-vmx-stats opt/vmware/lib/vmware/bin/vmware-vmx-debug opt/vmware/lib/vmware/bin/vmware-vmx"
+
+src_unpack() {
+	default
+	local bundle=${MY_P}.x86_64.bundle
+
+	local component; for component in \
+		vmware-workstation \
+		vmware-player-app \
+		vmware-player-setup \
+		vmware-vmx \
+		vmware-network-editor \
+		vmware-network-editor-ui \
+		vmware-usbarbitrator \
+		vmware-vprobe
+	do
+		vmware-bundle_extract-bundle-component "${bundle}" "${component}" "${S}"
+	done
+
+	if use ovftool; then
+		vmware-bundle_extract-bundle-component "${bundle}" vmware-ovftool
+	fi
+
+	if use server; then
+		vmware-bundle_extract-bundle-component "${bundle}" vmware-workstation-server #"${S}"
+	fi
+
+	if use vix; then
+		vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-core vmware-vix
+		vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-lib-Workstation1200 vmware-vix
+	fi
+}
+
+clean_bundled_libs() {
+	if ! use bundled-libs ; then
+		einfo "Removing bundled libraries"
+		for libname in ${BUNDLED_LIBS} ; do
+			rm -rv "${S}"/lib/lib/${libname} || die "Failed removing bundled ${libname}"
+		done
+
+		rm -rv "${S}"/lib/libconf || die "Failed removing bundled gtk conf libs"
+
+		# Among the bundled libs there are libcrypto.so.1.0.1 and libssl.so.1.0.1
+		# (needed by libcds.so) which seem to be compiled from openssl-1.0.1h.
+		# Upstream real sonames are *so.1.0.0 so it's necessary to fix DT_NEEDED link
+		# in libcds.so to be able to use system libs.
+		pushd >/dev/null .
+		einfo "Patching libcds.so"
+		cd "${S}"/lib/lib/libcds.so || die
+		patchelf --replace-needed libssl.so.1.0.{1,0} \
+				 --replace-needed libcrypto.so.1.0.{1,0} \
+				 libcds.so || die
+		popd >/dev/null
+
+		# vmware-workstation seems to use a custom version of libgksu2.so, for this reason
+		# we leave the bundled version. The libvmware-gksu.so library declares simply DT_NEEDED
+		# libgksu2.so.0 but it uses at runtime the bundled version, patch the lib to avoid portage
+		# preserve-libs mechanism to be triggered when a system lib is available (but not required)
+		pushd >/dev/null .
+		einfo "Patching libvmware-gksu.so"
+		cd "${S}"/lib/lib/libvmware-gksu.so || die
+		patchelf --set-rpath "\$ORIGIN/../libgksu2.so.0" \
+				 libvmware-gksu.so || die
+		popd >/dev/null
+	else
+		# if librsvg is not installed in the system then vmware doesn't start
+		pushd >/dev/null .
+		einfo "Patching svg_loader.so"
+		cd "${S}"/lib/libconf/lib/gtk-2.0/2.10.0/loaders || die
+		patchelf --set-rpath "\$ORIGIN/../../../../../lib/librsvg-2.so.2" \
+				 svg_loader.so || die
+		popd >/dev/null
+	fi
+}
+
+src_prepare() {
+	rm -f bin/vmware-modconfig
+	rm -rf lib/modules/binary
+	# Bug 459566
+	mv lib/libvmware-netcfg.so lib/lib/
+
+	if use server; then
+		rm -f vmware-workstation-server/bin/{openssl,configure-hostd.sh}
+	fi
+
+	clean_bundled_libs
+
+	DOC_CONTENTS="
+/etc/env.d is updated during ${PN} installation. Please run:\n
+env-update && source /etc/profile\n
+Before you can use ${PN}, you must configure a default network setup.
+You can do this by running 'emerge --config ${PN}'.\n
+To be able to run ${PN} your user must be in the vmware group.\n
+You MUST set USE=bundled-libs if you are running gcc-5, otherwise vmware will not start.
+"
+}
+
+src_install() {
+	local major_minor=$(get_version_component_range 1-2 "${PV}")
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	echo "SEARCH_DIRS_MASK=\"${VM_INSTALL_DIR}\"" >> ${T}/10${PN}
+	doins "${T}"/10${PN}
+
+	# install the binaries
+	into "${VM_INSTALL_DIR}"
+	dobin bin/*
+
+	# install the libraries
+	insinto "${VM_INSTALL_DIR}"/lib/vmware
+	doins -r lib/*
+
+	# workaround for hardcoded search paths needed during shared objects loading
+	if ! use bundled-libs ; then
+		dosym /usr/$(get_libdir)/libglib-2.0.so.0 \
+			"${VM_INSTALL_DIR}"/lib/vmware/lib/libglib-2.0.so.0/libglib-2.0.so.0
+		# Bug 432918
+		dosym /usr/$(get_libdir)/libcrypto.so.1.0.0 \
+			"${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.1.0.1/libcrypto.so.1.0.1
+		dosym /usr/$(get_libdir)/libssl.so.1.0.0 \
+			"${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.1.0.1/libssl.so.1.0.1
+	fi
+
+	# install the ancillaries
+	insinto /usr
+	doins -r share
+
+	if use cups; then
+		exeinto $(cups-config --serverbin)/filter
+		doexe extras/thnucups
+
+		insinto /etc/cups
+		doins -r etc/cups/*
+	fi
+
+	if use doc; then
+		dodoc doc/*
+	fi
+
+	exeinto "${VM_INSTALL_DIR}"/lib/vmware/setup
+	doexe vmware-config
+
+	# install vmware workstation server
+	if use server; then
+		dosbin sbin/*
+
+		cd "${S}"/vmware-workstation-server
+
+		# install binaries
+		into "${VM_INSTALL_DIR}"/lib/vmware
+		dobin bin/*
+
+		dobin "${FILESDIR}"/configure-hostd.sh
+
+		dobin "${FILESDIR}"/configure-hostd.sh
+
+		# install the libraries
+		insinto "${VM_INSTALL_DIR}"/lib/vmware/lib
+		doins -r lib/*
+
+		into "${VM_INSTALL_DIR}"
+		for tool in vmware-hostd wssc-adminTool ; do
+			cat > "${T}/${tool}" <<-EOF
+				#!/usr/bin/env bash
+				set -e
+
+				. /etc/vmware/bootstrap
+
+				exec "${VM_INSTALL_DIR}/lib/vmware/lib/wrapper-gtk24.sh" \\
+					"${VM_INSTALL_DIR}/lib/vmware/lib" \\
+					"${VM_INSTALL_DIR}/lib/vmware/bin/${tool}" \\
+					"${VM_INSTALL_DIR}/lib/vmware/libconf" "\$@"
+			EOF
+			dobin "${T}/${tool}"
+		done
+
+		insinto "${VM_INSTALL_DIR}"/lib/vmware
+		doins -r hostd
+
+		# create the configuration
+		insinto /etc/vmware/hostd
+		doins -r config/etc/vmware/hostd/*
+		doins -r etc/vmware/hostd/*
+
+		insinto /etc/vmware/ssl
+		doins etc/vmware/ssl/*
+
+		# pam
+		pamd_mimic_system vmware-authd auth account
+
+		# create directory for shared virtual machines.
+		keepdir "${VM_DATA_STORE_DIR}"
+		keepdir /var/log/vmware
+	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
+
+	# install ovftool
+	if use ovftool; then
+		cd "${S}"
+
+		insinto "${VM_INSTALL_DIR}"/lib/vmware-ovftool
+		doins -r vmware-ovftool/*
+
+		chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/{ovftool,ovftool.bin}
+		dosym "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/ovftool "${VM_INSTALL_DIR}"/bin/ovftool
+	fi
+
+	# create symlinks for the various tools
+	local tool ; for tool in thnuclnt vmware vmplayer{,-daemon} licenseTool vmamqpd \
+			vmware-{acetool,enter-serial,gksu,fuseUI,modconfig{,-console},netcfg,tray,zenity} ; 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
+	dosym "${VM_INSTALL_DIR}"/lib/vmware/icu /etc/vmware/icu
+
+	# fix permissions
+	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks}
+	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/wrapper-gtk24.sh
+	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/libgksu2.so.0/gksu-run-helper
+	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/setup/vmware-config
+	fperms 4711 "${VM_INSTALL_DIR}"/bin/vmware-mount
+	fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats}
+	if use server; then
+		fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{vmware-hostd,wssc-adminTool}
+		fperms 4711 "${VM_INSTALL_DIR}"/sbin/vmware-authd
+		fperms 1777 "${VM_DATA_STORE_DIR}"
+	fi
+	if use vix; then
+		fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware-vix/setup/vmware-config
+	fi
+
+	# create the environment
+	local envd="${T}/90vmware"
+	cat > "${envd}" <<-EOF
+		PATH='${VM_INSTALL_DIR}/bin'
+		ROOTPATH='${VM_INSTALL_DIR}/bin'
+	EOF
+	use bundled-libs && echo 'VMWARE_USE_SHIPPED_LIBS=1' >> "${envd}"
+
+	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 = "${MY_PV}"
+		product.buildNumber = "${PV_BUILD}"
+		product.version = "${MY_PV}"
+		product.name = "VMware Workstation"
+		workstation.product.version = "${MY_PV}"
+	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
+
+	if use server; then
+		cat >> "${D}"/etc/vmware/config <<-EOF
+			authd.client.port = "902"
+			authd.proxy.nfc = "vmware-hostd:ha-nfc"
+			authd.soapserver = "TRUE"
+		EOF
+	fi
+
+	# install the init.d script
+	local initscript="${T}/vmware.rc"
+	sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
+		"${FILESDIR}/vmware-${major_minor}.rc" > "${initscript}" || die
+	newinitd "${initscript}" vmware
+
+	if use server; then
+		# install the init.d script
+		local initscript="${T}/vmware-workstation-server.rc"
+		sed -e "s:@@ETCDIR@@:/etc/vmware:g" \
+			-e "s:@@PREFIX@@:${VM_INSTALL_DIR}:g" \
+			-e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
+			-e "s:@@LIBDIR@@:${VM_INSTALL_DIR}/lib/vmware:g" \
+			"${FILESDIR}/vmware-server-${major_minor}.rc" > ${initscript} || die
+		newinitd "${initscript}" vmware-workstation-server
+	fi
+
+	# fill in variable placeholders
+	if use bundled-libs ; then
+		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
+	fi
+	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \
+		-e "/^Encoding/d" \
+		-i "${D}/usr/share/applications/vmware-player.desktop" || die
+	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware:g" \
+		-e "/^Encoding/d" \
+		-i "${D}/usr/share/applications/vmware-workstation.desktop" || die
+	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware-netcfg:g" \
+		-e "/^Encoding/d" \
+		-i "${D}/usr/share/applications/vmware-netcfg.desktop" || die
+
+	if use server; then
+	# Configuration for vmware-workstation-server
+		local hostdUser="${VM_HOSTD_USER:-root}"
+		sed -e "/ACEDataUser/s:root:${hostdUser}:g" \
+			-i "${D}/etc/vmware/hostd/authorization.xml" || die
+
+		# Shared VMs Path: [standard].
+		sed -e "s:##{DS_NAME}##:standard:g" \
+			-e "s:##{DS_PATH}##:${VM_DATA_STORE_DIR}:g" \
+			-i "${D}/etc/vmware/hostd/datastores.xml" || die
+
+		sed -e "s:##{HTTP_PORT}##:-1:g" \
+			-e "s:##{HTTPS_PORT}##:443:g" \
+			-e "s:##{PIPE_PREFIX}##:/var/run/vmware/:g" \
+			-i "${D}/etc/vmware/hostd/proxy.xml" || die
+
+		# See vmware-workstation-server.py for more details.
+		sed -e "s:##{BUILD_CFGDIR}##:/etc/vmware/hostd/:g" \
+			-e "s:##{CFGALTDIR}##:/etc/vmware/hostd/:g" \
+			-e "s:##{CFGDIR}##:/etc/vmware/:g" \
+			-e "s:##{ENABLE_AUTH}##:true:g" \
+			-e "s:##{HOSTDMODE}##:ws:g" \
+			-e "s:##{HOSTD_CFGDIR}##:/etc/vmware/hostd/:g" \
+			-e "s:##{HOSTD_MOCKUP}##:false:g" \
+			-e "s:##{LIBDIR}##:${VM_INSTALL_DIR}/lib/vmware:g" \
+			-e "s:##{LIBDIR_INSTALLED}##:${VM_INSTALL_DIR}/lib/vmware/:g" \
+			-e "s:##{LOGDIR}##:/var/log/vmware/:g" \
+			-e "s:##{LOGLEVEL}##:verbose:g" \
+			-e "s:##{MOCKUP}##:mockup-host-config.xml:g" \
+			-e "s:##{PLUGINDIR}##:./:g" \
+			-e "s:##{SHLIB_PREFIX}##:lib:g" \
+			-e "s:##{SHLIB_SUFFIX}##:.so:g" \
+			-e "s:##{USE_BLKLISTSVC}##:false:g" \
+			-e "s:##{USE_CBRCSVC}##:false:g" \
+			-e "s:##{USE_CIMSVC}##:false:g" \
+			-e "s:##{USE_DIRECTORYSVC}##:false:g" \
+			-e "s:##{USE_DIRECTORYSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_DYNAMIC_PLUGIN_LOADING}##:false:g" \
+			-e "s:##{USE_DYNAMO}##:false:g" \
+			-e "s:##{USE_DYNSVC}##:false:g" \
+			-e "s:##{USE_GUESTSVC}##:false:g" \
+			-e "s:##{USE_HBRSVC}##:false:g" \
+			-e "s:##{USE_HBRSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_HOSTSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_HTTPNFCSVC}##:false:g" \
+			-e "s:##{USE_HTTPNFCSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_LICENSESVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_NFCSVC}##:true:g" \
+			-e "s:##{USE_NFCSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_OVFMGRSVC}##:true:g" \
+			-e "s:##{USE_PARTITIONSVC}##:false:g" \
+			-e "s:##{USE_SECURESOAP}##:false:g" \
+			-e "s:##{USE_SNMPSVC}##:false:g" \
+			-e "s:##{USE_SOLO_MOCKUP}##:false:g" \
+			-e "s:##{USE_STATSSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_VCSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_VDISKSVC}##:false:g" \
+			-e "s:##{USE_VDISKSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_VMSVC_MOCKUP}##:false:g" \
+			-e "s:##{VM_INVENTORY}##:vmInventory.xml:g" \
+			-e "s:##{VM_RESOURCES}##:vmResources.xml:g" \
+			-e "s:##{WEBSERVER_PORT_ENTRY}##::g" \
+			-e "s:##{WORKINGDIR}##:./:g" \
+			-i "${D}/etc/vmware/hostd/config.xml" || die
+
+		sed -e "s:##{ENV_LOCATION}##:/etc/vmware/hostd/env/:g" \
+			-i "${D}/etc/vmware/hostd/environments.xml" || die
+
+		# @@VICLIENT_URL@@=XXX
+		sed -e "s:@@AUTHD_PORT@@:902:g" \
+			-i "${D}${VM_INSTALL_DIR}/lib/vmware/hostd/docroot/client/clients.xml" || die
+	fi
+
+	# install systemd unit files
+	systemd_dounit "${WORKDIR}/systemd-vmware-${SYSTEMD_UNITS_TAG}/"*.{service,target}
+
+	readme.gentoo_create_doc
+}
+
+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
+	readme.gentoo_print_elog
+
+	ewarn "${P} is using an old version of libgcrypt library which"
+	ewarn "is going to be soon removed from portage due to security reasons"
+	ewarn "(see https://bugs.gentoo.org/show_bug.cgi?id=541564)."
+	ewarn "Until vmware is fixed upstream you're exposed to security issues!"
+}
+
+pkg_prerm() {
+	einfo "Stopping ${PN} for safe unmerge"
+	/etc/init.d/vmware stop
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
-- 
cgit v1.2.3-65-gdbad