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

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

8 files changed, 9 insertions, 1028 deletions

diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest
index b162bf3..3b607e1 100644
--- a/app-emulation/vmware-modules/Manifest
+++ b/app-emulation/vmware-modules/Manifest
@@ -13,6 +13,6 @@ AUX 4.10-00-vmnet-use-standard-definition-of-PCI_VENDOR_ID_VMWAR.patch 1131 BLAK
 AUX 4.12-00-vmmon-use-standard-definition-of-MSR_MISC_FEATURES_E.patch 1603 BLAKE2B 4eea61a743cb443e4a4c22a02a03410adbae66339ac7ed1c1aafe54e447135c1ed976ce3c97f22db9984926de9b9a09b1820e253978f457c0c2b9d22f8e4c59b SHA512 4413cd5e791dd19c4b47ba2178e386160912882b0e1a549151eafcceae484b5e48f527ee45b14584c98e06c11e28ee5bfef34b318e46b45704fbcf93a7b52b56
 AUX 4.13-00-vmmon-use-standard-definition-of-CR3_PCID_MASK-if-av.patch 1167 BLAKE2B b5c1c4d98d2aed5bb473270ea9b5737da05bab45748aa84b0a83c26abf8d826960ff3251132ae2770bf87168bfb9c01ab7c81ec99036af576ca3fa0eb08b36e2 SHA512 1cf13f9c745bcfcf24ac1e8f762d057f1afde46ec1de4e651a07e63e08d9073eca9bdbaa53c5a1ced556ec83da3bfd80d3c65c979fb91566cf3c7ddae38eaeac
 AUX 4.16-00-vmmon-use-standard-definition-of-MSR_K7_HWCR_SMMLOCK.patch 1097 BLAKE2B edf94d85be2caa69ca8b7856e636dd1fc41d60b43e56e08e913b9decca7f1f3a2a39d98681366a4c2f948a60acdce513f873b1c080d7329720abd0f235ee739a SHA512 f2e359183999f0396406724a8e0a80ceb3551772958a8a1e31eec0af8a746191bf5c7b7a5282d0f59d5a7cdd14744e1b775ad5af45bc5ee030434bcbb686d50c
-EBUILD vmware-modules-331.1.7.ebuild 3822 BLAKE2B 05a49087d81b84c5886e2bed6b0caa4af68d9b889db33e12be7bfae1f31aa824fdee80fc414186f5cfc7f0bde793f83b921f3477bba1e96cace22425b3069b1e SHA512 b35f653d74b66ec7c68f0bead761cc947641a5ececb78e3c0fe43e3472a5ce4254cd8192df343c274daaed8f725164fbd8880fdf483a39e906a2be61ccfc122d
-EBUILD vmware-modules-361.1.0.ebuild 3671 BLAKE2B bd724fb68aa7a47b9a3192be069b2c684cc87942e9aaef9b032c03fa459c391407c3f549237da718ce08848c000c4a6c9db84f14150f592ed3a70fac67e96be2 SHA512 59212c11de0915c437909f725872842248e8d7bc4aa01c4530ba76156fb0e32a3220126f45f86764261aecca9fbf7081c8f45690506e7cf9e53405fa6eab7ead
+DIST vmware-modules-15.1.0.zip 582538 BLAKE2B 1d4fddd10884b3462fbbc618697f089c2c8eed2ce99d46467344b581ef3be324c3823c20d537098866629a574ffcb528cc993de53e4daefbef339c93822e64f3 SHA512 8beb20e3d8aa583cf0bc1a47d76ea1d4cc14267ef0772b131e11fc5bfec455665b85f6b18ea21e040df680fc70a4bd06df00db4827fde9033d2f037b1c963003
+EBUILD vmware-modules-15.1.0.ebuild 2430 BLAKE2B 4ea49c6b0016dff442dc9dd72efca38784b0f60ad272342c54fbbcdd0d37359dde7976c489edf50ea8b23086224f34cc6f5e82a2938312e8356d34f9b9af5daf SHA512 ebfaf209ccae8f5832eb2eb7458d57a3f4d4f32b9d2a9b30a92166d9d6dee4608ecad6413b747a9642dadcc55668402a4b2ee2fad7ab51972c3264b8a84b8259
 MISC metadata.xml 322 BLAKE2B 178d5a7e0f6a26281fdeb655994b728e1b2e831a9bd7e07d6ed7c5ad2edb04d30bb8543ee5a1440f06e3a9eb1af20810a3e93800291f5feda877a644aacad14a SHA512 8ed1935f376c38b57fdcd973dab5a8dd714b2fbb74108228f3aab19cec95340c93f6ecff03b10fcafd261896efa711f47ef8c301f35fa0fc4490a4fb45f2fd55
