Import latest vmware-{modules,workstation} from stefantalpalaru-overlay

Signed-off-by: Daniel Solano <gentoo@sattvik.com>

6 files changed, 8 insertions, 662 deletions

diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest
index 3e9c210..a875840 100644
--- a/app-emulation/vmware-modules/Manifest
+++ b/app-emulation/vmware-modules/Manifest
@@ -1,5 +1,3 @@
-DIST vmware-modules-15.5.7-5.11.zip 591122 BLAKE2B 81991704500def9c072970a11a38b538254c5750d9ee5001b507bbf6fd6177d3391a17f57bd655843bbc5c25be92c7f5c43e83dd3df33cccd1537b1d05c48cd1 SHA512 a39767a5685192e69cac8b050c3e7acecfcb9a6b9245e1b6663fdfb4c778818a635eb89e05a9099a200bc1568d3c110cef24ab24f35f5960876ef950dd76ef96
-DIST vmware-modules-16.1.1-5.11.zip 605507 BLAKE2B 4ac0c7792c8c05d26dcc0f7850107b6b6a2d4b3198d601595df8c40801ac5fb007d42def39ec1ffbcd1df090833f4e2c0cd2b90a4e86c0f990acfdad17e2b8f0 SHA512 dd834f6023ca4e07ef93aec6525151c35bf8d33eff16c5b25c4c535dd9145d8e0e411e998722561efc411c3eef7b404a6053f84497bbdc88da10dde123f9d6d7
-EBUILD vmware-modules-15.5.7-r4.ebuild 2627 BLAKE2B ab92a0474f8508d8a7e0b6ba57c3d90c07db5bc8725c3f96e439f6739f949eb7e795e5c5924ebabf11d4d1e81f0d494d4e033fed1e411b384954580bc0967bda SHA512 ab060f47332cd9ee8ce8e6e03052241c84e52174cf85ec7faf0e87e57eb600e87d328a713dbb3ca0c81d167d24e53ff971edd0772a65f0a121c474bb3afb79a5
-EBUILD vmware-modules-16.1.1.ebuild 2627 BLAKE2B ab92a0474f8508d8a7e0b6ba57c3d90c07db5bc8725c3f96e439f6739f949eb7e795e5c5924ebabf11d4d1e81f0d494d4e033fed1e411b384954580bc0967bda SHA512 ab060f47332cd9ee8ce8e6e03052241c84e52174cf85ec7faf0e87e57eb600e87d328a713dbb3ca0c81d167d24e53ff971edd0772a65f0a121c474bb3afb79a5
+DIST vmware-modules-16.1.2-5.12.zip 605507 BLAKE2B 0c30ef47a016532731c27e1408114fe0c21ef1e67d22782a17fb619f41a32e0ed79f5a8cccf4c8441519ab35731f99aaa334a56b2c698aa8ba56906d7ffddb68 SHA512 b8cee52698a57e3716a4de53c47b8d672189a51830d6f60d92b8c9e65f73a916e08b676f7bd72c9140f27855a5fb51e83674d762984bbddc196e1992627251f4
+EBUILD vmware-modules-16.1.2.ebuild 2627 BLAKE2B 96f50aa981815f382201d8846da09fbe6ed6226bcaba308ceafe5d802d6a14ea7d89c0adfe42aa21fb96e9902180173b2de958e943d310a34269e391cb8cd284 SHA512 992a75ee61f91d5952a8105832ea739cf64310f63c648995da459a1aff5528b90049411f052a88cd332bc30e0901809b60c0469e12999e77d44a8b920e5487f6
 MISC metadata.xml 322 BLAKE2B 178d5a7e0f6a26281fdeb655994b728e1b2e831a9bd7e07d6ed7c5ad2edb04d30bb8543ee5a1440f06e3a9eb1af20810a3e93800291f5feda877a644aacad14a SHA512 8ed1935f376c38b57fdcd973dab5a8dd714b2fbb74108228f3aab19cec95340c93f6ecff03b10fcafd261896efa711f47ef8c301f35fa0fc4490a4fb45f2fd55