diff --git a/app-emulation/vmware-modules/vmware-modules-361.1.0.ebuild b/app-emulation/vmware-modules/vmware-modules-15.1.0.ebuild
index 8d2a99e..5e61b09 100644
--- a/app-emulation/vmware-modules/vmware-modules-361.1.0.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-15.1.0.ebuild
@@ -8,7 +8,8 @@ inherit eapi7-ver eutils flag-o-matic linux-info linux-mod user udev
 DESCRIPTION="VMware kernel modules"
 HOMEPAGE="http://www.vmware.com/"
 
-SRC_URI=""
+MY_KERNEL_VERSION="5.3"
+SRC_URI="https://github.com/mkubecek/vmware-host-modules/archive/w${PV}-k${MY_KERNEL_VERSION}.zip -> ${P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -16,11 +17,9 @@ KEYWORDS="~amd64"
 IUSE=""
 
 RDEPEND=""
-DEPEND="
-	=app-emulation/vmware-workstation-15.$(ver_cut 2-3)*
-"
+DEPEND=""
 
-S=${WORKDIR}
+S="${WORKDIR}/vmware-host-modules-w${PV}-k${MY_KERNEL_VERSION}"
 
 pkg_setup() {
 	CONFIG_CHECK="~HIGH_RES_TIMERS"
@@ -50,29 +49,7 @@ pkg_setup() {
 	done
 }
 
-src_unpack() {
-	cd "${S}"
-	for mod in ${VMWARE_MODULE_LIST}; do
-		tar -xf /opt/vmware/lib/vmware/modules/source/${mod}.tar
-	done
-}
-
 src_prepare() {
-	# from https://github.com/mkubecek/vmware-host-modules/tree/workstation-15.0.4
-	kernel_is ge 4 9 0 && epatch "${FILESDIR}/4.09-00-vmnet-use-standard-definition-of-PCI_VENDOR_ID_VMWAR.patch"
-	kernel_is ge 4 10 0 && epatch "${FILESDIR}/4.10-00-vmnet-use-standard-definition-of-PCI_VENDOR_ID_VMWAR.patch"
-	kernel_is ge 4 12 0 && epatch "${FILESDIR}/4.12-00-vmmon-use-standard-definition-of-MSR_MISC_FEATURES_E.patch"
-	kernel_is ge 4 13 0 && epatch "${FILESDIR}/4.13-00-vmmon-use-standard-definition-of-CR3_PCID_MASK-if-av.patch"
-	epatch "${FILESDIR}/00-vmmon-quick-workaround-for-objtool-warnings.patch"
-	kernel_is ge 4 16 0 && epatch "${FILESDIR}/4.16-00-vmmon-use-standard-definition-of-MSR_K7_HWCR_SMMLOCK.patch"
-	epatch "${FILESDIR}/01-vmmon-fix-always_inline-attribute-usage.patch"
-	epatch "${FILESDIR}/02-vmmon-fix-indirect-call-with-retpoline-build.patch"
-	epatch "${FILESDIR}/03-vmmon-check-presence-of-file_operations-poll.patch"
-	epatch "${FILESDIR}/04-modules-replace-SUBDIRS-with-M.patch"
-	epatch "${FILESDIR}/06-vmmon-bring-back-the-do_gettimeofday-helper.patch"
-	epatch "${FILESDIR}/08-vmmon-use-KERNEL_DS-rather-than-get_ds.patch"
-	epatch "${FILESDIR}/09-vmmon-fix-return-type-of-vm_operations_struct-fault-.patch"
-
 	# 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%" */Makefile || die "sed failed"
 
diff --git a/app-emulation/vmware-modules/vmware-modules-331.1.7.ebuild b/app-emulation/vmware-modules/vmware-modules-331.1.7.ebuild
deleted file mode 100644
index 22b5146..0000000
--- a/app-emulation/vmware-modules/vmware-modules-331.1.7.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eapi7-ver eutils flag-o-matic linux-info linux-mod user udev
-
-DESCRIPTION="VMware kernel modules"
-HOMEPAGE="http://www.vmware.com/"
-
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
-	=app-emulation/vmware-workstation-14.$(ver_cut 2-3)*
-"
-
-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
-	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_unpack() {
-	cd "${S}"
-	for mod in ${VMWARE_MODULE_LIST}; do
-		tar -xf /opt/vmware/lib/vmware/modules/source/${mod}.tar
-	done
-}
-
-src_prepare() {
-	# from https://github.com/mkubecek/vmware-host-modules/tree/workstation-14.1.5
-	kernel_is ge 4 9 0 && epatch "${FILESDIR}/4.09-00-vmnet-use-standard-definition-of-PCI_VENDOR_ID_VMWAR.patch"
-	kernel_is ge 4 10 0 && epatch "${FILESDIR}/4.10-00-vmnet-use-standard-definition-of-PCI_VENDOR_ID_VMWAR.patch"
-	kernel_is ge 4 12 0 && epatch "${FILESDIR}/4.12-00-vmmon-use-standard-definition-of-MSR_MISC_FEATURES_E.patch"
-	kernel_is ge 4 13 0 && epatch "${FILESDIR}/4.13-00-vmmon-use-standard-definition-of-CR3_PCID_MASK-if-av.patch"
-	epatch "${FILESDIR}/00-vmmon-quick-workaround-for-objtool-warnings.patch"
-	kernel_is ge 4 16 0 && epatch "${FILESDIR}/4.16-00-vmmon-use-standard-definition-of-MSR_K7_HWCR_SMMLOCK.patch"
-	epatch "${FILESDIR}/01-vmmon-fix-always_inline-attribute-usage.patch"
-	epatch "${FILESDIR}/02-vmmon-fix-indirect-call-with-retpoline-build.patch"
-	epatch "${FILESDIR}/03-vmmon-check-presence-of-file_operations-poll.patch"
-	epatch "${FILESDIR}/04-modules-replace-SUBDIRS-with-M.patch"
-	epatch "${FILESDIR}/05-vmmon-totalram_pages-is-a-function-since-5.0.patch"
-	epatch "${FILESDIR}/06-vmmon-bring-back-the-do_gettimeofday-helper.patch"
-	epatch "${FILESDIR}/07-modules-handle-access_ok-with-two-arguments.patch"
-	epatch "${FILESDIR}/08-vmmon-use-KERNEL_DS-rather-than-get_ds.patch"
-	epatch "${FILESDIR}/09-vmmon-fix-return-type-of-vm_operations_struct-fault-.patch"
-
-	# 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%" */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-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
index 16407c3..3568073 100644
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@@ -1,16 +1,10 @@
 AUX configure-hostd.sh 372 BLAKE2B 0ed2d479a46d69ff8498bfac180f0440fb57fb173fc1a427115872a40a47559725623399652e9663fa8a4ca0d7e020d5445bafb6c37f45449dea341fc9f6cce6 SHA512 87c84f5e51e8b4585a9a55f13771cd8b84f2e4e0bb33679e3a1b23eb84a5be5d523a57b6c770095c1d21712a98e9317bbd215ab027843b0586b35ecf9fb85b49
-AUX vmware-14.1.rc 2476 BLAKE2B dff25b43c5fa57186be2a5f0ca4606d26cd1c3f3dbeb91d855fc07a9fd576f446983c852c8e0b112c5616bb95dfddc7e2c738b4d0ca341c781d7addcb45068cd SHA512 9bae224387128b2cd221d509e2933042e3925fb041670907d8a47c70a488214206912fe25ab24c0bdeb31591149e62aba374d3fa63fdd08644e09667e195967f
 AUX vmware-15.1.rc 2476 BLAKE2B dff25b43c5fa57186be2a5f0ca4606d26cd1c3f3dbeb91d855fc07a9fd576f446983c852c8e0b112c5616bb95dfddc7e2c738b4d0ca341c781d7addcb45068cd SHA512 9bae224387128b2cd221d509e2933042e3925fb041670907d8a47c70a488214206912fe25ab24c0bdeb31591149e62aba374d3fa63fdd08644e09667e195967f
-AUX vmware-server-14.1.rc 1506 BLAKE2B 886ed1de7a99320611a28a43b48cf17715fcab8bf533a73c28a1aa2f8d150ee2b84e1e510e864b18347f3bd7e43faec3cfc90f09d5ac9c0afe821f67654a68c4 SHA512 548ff69f87bee2b6c82bd931d22dd560370c4a00641ae47d05af05bbc72cedc8fd25054abc405a590b72227b10c5997d79f16ded67f3e0cfac142eb248b47d44
 AUX vmware-server-15.1.rc 1506 BLAKE2B 886ed1de7a99320611a28a43b48cf17715fcab8bf533a73c28a1aa2f8d150ee2b84e1e510e864b18347f3bd7e43faec3cfc90f09d5ac9c0afe821f67654a68c4 SHA512 548ff69f87bee2b6c82bd931d22dd560370c4a00641ae47d05af05bbc72cedc8fd25054abc405a590b72227b10c5997d79f16ded67f3e0cfac142eb248b47d44
-DIST VMware-Workstation-Full-14.1.7-12989993.x86_64.bundle 461115120 BLAKE2B 0ed81b5c84319fddd9c8091c0d9ee5468cfb59abfa89acf11401b785dd7f478861a9d85c74d8aaa27ee8c31640a9dc5a5c801b2a4e6e51318bfa888bf9938d0d SHA512 b3d96bb64f9a27a2f560277172cf9e42f8953b92345ee698c6cad383db9571a1b0b383b758ca027ade0eca0f620be697333b1964c1ee190916d6bc1eac818b23
 DIST VMware-Workstation-Full-15.1.0-13591040.x86_64.bundle 495325913 BLAKE2B 2624bfbf85c8b6b3267d8aaad90004ea9c8948faae29d2eb95f680b62c6d56b7f8214facdffbdd1f3e69376e0a518bc54bf24eb87779eb9369779a6a41cd13d1 SHA512 84a5111141912f31ddd1e3480d8953f30681e2e2aa165115a416921394ef00e48af129337fd25e182aeba20d5cfe8f8b6c6e9908282bc930f1ce09613847e685
-DIST com.vmware.fusion.tools.darwin-14.1.7.12989993.zip.tar 2805760 BLAKE2B 7746ba82081ecb291fec168b4f2db59b4cb44dca596a9eaea13223b25584260dd4cc57dc22763e0cee9a3df2832fdac788644e443b29058aea2bcf3d2d6bbee3 SHA512 e06c5d8daa6dd64eef49c050bdcc7a29b0458dcca0f2e95c4cec889b280a80547b5c3af0afa14592684123088a5b11f4859a178754ab266e7ed7cb8d630fe2b0
 DIST com.vmware.fusion.tools.darwin-15.1.0.13591040.zip.tar 2826240 BLAKE2B 648e1ad94d89000f27f8abb61c7251c2d1c53ec76bf13bc54688b4353ea1295ae39861a372a981899c4faed78e17b8f6c15fbff6bbe90b5061783f5f1b2ea4e3 SHA512 479569c70d9c0dea6a04b6d832f4419ae042128b18e7d9f7f7a037a5d32d3eb93fdc87aa7ace8669f5377b8ad65cc1ffd5c81e6b60d38e270c437bd55b724054
-DIST com.vmware.fusion.tools.darwinPre15-14.1.7.12989993.zip.tar 2478080 BLAKE2B 75f81d449ca3c575e2740e092bb8904bc29842014635f13abf1adf6c0d9e57c3c92710ae51b8aad1d5d91f72c57769adfb4c47547ce968cc98425f4ac5853614 SHA512 170383431cfdced25c4adfd0d2df4aa52f0df20c99d38c361820641c95c676edc7eeddcadf030a2ea34614d3785d7b9e0acbbd63a0b681a57c7f2ff2042b9bcd
 DIST com.vmware.fusion.tools.darwinPre15-15.1.0.13591040.zip.tar 2478080 BLAKE2B 0aa99f074ccf1959d965320210f394b33b1ee7f10877656d5d8985c124890fe5833c03133d9c4b9d8742a1f71e375b375d6dd5722598a5f5eaba74a1591e992f SHA512 76bd675f4880e6267d3dff1fa53a00f8e98cd4806c12aa595d5e13d87b56c5a74cb18cda0a4afc3842e9d1d92f16aa70543d1c012065308a6c96d7e709f16835
 DIST unlocker-3.0.2.tar.gz 15984801 BLAKE2B e157ed24ad6cea1ab16dd5fc11935b7cdbb3fb0a1e0a9c059eb100f0c57508b749884111b93a9f272ad2c5a9ecd4fadb177ccac47d7688665c5fa8f100fcd2b1 SHA512 83a390562761791531574c05d2a5caacd936b45b32f26a1e5ba953ce32e27af29cb3ac0984c552c2eb9cfdf033d4b95fae1c33a70f2b169563d74d1ea188dacf
 DIST vmware-systemd-gentoo-02.tgz 14064 BLAKE2B 24ac2c2f295130f4aadad867ec88d652bd292cc60e6b471bb2e01069fe01d84dac3d8b0ca7690ebf218d663adfe0c1dc889d3f4f53cf3178b68291461260748b SHA512 3a382bfd5f1eb2b218d8012588ea55c1f22786dba35a1fc0fdfdb4e40b05e0e735ed09c6961684f6442e863c3ed72024ce01f19113bbd9ca47c32e3f43c55f42
-EBUILD vmware-workstation-14.1.7.12989993-r6.ebuild 21727 BLAKE2B 26e718024c1e99e001c1f3774f222f3745dadf5590bc4f349463a1935eaf3fa20f1cd26892e2489c85c082f4627665823429d1dc3afa632655f015b9143acd4b SHA512 a642693976c732b6ad2ec9d543c6919d8d343d1f8479ca123f7374fc847727c170ea1943ac03c7ec480f9f6e2f5c6ed005e13eba0a821d56a1818271961d269b
-EBUILD vmware-workstation-15.1.0.13591040-r4.ebuild 21584 BLAKE2B 1aa78c8401292898ff69ded072ace31897e47806c0fcb77cab765ffb652183edbd753da85b2c3e84fc9a28b49baed03dd2e8e7bae5f2c7d5576572ca8f20d544 SHA512 0f500e6d3b28b9fbae8cda498be020c19052cee44de1a182600be29a686c48104695d4c727dc1d057dc8f2be7a54b46aea6c3b0b9322781e03a6013b82c6dc26
+EBUILD vmware-workstation-15.1.0.13591040-r5.ebuild 21391 BLAKE2B 5be3bbd81ce373bde3869dda3127c47ee9e8cd0f6c48e2f9880bcc3b64fd25b98e03bd7983b9ab8025b5f19cfbef223839c0f68ca5b3698f8101daf6d1c3753f SHA512 fc24e323801ed37679a270cf14de75e5992cca489007223654b75c88c547424d971a4792eb4d2a3c7febeb59873f5c59a75c3a91f1666d516624425a682d89ee
 MISC metadata.xml 2031 BLAKE2B 00e17d5cc895b1d1c12263653b9824fb3340e4a8ea7bfb44f878ab7c3b59db2238d71a8b4daedd2b7307206c6aba9dbf7ab7410f845cb9a6362fda41b11c06fd SHA512 1c1ed18e2cd0c2112c2e6dfeded9a3bc9c9d554d926e411c2c49d90c36c17941996c9d0ff62a3ab6f8df8ad0cd22b6a72d1889a4017dffae8a27f974ac8a7212
diff --git a/app-emulation/vmware-workstation/files/vmware-14.1.rc b/app-emulation/vmware-workstation/files/vmware-14.1.rc
deleted file mode 100644
index b627869..0000000
--- a/app-emulation/vmware-workstation/files/vmware-14.1.rc
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need localmount
-	use net
-}
-
-start() {
-	ebegin Starting VMware USB Arbitrator
-	@@BINDIR@@/vmware-usbarbitrator
-	eend $?
-	ebegin Starting VMware services
-
-	# vmci might be:
-	# 1) built as external kernel module
-	# 2) built as internal kernel module (with name vmw_vmci)
-	# 3) embedded in the kernel
-	for mod in /lib/modules/$(uname -r)/misc/vmci.ko \
-		/lib/modules/$(uname -r)/kernel/drivers/misc/vmw_vmci/vmw_vmci.ko ;
-	do
-		if [[ -f "${mod}" ]] ; then
-			modprobe -v $(basename "${mod}" .ko)
-			eend $?
-			break
-		fi
-	done
-
-	# vsock might be:
-	# 1) built as external kernel module
-	# 2) built as internal kernel module (with name vmw_vsock_vmci_transport)
-	# 3) embedded in the kernel
-	for mod in /lib/modules/$(uname -r)/misc/vsock.ko \
-		/lib/modules/$(uname -r)/kernel/net/vmw_vsock/vmw_vsock_vmci_transport.ko ;
-	do
-		if [[ -f "${mod}" ]] ; then
-			modprobe -v $(basename "${mod}" .ko)
-			eend $?
-			break
-		fi
-	done
-
-	# vmblock
-	if [[ -f /lib/modules/$(uname -r)/misc/vmblock.ko ]]; then
-		modprobe -v vmblock
-		eend $?
-	fi
-
-	# vmci or vsock were already loaded by the previous modprobe,
-	# no need to do it here
-	# quiet for vmci because it may not be there
-	modprobe -av vmmon vmnet
-	eend $?
-	@@BINDIR@@/vmware-networks --start
-	eend $?
-}
-
-stop() {
-	ebegin Stopping VMware USB Arbitrator
-	killall --wait vmware-usbarbitrator
-	eend $?
-	@@BINDIR@@/vmware-networks --stop
-	eend $?
-	ebegin Stopping VMware services
-	modprobe -rv vmmon vmnet
-	eend $?
-
-	# vsock might be:
-	# 1) built as external kernel module
-	# 2) built as internal kernel module (with name vmw_vsock_vmci_transport)
-	# 3) embedded in the kernel
-	for mod in /lib/modules/$(uname -r)/misc/vsock.ko \
-		/lib/modules/$(uname -r)/kernel/net/vmw_vsock/vmw_vsock_vmci_transport.ko ;
-	do
-		if [[ -f "${mod}" ]] ; then
-			modprobe -rv $(basename "${mod}" .ko)
-			eend $?
-			break
-		fi
-	done
-
-	# vmci might be:
-	# 1) built as external kernel module
-	# 2) built as internal kernel module (with name vmw_vmci)
-	# 3) embedded in the kernel
-	for mod in /lib/modules/$(uname -r)/misc/vmci.ko \
-		/lib/modules/$(uname -r)/kernel/drivers/misc/vmw_vmci/vmw_vmci.ko ;
-	do
-		if [[ -f "${mod}" ]] ; then
-			modprobe -rv $(basename "${mod}" .ko)
-			eend $?
-			break
-		fi
-	done
-
-	# vmblock
-	if [[ -f /lib/modules/$(uname -r)/misc/vmblock.ko ]]; then
-		modprobe -rv vmblock
-		eend $?
-	fi
-}
diff --git a/app-emulation/vmware-workstation/files/vmware-server-14.1.rc b/app-emulation/vmware-workstation/files/vmware-server-14.1.rc
deleted file mode 100644
index 8f9b7dd..0000000
--- a/app-emulation/vmware-workstation/files/vmware-server-14.1.rc
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need localmount vmware
-	use net
-}
-
-checkconfig() {
-	checkpath -d /var/run/vmware
-
-	# Check if certificates exist.  If not, we need to generate them, ala sshd.
-	if [ ! -e @@ETCDIR@@/ssl/rui.key -o ! -e @@ETCDIR@@/ssl/rui.crt ]; then
-		checkpath -d -m 0600 @@ETCDIR@@/ssl
-		openssl req -x509 -days 365 -newkey rsa:2048 -keyout @@ETCDIR@@/ssl/rui.key -out @@ETCDIR@@/ssl/rui.crt -config @@ETCDIR@@/ssl/hostd.ssl.config
-		checkpath -f -m 0600 @@ETCDIR@@/ssl/rui.key @@ETCDIR@@/ssl/rui.crt
-	fi
-}
-
-start() {
-	checkconfig
-
-	ebegin Starting VMware Authentication Daemon
-	start-stop-daemon --start \
-		--exec @@PREFIX@@/sbin/vmware-authdlauncher
-	eend $?
-	ebegin Starting VMware Workstation Server
-	start-stop-daemon --start \
-		--pidfile /var/run/vmware/vmware-hostd.PID \
-		--exec @@BINDIR@@/vmware-hostd \
-		-- -a -d @@ETCDIR@@/hostd/config.xml
-	eend $?
-}
-
-stop() {
-	ebegin "Shutdown VMs in the AutoStart Sequence"
-	local HOHO_ADMIN="$(@@BINDIR@@/vmware-wssc-adminTool "@@ETCDIR@@/hostd/authorization.xml" 2>/dev/null)"
-
-	if [ "x" != "x${HOHO_ADMIN}" ]; then
-		@@BINDIR@@/vmware-vim-cmd -U "${HOHO_ADMIN}" hostsvc/autostartmanager/autostop
-	fi
-	eend $?
-
-	ebegin Stopping VMware Workstation Server
-	start-stop-daemon --stop \
-		--pidfile /var/run/vmware/vmware-hostd.PID
-	eend $?
-	ebegin Stopping VMware Authentication Daemon
-	killall --wait vmware-authdlauncher
-	eend $?
-}
diff --git a/app-emulation/vmware-workstation/vmware-workstation-14.1.7.12989993-r6.ebuild b/app-emulation/vmware-workstation/vmware-workstation-14.1.7.12989993-r6.ebuild
deleted file mode 100644
index d329c02..0000000
--- a/app-emulation/vmware-workstation/vmware-workstation-14.1.7.12989993-r6.ebuild
+++ /dev/null
@@ -1,713 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eapi7-ver eutils readme.gentoo-r1 gnome2-utils pam systemd xdg-utils
-
-MY_PN="VMware-Workstation-Full"
-MY_PV=$(ver_cut 1-3)
-PV_MODULES="331.$(ver_cut 2-3)"
-PV_BUILD=$(ver_cut 4)
-MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}"
-VMWARE_FUSION_VER="10.1.6/12989998" # https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/
-SYSTEMD_UNITS_TAG="gentoo-02"
-
-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/DrDonk/unlocker/archive/3.0.2.tar.gz -> unlocker-3.0.2.tar.gz
-		vmware-tools-darwinPre15? ( https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/${VMWARE_FUSION_VER}/packages/com.vmware.fusion.tools.darwinPre15.zip.tar -> com.vmware.fusion.tools.darwinPre15-${PV}.zip.tar )
-		vmware-tools-darwin? ( https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/${VMWARE_FUSION_VER}/packages/com.vmware.fusion.tools.darwin.zip.tar -> com.vmware.fusion.tools.darwin-${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=""
-IUSE="+bundled-libs cups doc macos-guests +modules ovftool server 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="
-	server? ( modules )
-	vmware-tools-darwin? ( macos-guests )
-	vmware-tools-darwinPre15? ( macos-guests )
-"
-RESTRICT="mirror preserve-libs strip"
-
-BUNDLED_LIBS_DIR=/opt/vmware/lib/vmware/lib
-
-BUNDLED_LIBS="
-	libX11.so.6
-	libXau.so.6
-	libxcb.so.1
-	libXcomposite.so.1
-	libXcursor.so.1
-	libXdamage.so.1
-	libXdmcp.so.6
-	libXext.so.6
-	libXfixes.so.3
-	libXft.so.2
-	libXinerama.so.1
-	libXi.so.6
-	libXrandr.so.2
-	libXrender.so.1
-	libXtst.so.6
-	libaio.so.1
-	libatk-1.0.so.0
-	libatk-bridge-2.0.so.0
-	libatspi.so.0
-	libcairo.so.2
-	libcairo-gobject.so.2
-	libcroco-0.6.so.3
-	libcrypto.so.1.0.2
-	libcurl.so.4
-	libdbus-1.so.3
-	libepoxy.so.0
-	libexpat.so.1
-	libffi.so.6
-	libfontconfig.so.1
-	libfreetype.so.6
-	libfuse.so.2
-	libgailutil-3.so.0
-	libgcc_s.so.1
-	libgck-1.so.0
-	libgcr-base-3.so.1
-	libgcr-ui-3.so.1
-	libgcrypt.so.20
-	libgdk-3.so.0
-	libgdk_pixbuf-2.0.so.0
-	libgio-2.0.so.0
-	libglib-2.0.so.0
-	libgmodule-2.0.so.0
-	libgobject-2.0.so.0
-	libgpg-error.so.0
-	libgthread-2.0.so.0
-	libgtk-3.so.0
-	libharfbuzz.so.0
-	libICE.so.6
-	libjpeg.so.62
-	libp11-kit.so.0
-	libpango-1.0.so.0
-	libpangocairo-1.0.so.0
-	libpangoft2-1.0.so.0
-	libpcre.so.1
-	libpcsclite.so.1
-	libpixman-1.so.0
-	libpng12.so.0
-	librsvg-2.so.2
-	libsigc-2.0.so.0
-	libSM.so.6
-	libssl.so.1.0.2
-	libstdc++.so.6
-	libtasn1.so.6
-	libtiff.so.5
-	libxml2.so.2
-	libz.so.1
-"
-
-BUNDLED_LIB_DEPENDS="
-	app-accessibility/at-spi2-atk
-	app-accessibility/at-spi2-core
-	app-crypt/gcr[gtk]
-	app-crypt/p11-kit
-	dev-cpp/gtkmm:3.0
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/libaio
-	dev-libs/libcroco
-	dev-libs/libffi
-	dev-libs/libgcrypt:0/20
-	dev-libs/libgpg-error
-	dev-libs/libpcre
-	dev-libs/libsigc++:2
-	dev-libs/libtasn1:0/6
-	dev-libs/libxml2
-	dev-libs/openssl:0
-	gnome-base/librsvg:2
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/harfbuzz:0/0.9.18
-	media-libs/libepoxy
-	media-libs/libpng:1.2
-	media-libs/tiff:0
-	net-misc/curl
-	sys-apps/dbus
-	sys-apps/pcsc-lite
-	sys-fs/fuse:0
-	sys-libs/zlib
-	virtual/jpeg-compat
-	x11-libs/cairo[glib]
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXft
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango
-	x11-libs/pixman
-"
-
-# 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/6.2
-	<gnome-base/dconf-0.30.1
-	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
-	!bundled-libs? ( ${BUNDLED_LIB_DEPENDS} )
-	!app-emulation/vmware-player
-	!app-emulation/vmware-tools
-"
-PDEPEND="
-	modules? ( ~app-emulation/vmware-modules-${PV_MODULES} )
-"
-DEPEND="
-	dev-lang/python:2.7
-	>=dev-util/patchelf-0.9
-	ovftool? ( app-admin/chrpath )
-	sys-libs/ncurses:5
-	sys-libs/readline:0
-"
-
-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() {
-	for a in ${A}; do
-		if [ ${a##*.} == 'bundle' ]; then
-			cp "${DISTDIR}/${a}" "${WORKDIR}"
-		else
-			unpack ${a}
-		fi
-	done
-
-	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 ovftool; then
-		rm -r extracted/vmware-ovftool || die "unable to remove dir"
-	fi
-
-	if ! use server; then
-		rm -r extracted/vmware-workstation-server || die "unable to remove dir"
-	fi
-
-	if ! use vix; then
-		rm -r extracted/vmware-vix-core extracted/vmware-vix-lib-Workstation* || die "unable to remove dir"
-	fi
-
-	for guest in ${DARWIN_GUESTS}; do
-		if use vmware-tools-${guest}; then
-			mkdir extracted/vmware-tools-${guest}
-			unzip -q com.vmware.fusion.tools.${guest}.zip payload/\*
-			mv payload/* extracted/vmware-tools-${guest}/
-			rm -r payload com.vmware.fusion.tools.${guest}.zip
-		fi
-	done
-}
-
-clean_bundled_libs() {
-	einfo "Removing bundled libraries"
-	for libname in ${BUNDLED_LIBS} ; do
-		rm -rf "${S}"/*/lib/lib/${libname}
-	done
-
-	rm -rf "${S}"/*/lib/libconf
-
-	# Among the bundled libs there are libcrypto.so.1.0.2 and libssl.so.1.0.2
-	# (needed by libcds.so) which seem to be compiled from openssl-1.0.1l.
-	# 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"
-	for d in "${S}"/*/lib/lib/libcds.so; do
-		cd "${d}" || die
-		patchelf --replace-needed libssl.so.1.0.{2,0} \
-			--replace-needed libcrypto.so.1.0.{2,0} \
-			libcds.so || die
-		cd - >/dev/null
-	done
-}
-
-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/
-
-	if use server; then
-		rm -f vmware-workstation-server/bin/{openssl,configure-hostd.sh}
-	fi
-
-	if ! use bundled-libs ; then
-		clean_bundled_libs
-	fi
-
-	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 = '${D}${VM_INSTALL_DIR//\//\\/}#" \
-			-e "s#os\.path\.isfile('/usr#os.path.isfile('${D}${VM_INSTALL_DIR//\//\\/}#" \
-			-e "s#vmwarebase = '/usr#vmwarebase = '${D}${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.\n
-"
-}
-
-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/*
-
-	# install the libraries
-	insinto "${VM_INSTALL_DIR}"/lib/vmware
-	doins -r */lib/* vmware-vmx/roms
-	rm -rf "${D}${VM_INSTALL_DIR}"/lib/vmware/*.so
-
-	# install the installer
-	insinto "${VM_INSTALL_DIR}"/lib/vmware-installer/$vmware_installer_version
-	doins vmware-installer/{vmis,vmis-launcher,vmware-installer,vmware-installer.py}
-	insinto /etc/vmware-installer
-	doins vmware-installer/bootstrap
-
-	# 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.2/libcrypto.so.1.0.2
-		dosym ../../../../../../usr/$(get_libdir)/libssl.so.1.0.0 \
-			"${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.1.0.2/libssl.so.1.0.2
-	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 -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
-	if use server; then
-		cd "${S}"/vmware-workstation-server
-
-		# install binaries
-		into "${VM_INSTALL_DIR}"/lib/vmware
-		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/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
-	fi
-
-	# 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 "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/{ovftool,ovftool.bin}
-		dosym "${D}${VM_INSTALL_DIR}"/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,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
-	if use server; then
-		fperms 0755 "${VM_INSTALL_DIR}"/bin/{vmware-hostd,wssc-adminTool}
-		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'
-		CONFIG_PROTECT_MASK='/etc/vmware-installer'
-	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
-		.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 = "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}"
-		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"
-	EOF
-
-	if use vix; then
-		cat >> "${D}"/etc/vmware/config <<-EOF
-			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
-
-	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
-
-	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-3.0/gdk-pixbuf.loaders || 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_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 "${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
-	if use systemd; then
-		systemd_dounit "${WORKDIR}/systemd-vmware-${SYSTEMD_UNITS_TAG}/"*.{service,target}
-	fi
-
-	# enable macOS guests support
-	if use macos-guests; then
-		python2 "${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="${D}/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
-			doins vmware-tools-${guest}/${guest}.iso.sig
-		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
-	ewarn "This version has reached its 'end of general support' from VMware: https://www.vmware.com/content/dam/digitalmarketing/vmware/en/pdf/support/product-lifecycle-matrix.pdf"
-	ewarn "If you choose to use this instead of the newer version and you're affected by some security issue, you have only yourself to blame."
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/app-emulation/vmware-workstation/vmware-workstation-15.1.0.13591040-r4.ebuild b/app-emulation/vmware-workstation/vmware-workstation-15.1.0.13591040-r5.ebuild
index b19a239..c44b536 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-15.1.0.13591040-r4.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-15.1.0.13591040-r5.ebuild
@@ -7,12 +7,7 @@ inherit eapi7-ver eutils readme.gentoo-r1 gnome2-utils pam systemd xdg-utils
 
 MY_PN="VMware-Workstation-Full"
 MY_PV=$(ver_cut 1-3)
-# Getting the major version number for kernel modules:
-## cd vmware-vmx/lib/modules/source
-## tar xf vmmon.tar
-## cd vmmon-only/include
-## grep VMMON_VERSION iocontrols.h
-PV_MODULES="361.$(ver_cut 2-3)"
+PV_MODULES="${MY_PV}"
 PV_BUILD=$(ver_cut 4)
 MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}"
 VMWARE_FUSION_VER="11.1.0/13668589" # https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/
@@ -209,12 +204,10 @@ RDEPEND="
 	!app-emulation/vmware-player
 	!app-emulation/vmware-tools
 "
-PDEPEND="
-	modules? ( ~app-emulation/vmware-modules-${PV_MODULES} )
-"
 DEPEND="
 	dev-lang/python:2.7
 	>=dev-util/patchelf-0.9
+	modules? ( ~app-emulation/vmware-modules-${PV_MODULES} )
 	ovftool? ( app-admin/chrpath )
 	sys-libs/ncurses:5
 	sys-libs/readline:0