diff --git a/app-emulation/vmware-modules/vmware-modules-16.1.1.ebuild b/app-emulation/vmware-modules/vmware-modules-16.1.1.ebuild
deleted file mode 100644
index 60a0bbd..0000000
--- a/app-emulation/vmware-modules/vmware-modules-16.1.1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils flag-o-matic linux-info linux-mod user udev
-
-DESCRIPTION="VMware kernel modules"
-HOMEPAGE="https://github.com/mkubecek/vmware-host-modules"
-
-MY_KERNEL_VERSION="5.11"
-SRC_URI="https://github.com/mkubecek/vmware-host-modules/archive/w${PV}-k${MY_KERNEL_VERSION}.zip -> ${P}-${MY_KERNEL_VERSION}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-
-RESTRICT="mirror"
-
-S="${WORKDIR}/vmware-host-modules-w${PV}-k${MY_KERNEL_VERSION}"
-
-pkg_setup() {
-	CONFIG_CHECK="~HIGH_RES_TIMERS"
-	if kernel_is -ge 5 5; then
-		CONFIG_CHECK="${CONFIG_CHECK} X86_IOPL_IOPERM"
-	fi
-	if kernel_is -ge 2 6 37 && kernel_is -lt 2 6 39; then
-		CONFIG_CHECK="${CONFIG_CHECK} BKL"
-	fi
-	CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI VMWARE_VMCI_VSOCKETS"
-
-	linux-info_pkg_setup
-	linux-mod_pkg_setup
-
-	VMWARE_GROUP=${VMWARE_GROUP:-vmware}
-
-	VMWARE_MODULE_LIST="vmmon vmnet"
-
-	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_prepare() {
-	# decouple the kernel include dir from the running kernel version: https://github.com/stefantalpalaru/gentoo-overlay/issues/17
-	sed -i \
-		-e "s%HEADER_DIR = /lib/modules/\$(VM_UNAME)/build/include%HEADER_DIR = ${KERNEL_DIR}/include%" \
-		-e "s%VM_UNAME = .*\$%VM_UNAME = ${KV_FULL}%" \
-		*/Makefile || die "sed failed"
-
-	# Allow user patches so they can support RC kernels and whatever else
-	default
-}
-
-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}"
-
-	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
-	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
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	ewarn "Don't forget to run '/etc/init.d/vmware restart' to use the new kernel modules."
-}
diff --git a/app-emulation/vmware-modules/vmware-modules-15.5.7-r4.ebuild b/app-emulation/vmware-modules/vmware-modules-16.1.2.ebuild
index 60a0bbd..35288db 100644
--- a/app-emulation/vmware-modules/vmware-modules-15.5.7-r4.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-16.1.2.ebuild
@@ -8,7 +8,7 @@ inherit eutils flag-o-matic linux-info linux-mod user udev
 DESCRIPTION="VMware kernel modules"
 HOMEPAGE="https://github.com/mkubecek/vmware-host-modules"
 
-MY_KERNEL_VERSION="5.11"
+MY_KERNEL_VERSION="5.12"
 SRC_URI="https://github.com/mkubecek/vmware-host-modules/archive/w${PV}-k${MY_KERNEL_VERSION}.zip -> ${P}-${MY_KERNEL_VERSION}.zip"
 
 LICENSE="GPL-2"
diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
index f2637b2..647c84d 100644
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@@ -1,12 +1,9 @@
 AUX vmware-15.5.rc 2476 BLAKE2B dff25b43c5fa57186be2a5f0ca4606d26cd1c3f3dbeb91d855fc07a9fd576f446983c852c8e0b112c5616bb95dfddc7e2c738b4d0ca341c781d7addcb45068cd SHA512 9bae224387128b2cd221d509e2933042e3925fb041670907d8a47c70a488214206912fe25ab24c0bdeb31591149e62aba374d3fa63fdd08644e09667e195967f
 AUX vmware-16.1.rc 2476 BLAKE2B dff25b43c5fa57186be2a5f0ca4606d26cd1c3f3dbeb91d855fc07a9fd576f446983c852c8e0b112c5616bb95dfddc7e2c738b4d0ca341c781d7addcb45068cd SHA512 9bae224387128b2cd221d509e2933042e3925fb041670907d8a47c70a488214206912fe25ab24c0bdeb31591149e62aba374d3fa63fdd08644e09667e195967f
 AUX vmware-server-15.5.rc 1506 BLAKE2B 886ed1de7a99320611a28a43b48cf17715fcab8bf533a73c28a1aa2f8d150ee2b84e1e510e864b18347f3bd7e43faec3cfc90f09d5ac9c0afe821f67654a68c4 SHA512 548ff69f87bee2b6c82bd931d22dd560370c4a00641ae47d05af05bbc72cedc8fd25054abc405a590b72227b10c5997d79f16ded67f3e0cfac142eb248b47d44
-DIST VMware-Workstation-Full-15.5.7-17171714.x86_64.bundle 537751757 BLAKE2B 48fedccad49c806bde657c2300b806a0a3c50821290b7bf18c2db459d1019aaad5734bb81dce2c3666a78a72f2f06b22a13b7e666bb79b839c1b959caade127a SHA512 70e11d867df7f9053f5c684035bfcb72c5fa3151b58ac06e4fea11672f4e93b8d12ab7e3fe71435223fd0f8113e88c33d0e3c1490d5a1674fa729180ae5f4f27
-DIST VMware-Workstation-Full-16.1.1-17801498.x86_64.bundle 528128839 BLAKE2B 179a30bf36f326f4a232a7ede99b53fd59405502f758d79737d9af0df4da9990006e3b933f4256aab057fa6784f9561bbb3d876e377cab6f186e7b4a06eaf346 SHA512 a0d1ff994d4489b5393d2b3c250d120bf7f39dac4a8ac40b95141b51933e16a181dee59716114e268d98eae947dc94e5d7c920e275d59de7963577767f4e35b5
-DIST com.vmware.fusion-15.5.7.17171714.zip.tar 635852800 BLAKE2B 43c6378a516fa3ead0eed2e015b8ddf05650a00241320a0ca11ef857f32a15f579e2bd98715aef980c75fcbae86314d68ca7205bb59239b34dfc7270ea6bad25 SHA512 0d76837262465139853dbef8c3a8797e53119ed0eb88afa9968e5b8b2fc25226de10113ca734eaae7e76e4cc024a7adee103a21449e66ad27a717bffd9f70707
-DIST com.vmware.fusion-16.1.1.17801498.zip.tar 658288640 BLAKE2B c82c54c04fe28cb3a6a1c2bad8f53164d0616d08512a5fd48817d55515b26baf4968560a1b5aff0d2ec08098c54944d0446d8bd8aa7b1ba0a7cf17f887726471 SHA512 fe67426372e4da04e8b0116e8cfd146bd95f68d9636bb678d42f7ac12f1f59ba25cc5b9bec018ce378d81931d2a4401bf88d61dedf40c96e3aa127ce37af4d38
+DIST VMware-Workstation-Full-16.1.2-17966106.x86_64.bundle 527417929 BLAKE2B de95a77f5a07d296bdcf68f12e96eb875a5c8f574a31b951ec49f917bbac86681fa0a6155e730b1329f5c1ec05a4e653f1ae1625767d65a2acde9b7be4a8d8e4 SHA512 30b5a97a3388cd68639f057ac6202df5654a484b56d14cdc4399b8a75365ee2301bd87b9c150ca708e76c7c3aedd666cfd118375c0631300a91648ce6456ee7d
+DIST com.vmware.fusion-16.1.2.17966106.zip.tar 657377280 BLAKE2B d05d5608c1faa1958bea1219524f60018a8b82fb15e8d5c09f05d5c8153e48366fe6e28d34899fd8eac9ffa0dcb4895d55af1742cb59474bbf5a00f6fcf3511c SHA512 601065cce615580315419c7885958b31566f2c462e7e992795b351a5bcb6b11c1c82bdbbcd172c79c7ceac1bf43dd0bcba02e91e8859591e070907f5cffe3277
 DIST unlocker-3.0.3.tar.gz 13521100 BLAKE2B 5fd3865d55bdc842b98f921e536f36103a69f635eabb741f17e4d6e3b0bda6c0561c082f5921e12c4ca49b9f10c9c12a9ea3be3c154e97979dbdbc3d4658528c SHA512 d83bd1ca0de2ce56d93479ec14d456cfdb7ebae07df631ec67aa3b97c5090ac0af8d2c02ed4373af06e8e980f84b801b78fb2c486cac62397b23e2af521fa020
 DIST vmware-systemd-gentoo-02.tgz 14064 BLAKE2B 24ac2c2f295130f4aadad867ec88d652bd292cc60e6b471bb2e01069fe01d84dac3d8b0ca7690ebf218d663adfe0c1dc889d3f4f53cf3178b68291461260748b SHA512 3a382bfd5f1eb2b218d8012588ea55c1f22786dba35a1fc0fdfdb4e40b05e0e735ed09c6961684f6442e863c3ed72024ce01f19113bbd9ca47c32e3f43c55f42
-EBUILD vmware-workstation-15.5.7.17171714-r1.ebuild 19085 BLAKE2B 5cc73193868208622d30d28f6ecce1788bfe8720a6acc79045ee44519c768089d1a1bf2ab278e78082fd01c312b61c300483a09b7f04037644cda1033228a428 SHA512 1dc5fa67e305e38455dca7e12a4df8c452d751463fa5976fef30dcea9e7f325fe0e9db108851f564a8bf10e4f7a0f033bc359b8338921f1cf11b1d45c84cd7dc
-EBUILD vmware-workstation-16.1.1.17801498-r1.ebuild 14496 BLAKE2B 6ee1e776987f0aa473315609656fcfae81575f36e77dfd860d41dd08564abf30e2655e75d66d54a93b75a29c9043184d7f18129ce67a7229a56b9555141f0914 SHA512 1202135384d0081d71e1110f5f4b09139f6191463621b3e2666a86282412322add61928af5f5c277409e4cc914073a9c316c1bf4d129ec99cf30546e4afec756
+EBUILD vmware-workstation-16.1.2.17966106.ebuild 14496 BLAKE2B 0f54dc54cfcf8f931ec15a43f832f5d25da4e2ddb56c9c77c61b1ebac922db729f25face8fff1b36065721b6f76479210496b8d35b6a3ecbc076ffe7c660f1c3 SHA512 6eb4ec6315a6bf5a75201fe775c3d16e2e9f6480a5c2945b13a2ff7e6443a193915bc32d25463f01543d24b597b2806a43053ca26ec238056e0f37bdeb165a16
 MISC metadata.xml 1852 BLAKE2B 3d3241e2fa53d92bd9ffdf6523ea0cb8dd798520656b1e4c8bc20723657704252c6c94d7231f2d047bcf2f5115ba7e3f9df90db718b4be8b103848dfd624a56f SHA512 0e9ff0f750609178cd5fb2ebb91411287ef49e60ce1577bf263f7d7b61555d69f34e23998a36edfc7887bcb7be066e798eb4b2a7773d790047107a7f07609e15
diff --git a/app-emulation/vmware-workstation/vmware-workstation-15.5.7.17171714-r1.ebuild b/app-emulation/vmware-workstation/vmware-workstation-15.5.7.17171714-r1.ebuild
deleted file mode 100644
index 3e5a2ee..0000000
--- a/app-emulation/vmware-workstation/vmware-workstation-15.5.7.17171714-r1.ebuild
+++ /dev/null
@@ -1,550 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-inherit eutils readme.gentoo-r1 gnome2-utils pam python-any-r1 systemd xdg-utils
-
-MY_PN="VMware-Workstation-Full"
-MY_PV=$(ver_cut 1-3)
-PV_MODULES="${MY_PV}"
-PV_BUILD=$(ver_cut 4)
-MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}"
-VMWARE_FUSION_VER="11.5.7/17130923" # https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/
-SYSTEMD_UNITS_TAG="gentoo-02"
-UNLOCKER_VERSION="3.0.3"
-
-DESCRIPTION="Emulate a complete PC without the performance overhead of most emulators"
-HOMEPAGE="http://www.vmware.com/products/workstation/"
-SRC_URI="
-	https://download3.vmware.com/software/wkst/file/${MY_P}.x86_64.bundle
-	macos-guests? (
-		https://github.com/paolo-projects/unlocker/archive/${UNLOCKER_VERSION}.tar.gz -> unlocker-${UNLOCKER_VERSION}.tar.gz
-		vmware-tools-darwinPre15? ( https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/${VMWARE_FUSION_VER}/core/com.vmware.fusion.zip.tar -> com.vmware.fusion-${PV}.zip.tar )
-		vmware-tools-darwin? ( https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/${VMWARE_FUSION_VER}/core/com.vmware.fusion.zip.tar -> com.vmware.fusion-${PV}.zip.tar )
-	)
-	systemd? ( https://github.com/akhuettel/systemd-vmware/archive/${SYSTEMD_UNITS_TAG}.tar.gz -> vmware-systemd-${SYSTEMD_UNITS_TAG}.tgz )
-	"
-
-LICENSE="GPL-2 GPL-3 MIT-with-advertising vmware"
-SLOT="0"
-KEYWORDS="~amd64"
-# the kernel modules are optional because they're not needed to connect to VMs
-# running on remote systems - https://bugs.gentoo.org/604426
-IUSE="cups doc macos-guests +modules ovftool systemd vix"
-DARWIN_GUESTS="darwin darwinPre15"
-IUSE_VMWARE_GUESTS="${DARWIN_GUESTS} linux linuxPreGlibc25 netware solaris windows winPre2k winPreVista"
-for guest in ${IUSE_VMWARE_GUESTS}; do
-	IUSE+=" vmware-tools-${guest}"
-done
-REQUIRED_USE="
-	vmware-tools-darwin? ( macos-guests )
-	vmware-tools-darwinPre15? ( macos-guests )
-"
-RESTRICT="mirror preserve-libs strip"
-
-# vmware should not use virtual/libc as this is a
-# precompiled binary package thats linked to glibc.
-RDEPEND="
-	app-arch/bzip2
-	app-arch/unzip
-	app-shells/bash
-	dev-db/sqlite:3
-	dev-libs/dbus-glib
-	dev-libs/gmp:0
-	dev-libs/icu
-	dev-libs/json-c
-	dev-libs/nettle:0
-	gnome-base/dconf
-	gnome-base/gconf
-	gnome-base/libgnome-keyring
-	media-gfx/graphite2
-	media-libs/alsa-lib
-	media-libs/libart_lgpl
-	media-libs/libvorbis
-	media-libs/mesa
-	media-plugins/alsa-plugins[speex]
-	net-dns/libidn
-	net-libs/gnutls
-	cups? ( net-print/cups )
-	sys-apps/tcp-wrappers
-	sys-apps/util-linux
-	x11-libs/libXxf86vm
-	x11-libs/libdrm
-	x11-libs/libxshmfence
-	x11-libs/startup-notification
-	x11-libs/xcb-util
-	x11-themes/hicolor-icon-theme
-	!app-emulation/vmware-player
-	!app-emulation/vmware-tools
-"
-DEPEND="
-	${PYTHON_DEPS}
-	>=dev-util/patchelf-0.9
-	modules? ( ~app-emulation/vmware-modules-${PV_MODULES} )
-	ovftool? ( app-admin/chrpath )
-"
-
-S=${WORKDIR}/extracted
-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"
-# adding "opt/vmware/lib/vmware/lib/libvmware-gksu.so/libvmware-gksu.so" to QA_WX_LOAD doesn't work
-
-src_unpack() {
-	if has usersandbox ${FEATURES}; then
-		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
-			"If unpacking fails, try emerging with 'FEATURES=-usersandbox'!"
-	fi
-
-	for a in ${A}; do
-		if [ ${a##*.} == 'bundle' ]; then
-			cp "${DISTDIR}/${a}" "${WORKDIR}"
-		else
-			unpack ${a}
-		fi
-	done
-
-	export LC_ALL=C # https://communities.vmware.com/thread/618570?start=15&tstart=0
-	local bundle="${MY_P}.x86_64.bundle"
-	chmod 755 "${bundle}"
-	# this needs a /tmp mounted without "noexec" because it extracts and executes scripts in there
-	./${bundle} --console --required --eulas-agreed --extract=extracted || die "unable to extract bundle"
-
-	if ! use vix; then
-		rm -r extracted/vmware-vix-core extracted/vmware-vix-lib-Workstation* || die "unable to remove dir"
-	fi
-
-	if use vmware-tools-darwinPre15 || use vmware-tools-darwin; then
-		unzip -q com.vmware.fusion.zip || die
-		for guest in ${DARWIN_GUESTS}; do
-			if use vmware-tools-${guest}; then
-				mkdir extracted/vmware-tools-${guest}
-				mv "payload/VMware Fusion.app/Contents/Library/isoimages/${guest}.iso" extracted/vmware-tools-${guest}/ || die
-			fi
-		done
-		rm -rf __MACOSX payload manifest.plist preflight postflight com.vmware.fusion.zip
-	fi
-}
-
-src_prepare() {
-	default
-
-	rm -f */bin/vmware-modconfig
-	rm -rf */lib/modules/binary
-	# Bug 459566
-	mkdir vmware-network-editor/lib/lib
-	mv vmware-network-editor/lib/libvmware-netcfg.so vmware-network-editor/lib/lib/
-
-	rm -f vmware-workstation-server/bin/{openssl,configure-hostd.sh}
-
-	if use ovftool; then
-		chrpath -d vmware-ovftool/libcurl.so.4
-	fi
-
-	if use macos-guests; then
-		sed -i -e "s#vmx_path = '/usr#vmx_path = '${ED}${VM_INSTALL_DIR//\//\\/}#" \
-			-e "s#os\.path\.isfile('/usr#os.path.isfile('${ED}${VM_INSTALL_DIR//\//\\/}#" \
-			-e "s#vmwarebase = '/usr#vmwarebase = '${ED}${VM_INSTALL_DIR//\//\\/}#" \
-			"${WORKDIR}"/unlocker-*/unlocker.py
-	fi
-
-	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."
-}
-
-src_install() {
-	local major_minor=$(ver_cut 1-2 "${PV}")
-	local vmware_installer_version=$(cat "${S}/vmware-installer/manifest.xml" | grep -oPm1 "(?<=<version>)[^<]+")
-
-	# 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/*
-	dosbin */sbin/*
-	rm "${ED}${VM_INSTALL_DIR}"/bin/configure-initscript.sh
-	mv "${ED}${VM_INSTALL_DIR}"/sbin/vmware-authdlauncher "${ED}${VM_INSTALL_DIR}"/sbin/vmware-authdlauncher.bin
-	cat > "${ED}${VM_INSTALL_DIR}"/sbin/vmware-authdlauncher <<-EOF
-		#!/usr/bin/env bash
-		export LD_LIBRARY_PATH="/opt/vmware/lib/vmware/lib/libssl.so.1.0.2:/opt/vmware/lib/vmware/lib/libcrypto.so.1.0.2"
-		"${VM_INSTALL_DIR}"/sbin/vmware-authdlauncher.bin "\$@"
-	EOF
-	chmod 755 "${ED}${VM_INSTALL_DIR}"/sbin/vmware-authdlauncher
-
-	# install the libraries
-	insinto "${VM_INSTALL_DIR}"/lib/vmware
-	doins -r */lib/* vmware-vmx/roms
-	rm -rf "${ED}${VM_INSTALL_DIR}"/lib/vmware/*.so
-
-	# install the installer
-	insinto "${VM_INSTALL_DIR}"/lib/vmware-installer/${vmware_installer_version}
-	doins -r vmware-installer/{cdsHelper,vmis,vmis-launcher,vmware-cds-helper,vmware-installer,vmware-installer.py}
-	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware-installer/${vmware_installer_version}/{vmis-launcher,cdsHelper,vmware-installer}
-	dosym "${VM_INSTALL_DIR}"/lib/vmware-installer/${vmware_installer_version}/vmware-installer "${VM_INSTALL_DIR}"/bin/vmware-installer
-	insinto /etc/vmware-installer
-	doins vmware-installer/bootstrap
-	sed -i \
-		-e "s/@@VERSION@@/${vmware_installer_version}/" \
-		-e "s,@@VMWARE_INSTALLER@@,${VM_INSTALL_DIR}/lib/vmware-installer/${vmware_installer_version}," \
-		"${ED}/etc/vmware-installer/bootstrap"
-
-	# 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
-
-	# Hardcoded EULA path. We need to disable the default compression.
-	insinto /usr/share/doc/vmware-workstation
-	doins vmware-workstation/doc/EULA
-	docompress -x /usr/share/doc/vmware-workstation
-	# always needed
-	insinto /usr/lib/vmware-ovftool
-	doins vmware-ovftool/vmware.eula
-
-	if use doc; then
-		dodoc -r */doc/*
-	fi
-
-	exeinto "${VM_INSTALL_DIR}"/lib/vmware/setup
-	doexe */vmware-config
-
-	# pam
-	pamd_mimic_system vmware-authd auth account
-
-	# fuse
-	insinto /etc/modprobe.d
-	newins vmware-vmx/etc/modprobe.d/modprobe-vmware-fuse.conf vmware-fuse.conf
-
-	# install vmware workstation server
-	cd "${S}"/vmware-workstation-server
-
-	# 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/bin/${tool}" \\
-				"\$@"
-		EOF
-		dobin "${T}/${tool}"
-	done
-
-	insinto "${VM_INSTALL_DIR}"/lib/vmware
-	doins -r hostd
-
-	# create the configuration
-	insinto /etc/vmware
-	doins -r config/etc/vmware/*
-	doins -r etc/vmware/*
-
-	# create directory for shared virtual machines.
-	keepdir "${VM_DATA_STORE_DIR}"
-	keepdir /var/log/vmware
-
-	cd - >/dev/null
-
-	# install vmware-vix
-	if use vix; then
-		# install the binary
-		into "${VM_INSTALL_DIR}"
-		dobin "$S"/vmware-vix-*/bin/*
-
-		# install the libraries
-		insinto "${VM_INSTALL_DIR}"/lib/vmware-vix
-		doins -r "$S"/vmware-vix-*/lib/*
-
-		dosym vmware-vix/libvixAllProducts.so "${VM_INSTALL_DIR}"/lib/libbvixAllProducts.so
-
-		# install headers
-		insinto /usr/include/vmware-vix
-		doins "$S"/vmware-vix-*/include/*
-
-		if use doc; then
-			dodoc -r "$S"/vmware-vix-*/doc/*
-		fi
-	fi
-
-	# install ovftool
-	if use ovftool; then
-		cd "${S}"/vmware-ovftool
-
-		insinto "${VM_INSTALL_DIR}"/lib/vmware-ovftool
-		doins -r *
-
-		chmod 0755 "${ED}${VM_INSTALL_DIR}"/lib/vmware-ovftool/{ovftool,ovftool.bin}
-		sed -i 's/readlink/readlink -f/' "${ED}${VM_INSTALL_DIR}"/lib/vmware-ovftool/ovftool
-		dosym ../lib/vmware-ovftool/ovftool "${VM_INSTALL_DIR}"/bin/ovftool
-
-		cd - >/dev/null
-	fi
-
-	# create symlinks for the various tools
-	local tool;
-	for tool in thnuclnt vmware vmplayer{,-daemon} licenseTool vmamqpd \
-			vmware-{app-control,enter-serial,gksu,fuseUI,hostd,modconfig{,-console},netcfg,setup-helper,tray,unity-helper,vim-cmd,vmblock-fuse,vprobe,wssc-adminTool,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/bin/vmware-fuseUI "${VM_INSTALL_DIR}"/bin/vmware-fuseUI
-	dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-netcfg "${VM_INSTALL_DIR}"/bin/vmware-netcfg
-	dosym "${VM_INSTALL_DIR}"/lib/vmware/icu /etc/vmware/icu
-
-	# fix permissions
-	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,mkisofs,vmware-remotemks}
-	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/setup/vmware-config
-	fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats}
-	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/libvmware-gksu.so/gksu-run-helper
-	fperms 4711 "${VM_INSTALL_DIR}"/sbin/vmware-authd
-	fperms 0755 "${VM_INSTALL_DIR}"/bin/{vmware-hostd,wssc-adminTool}
-	fperms 1777 "${VM_DATA_STORE_DIR}"
-	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:${VM_INSTALL_DIR}/sbin'
-		ROOTPATH='${VM_INSTALL_DIR}/bin'
-		CONFIG_PROTECT_MASK='/etc/vmware-installer'
-		VMWARE_USE_SHIPPED_LIBS=1
-	EOF
-
-	doenvd "${envd}"
-
-	# create the configuration
-	dodir /etc/vmware
-
-	cat > "${ED}"/etc/vmware/bootstrap <<-EOF
-		BINDIR='${VM_INSTALL_DIR}/bin'
-		LIBDIR='${VM_INSTALL_DIR}/lib'
-	EOF
-
-	cat > "${ED}"/etc/vmware/config <<-EOF
-		.encoding = "UTF-8"
-		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 = "no"
-		VMBLOCK_CONFED = "no"
-		VSOCK_CONFED = "no"
-		NETWORKING = "yes"
-		player.product.version = "${MY_PV}"
-		product.buildNumber = "${PV_BUILD}"
-		product.version = "${MY_PV}"
-		product.name = "VMware Workstation"
-		workstation.product.version = "${MY_PV}"
-		vmware.fullpath = "${VM_INSTALL_DIR}/bin/vmware"
-		installerDefaults.componentDownloadEnabled = "no"
-		installerDefaults.autoSoftwareUpdateEnabled.epoch = "4641104763"
-		installerDefaults.dataCollectionEnabled.epoch = "7910652514"
-		installerDefaults.dataCollectionEnabled = "no"
-		installerDefaults.transferVersion = "1"
-		installerDefaults.autoSoftwareUpdateEnabled = "no"
-		acceptEULA = "yes"
-		acceptOVFEULA = "yes"
-	EOF
-
-	if use vix; then
-		cat >> "${ED}"/etc/vmware/config <<-EOF
-			vix.libdir = "${VM_INSTALL_DIR}/lib/vmware-vix"
-			vix.config.version = "1"
-		EOF
-	fi
-
-	cat >> "${ED}"/etc/vmware/config <<-EOF
-		authd.client.port = "902"
-		authd.proxy.nfc = "vmware-hostd:ha-nfc"
-		authd.soapserver = "TRUE"
-	EOF
-
-	if use modules; then
-		# 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
-	fi
-
-	# 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
-
-	# fill in variable placeholders
-	sed -e "s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g" \
-		-i "${ED}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/gtk-3.0/gdk-pixbuf.loaders || die
-	sed -e "s:@@BINARY@@:${EPREFIX}${VM_INSTALL_DIR}/bin/vmplayer:g" \
-		-e "/^Encoding/d" \
-		-i "${ED}/usr/share/applications/vmware-player.desktop" || die
-	sed -e "s:@@BINARY@@:${EPREFIX}${VM_INSTALL_DIR}/bin/vmware:g" \
-		-e "/^Encoding/d" \
-		-i "${ED}/usr/share/applications/vmware-workstation.desktop" || die
-	sed -e "s:@@BINARY@@:${EPREFIX}${VM_INSTALL_DIR}/bin/vmware-netcfg:g" \
-		-e "/^Encoding/d" \
-		-i "${ED}/usr/share/applications/vmware-netcfg.desktop" || die
-
-	# Configuration for vmware-workstation-server
-	local hostdUser="${VM_HOSTD_USER:-root}"
-	sed -e "/ACEDataUser/s:root:${hostdUser}:g" \
-		-i "${ED}/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 "${ED}/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 "${ED}/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_HOSTSPECSVC}##: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}##:false:g" \
-		-e "s:##{USE_STATSSVC_MOCKUP}##:false:g" \
-		-e "s:##{USE_VCSVC_MOCKUP}##:false:g" \
-		-e "s:##{USE_VSLMSVC}##:false:g" \
-		-e "s:##{USE_VSLMSVC_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 "${ED}/etc/vmware/hostd/config.xml" || die
-
-	sed -e "s:##{ENV_LOCATION}##:/etc/vmware/hostd/env/:g" \
-		-i "${ED}/etc/vmware/hostd/environments.xml" || die
-
-	# @@VICLIENT_URL@@=XXX
-	sed -e "s:@@AUTHD_PORT@@:902:g" \
-		-i "${ED}${VM_INSTALL_DIR}/lib/vmware/hostd/docroot/client/clients.xml" || die
-
-	# install systemd unit files
-	if use systemd; then
-		systemd_dounit "${WORKDIR}/systemd-vmware-${SYSTEMD_UNITS_TAG}/"*.{service,target}
-	fi
-
-	# enable macOS guests support
-	if use macos-guests; then
-		python3 "${WORKDIR}"/unlocker-*/unlocker.py >/dev/null || die "unlocker.py failed"
-	fi
-
-	# VMware tools
-	for guest in ${IUSE_VMWARE_GUESTS}; do
-		if use vmware-tools-${guest}; then
-			local dbfile="${ED}/etc/vmware-installer/database"
-			if ! [ -e "${dbfile}" ]; then
-				> "${dbfile}"
-				sqlite3 "${dbfile}" "CREATE TABLE settings(key VARCHAR PRIMARY KEY, value VARCHAR NOT NULL, component_name VARCHAR NOT NULL);"
-				sqlite3 "${dbfile}" "INSERT INTO settings(key,value,component_name) VALUES('db.schemaVersion','2','vmware-installer');"
-				sqlite3 "${dbfile}" "CREATE TABLE components(id INTEGER PRIMARY KEY, name VARCHAR NOT NULL, version VARCHAR NOT NULL, buildNumber INTEGER NOT NULL, component_core_id INTEGER NOT NULL, longName VARCHAR NOT NULL, description VARCHAR, type INTEGER NOT NULL);"
-			fi
-			local manifest="vmware-tools-${guest}/manifest.xml"
-			if [ -e "${manifest}" ]; then
-				local version="$(grep -oPm1 '(?<=<version>)[^<]+' ${manifest})"
-				sqlite3 "${dbfile}" "INSERT INTO components(name,version,buildNumber,component_core_id,longName,description,type) VALUES(\"vmware-tools-$guest\",\"$version\",\"${PV_BUILD}\",1,\"$guest\",\"$guest\",1);"
-			else
-				sqlite3 "${dbfile}" "INSERT INTO components(name,version,buildNumber,component_core_id,longName,description,type) VALUES(\"vmware-tools-$guest\",\"${VMWARE_FUSION_VER%/*}\",\"${VMWARE_FUSION_VER#*/}\",1,\"$guest\",\"$guest\",1);"
-			fi
-			insinto "${VM_INSTALL_DIR}/lib/vmware/isoimages"
-			doins vmware-tools-${guest}/${guest}.iso
-		fi
-	done
-
-	readme.gentoo_create_doc
-}
-
-pkg_config() {
-	"${VM_INSTALL_DIR}"/bin/vmware-networks --postinstall ${PN},old,new
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-	elog "${DOC_CONTENTS}"
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/app-emulation/vmware-workstation/vmware-workstation-16.1.1.17801498-r1.ebuild b/app-emulation/vmware-workstation/vmware-workstation-16.1.2.17966106.ebuild
index 22757a2..027d9f9 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-16.1.1.17801498-r1.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-16.1.2.17966106.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{7..9} )
 inherit eutils readme.gentoo-r1 gnome2-utils pam python-any-r1 systemd xdg-utils
 
 MY_PN="VMware-Workstation-Full"
@@ -11,7 +11,7 @@ MY_PV=$(ver_cut 1-3)
 PV_MODULES="${MY_PV}"
 PV_BUILD=$(ver_cut 4)
 MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}"
-VMWARE_FUSION_VER="12.1.1/17801503" # https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/
+VMWARE_FUSION_VER="12.1.2/17964953" # https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/
 SYSTEMD_UNITS_TAG="gentoo-02"
 UNLOCKER_VERSION="3.0.3"