From 4e00b8c278e414c10942a8f5adb649f8c788610b Mon Sep 17 00:00:00 2001
From: Quetzaly Daniela Solano Gómez <gentoo@sattvik.com>
Date: Mon, 8 May 2023 20:34:43 -0500
Subject: app-emulation/*: Sync with stefantalpalaru-overlay
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Quetzaly Daniela Solano Gómez <gentoo@sattvik.com>
---
 app-emulation/vmware-modules/Manifest              |   6 +-
 .../vmware-modules/vmware-modules-16.2.5-r3.ebuild | 117 ------
 .../vmware-modules/vmware-modules-16.2.5-r4.ebuild | 117 ++++++
 .../vmware-modules/vmware-modules-17.0.1-r2.ebuild | 117 ------
 .../vmware-modules/vmware-modules-17.0.2.ebuild    | 117 ++++++
 app-emulation/vmware-workstation/Manifest          |  12 +-
 app-emulation/vmware-workstation/files/vmware.rc   |  31 +-
 .../vmware-workstation-16.2.5.20904516-r1.ebuild   | 423 --------------------
 .../vmware-workstation-16.2.5.20904516-r3.ebuild   | 423 ++++++++++++++++++++
 .../vmware-workstation-17.0.1.21139696.ebuild      | 426 ---------------------
 .../vmware-workstation-17.0.2.21581411.ebuild      | 426 +++++++++++++++++++++
 11 files changed, 1108 insertions(+), 1107 deletions(-)
 delete mode 100644 app-emulation/vmware-modules/vmware-modules-16.2.5-r3.ebuild
 create mode 100644 app-emulation/vmware-modules/vmware-modules-16.2.5-r4.ebuild
 delete mode 100644 app-emulation/vmware-modules/vmware-modules-17.0.1-r2.ebuild
 create mode 100644 app-emulation/vmware-modules/vmware-modules-17.0.2.ebuild
 delete mode 100644 app-emulation/vmware-workstation/vmware-workstation-16.2.5.20904516-r1.ebuild
 create mode 100644 app-emulation/vmware-workstation/vmware-workstation-16.2.5.20904516-r3.ebuild
 delete mode 100644 app-emulation/vmware-workstation/vmware-workstation-17.0.1.21139696.ebuild
 create mode 100644 app-emulation/vmware-workstation/vmware-workstation-17.0.2.21581411.ebuild

diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest
index 3d4e042..4d24524 100644
--- a/app-emulation/vmware-modules/Manifest
+++ b/app-emulation/vmware-modules/Manifest
@@ -1,5 +1,5 @@
 DIST vmware-modules-16.2.5-efc76a69acebb66409af5f267c51ccc027e057e6.tar.gz 477764 BLAKE2B f5735949a8e0a9c2f576e4f10191e65e5f2dc3425faff8a52c35d822d4b6ac08e7afb40cb7cd590eba05159cb28957467b30a0adff70319faf1f619d498e44c2 SHA512 c3442ca9e4a83270ce30a18c8d2de756cf2d894e2ea1478533e4b3ade324272142ddf4f8d11b7ebc22b19303262bb10eabc26f9b2e79da7c7eda31776b382e87
-DIST vmware-modules-17.0.1-650fb3abeb82f2b7d3a14f9579a7529d153636b7.tar.gz 482406 BLAKE2B 7f33571612272e4427767fcebd836141a7ce9d2cfb908ca347af094649460260c1047e5ae168d3dc4d6a08d831b3375d889a5c5048215197d64a83aed56887c0 SHA512 91513e05689d4892fda0219d6a5ee318cd1e5451a1357c189a52e6e8bf1ae5e25d1d0927d132a9eb96292f810d5b116d2f70e3c5d51b5027e33d25ee16b10b4c
-EBUILD vmware-modules-16.2.5-r3.ebuild 3233 BLAKE2B d0ac86c8a499de214963018e30535572c843ac2083376b0e3b9cc7469d37ab54b47fd47c4977573435b0ced65835e2196e5505dcba2603697c4f5c1a35d7ebe2 SHA512 0832c999be191ef8d2547f67a6785b888991cac6cf2775854fc2d2866bd0dc2b97513b507508ddadd3d77e4bca5bfe6d9a32cecdfa2d7a0c55accbb0723c0070
-EBUILD vmware-modules-17.0.1-r2.ebuild 3250 BLAKE2B 6cbb6bab6da284584ae9b65cd10e17da8cef7eeab025190f4e48e18968697d9470172450ea074caf9e7346a4ec3db92078ac206b52163cfa25078d547da4aee5 SHA512 1091de558e6cb1392d68c07b48c4966f30acb6d5866ffcc57b33fb71175c292b0f02d7574d8c88e5e1720c45443ad2e80bfb32c51450d839643403ad955c3834
+DIST vmware-modules-17.0.2-650fb3abeb82f2b7d3a14f9579a7529d153636b7.tar.gz 482406 BLAKE2B 7f33571612272e4427767fcebd836141a7ce9d2cfb908ca347af094649460260c1047e5ae168d3dc4d6a08d831b3375d889a5c5048215197d64a83aed56887c0 SHA512 91513e05689d4892fda0219d6a5ee318cd1e5451a1357c189a52e6e8bf1ae5e25d1d0927d132a9eb96292f810d5b116d2f70e3c5d51b5027e33d25ee16b10b4c
+EBUILD vmware-modules-16.2.5-r4.ebuild 3250 BLAKE2B 9da355eb15b45ffe59d49ed3006ab6b101f9fa4c424d914c509dc178f5ab262621ab1ffd72f1332062c1d7c89bb466f36036d0efca73f02b0ee2413f3c81e597 SHA512 7fb71f74c08503952ffdfc9dfef9839db17a195fb275b7d6a38c698eb5cf43d3b80671266fdc379f15cded67ed4d66d556e3fe03a060ea110881aca03d260880
+EBUILD vmware-modules-17.0.2.ebuild 3250 BLAKE2B c59059512d57bed9227313b64f3ec71305764dfbec83ac0c5ef5be45672c55c558e645a3b4c955baee7845c60af09383dd8c1878159c154336e4453262026fd0 SHA512 87b6fbf59393372fcc9648e6948adeb14f81b82c0cd5fdd3b940a4f65b4da522af5f106e8f11850736fb0d7066559e126a04b317dddbc11f037fd77bee86796f
 MISC metadata.xml 258 BLAKE2B 32ba82775278c15115ba95e0a7c4072d819e915d97801ab5efcd5a9c9408e1659cb1423f6bc21bb8928cfb29c401c0bad5331b917b44d21bbf279b07c4fefca3 SHA512 1c1b55777f8e757404ad5df42c46e00f344e28a4067129b2dd93b17c13fb2656130e948e1dc6295dbb6e6da81eee5b012f9b3a002a95521e9ee12c2cd6df10db
diff --git a/app-emulation/vmware-modules/vmware-modules-16.2.5-r3.ebuild b/app-emulation/vmware-modules/vmware-modules-16.2.5-r3.ebuild
deleted file mode 100644
index a598315..0000000
--- a/app-emulation/vmware-modules/vmware-modules-16.2.5-r3.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic linux-mod udev
-
-DESCRIPTION="VMware kernel modules"
-HOMEPAGE="https://github.com/mkubecek/vmware-host-modules"
-
-# Highest kernel version known to work:
-MY_KERNEL_VERSION="6.2"
-
-# Upstream doesn't want to tag versions or anything that looks like properly
-# releasing the software, so we need to just pick a commit from
-# https://github.com/mkubecek/vmware-host-modules/commits/workstation-${PV}
-# and test it ourselves.
-#
-# Details: https://github.com/mkubecek/vmware-host-modules/issues/158#issuecomment-1228341760
-MY_COMMIT="efc76a69acebb66409af5f267c51ccc027e057e6"
-
-SRC_URI=" https://github.com/mkubecek/vmware-host-modules/archive/${MY_COMMIT}.tar.gz -> ${P}-${MY_COMMIT}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-
-RESTRICT="mirror"
-
-S="${WORKDIR}/vmware-host-modules-${MY_COMMIT}"
-
-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
-
-	if kernel_is gt ${MY_KERNEL_VERSION//./ }; then
-		ewarn
-		ewarn "Warning: this version of the modules is only known to work with kernels up to ${MY_KERNEL_VERSION}, while you are building them for a ${KV_FULL} kernel."
-		ewarn
-	fi
-
-	VMWARE_MODULE_LIST="vmmon vmnet"
-
-	VMWARE_MOD_DIR="${PN}-${PVR}"
-
-	BUILD_TARGETS="auto-build KERNEL_DIR=${KERNEL_DIR} KBUILD_OUTPUT=${KV_OUT_DIR}"
-
-	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
-	udev_reload
-	ewarn "Don't forget to run '/etc/init.d/vmware restart' to use the new kernel modules."
-}
-
-pkg_postrm() {
-	linux-mod_pkg_postrm
-	udev_reload
-}
diff --git a/app-emulation/vmware-modules/vmware-modules-16.2.5-r4.ebuild b/app-emulation/vmware-modules/vmware-modules-16.2.5-r4.ebuild
new file mode 100644
index 0000000..76ed42a
--- /dev/null
+++ b/app-emulation/vmware-modules/vmware-modules-16.2.5-r4.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-mod udev
+
+DESCRIPTION="VMware kernel modules"
+HOMEPAGE="https://github.com/mkubecek/vmware-host-modules"
+
+# Highest kernel version known to work:
+MY_KERNEL_VERSION="6.3"
+
+# Upstream doesn't want to tag versions or anything that looks like properly
+# releasing the software, so we need to just pick a commit from
+# https://github.com/mkubecek/vmware-host-modules/commits/workstation-${PV}
+# and test it ourselves.
+#
+# Details: https://github.com/mkubecek/vmware-host-modules/issues/158#issuecomment-1228341760
+MY_COMMIT="efc76a69acebb66409af5f267c51ccc027e057e6"
+
+SRC_URI=" https://github.com/mkubecek/vmware-host-modules/archive/${MY_COMMIT}.tar.gz -> ${P}-${MY_COMMIT}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="acct-group/vmware"
+DEPEND=""
+
+RESTRICT="mirror"
+
+S="${WORKDIR}/vmware-host-modules-${MY_COMMIT}"
+
+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
+
+	if kernel_is gt ${MY_KERNEL_VERSION//./ }; then
+		ewarn
+		ewarn "Warning: this version of the modules is only known to work with kernels up to ${MY_KERNEL_VERSION}, while you are building them for a ${KV_FULL} kernel."
+		ewarn
+	fi
+
+	VMWARE_MODULE_LIST="vmmon vmnet"
+
+	VMWARE_MOD_DIR="${PN}-${PVR}"
+
+	BUILD_TARGETS="auto-build KERNEL_DIR=${KERNEL_DIR} KBUILD_OUTPUT=${KV_OUT_DIR}"
+
+	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
+	udev_reload
+	ewarn "Don't forget to run '/etc/init.d/vmware restart' to use the new kernel modules."
+}
+
+pkg_postrm() {
+	linux-mod_pkg_postrm
+	udev_reload
+}
diff --git a/app-emulation/vmware-modules/vmware-modules-17.0.1-r2.ebuild b/app-emulation/vmware-modules/vmware-modules-17.0.1-r2.ebuild
deleted file mode 100644
index 1c8ff46..0000000
--- a/app-emulation/vmware-modules/vmware-modules-17.0.1-r2.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic linux-mod udev
-
-DESCRIPTION="VMware kernel modules"
-HOMEPAGE="https://github.com/mkubecek/vmware-host-modules"
-
-# Highest kernel version known to work:
-MY_KERNEL_VERSION="6.2"
-
-# Upstream doesn't want to tag versions or anything that looks like properly
-# releasing the software, so we need to just pick a commit from
-# https://github.com/mkubecek/vmware-host-modules/commits/workstation-${PV}
-# and test it ourselves.
-#
-# Details: https://github.com/mkubecek/vmware-host-modules/issues/158#issuecomment-1228341760
-MY_COMMIT="650fb3abeb82f2b7d3a14f9579a7529d153636b7"
-
-SRC_URI=" https://github.com/mkubecek/vmware-host-modules/archive/${MY_COMMIT}.tar.gz -> ${P}-${MY_COMMIT}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="acct-group/vmware"
-DEPEND=""
-
-RESTRICT="mirror"
-
-S="${WORKDIR}/vmware-host-modules-${MY_COMMIT}"
-
-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
-
-	if kernel_is gt ${MY_KERNEL_VERSION//./ }; then
-		ewarn
-		ewarn "Warning: this version of the modules is only known to work with kernels up to ${MY_KERNEL_VERSION}, while you are building them for a ${KV_FULL} kernel."
-		ewarn
-	fi
-
-	VMWARE_MODULE_LIST="vmmon vmnet"
-
-	VMWARE_MOD_DIR="${PN}-${PVR}"
-
-	BUILD_TARGETS="auto-build KERNEL_DIR=${KERNEL_DIR} KBUILD_OUTPUT=${KV_OUT_DIR}"
-
-	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
-	udev_reload
-	ewarn "Don't forget to run '/etc/init.d/vmware restart' to use the new kernel modules."
-}
-
-pkg_postrm() {
-	linux-mod_pkg_postrm
-	udev_reload
-}
diff --git a/app-emulation/vmware-modules/vmware-modules-17.0.2.ebuild b/app-emulation/vmware-modules/vmware-modules-17.0.2.ebuild
new file mode 100644
index 0000000..f637afa
--- /dev/null
+++ b/app-emulation/vmware-modules/vmware-modules-17.0.2.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-mod udev
+
+DESCRIPTION="VMware kernel modules"
+HOMEPAGE="https://github.com/mkubecek/vmware-host-modules"
+
+# Highest kernel version known to work:
+MY_KERNEL_VERSION="6.3"
+
+# Upstream doesn't want to tag versions or anything that looks like properly
+# releasing the software, so we need to just pick a commit from
+# https://github.com/mkubecek/vmware-host-modules/commits/workstation-${PV}
+# and test it ourselves.
+#
+# Details: https://github.com/mkubecek/vmware-host-modules/issues/158#issuecomment-1228341760
+MY_COMMIT="650fb3abeb82f2b7d3a14f9579a7529d153636b7"
+
+SRC_URI=" https://github.com/mkubecek/vmware-host-modules/archive/${MY_COMMIT}.tar.gz -> ${P}-${MY_COMMIT}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="acct-group/vmware"
+DEPEND=""
+
+RESTRICT="mirror"
+
+S="${WORKDIR}/vmware-host-modules-${MY_COMMIT}"
+
+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
+
+	if kernel_is gt ${MY_KERNEL_VERSION//./ }; then
+		ewarn
+		ewarn "Warning: this version of the modules is only known to work with kernels up to ${MY_KERNEL_VERSION}, while you are building them for a ${KV_FULL} kernel."
+		ewarn
+	fi
+
+	VMWARE_MODULE_LIST="vmmon vmnet"
+
+	VMWARE_MOD_DIR="${PN}-${PVR}"
+
+	BUILD_TARGETS="auto-build KERNEL_DIR=${KERNEL_DIR} KBUILD_OUTPUT=${KV_OUT_DIR}"
+
+	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
+	udev_reload
+	ewarn "Don't forget to run '/etc/init.d/vmware restart' to use the new kernel modules."
+}
+
+pkg_postrm() {
+	linux-mod_pkg_postrm
+	udev_reload
+}
diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
index a68d7bc..3144f63 100644
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@@ -1,10 +1,10 @@
-AUX vmware.rc 2476 BLAKE2B dff25b43c5fa57186be2a5f0ca4606d26cd1c3f3dbeb91d855fc07a9fd576f446983c852c8e0b112c5616bb95dfddc7e2c738b4d0ca341c781d7addcb45068cd SHA512 9bae224387128b2cd221d509e2933042e3925fb041670907d8a47c70a488214206912fe25ab24c0bdeb31591149e62aba374d3fa63fdd08644e09667e195967f
+AUX vmware.rc 2540 BLAKE2B 4806b1610ad207292a41ff8bf29c5b1fa4a5d0d5f89a9e9de5b69698368d4d00559a43e96b0f0d46f8daba9fb94bb044729f1b3ec42f74db0fa6c6adc05c8795 SHA512 435c98d3486c3562da1f6623fc6c878d6a18f4851e3a48d338a0364bf08da1ff9f78800f9d41c5305e6263fbd741b8120e14d7a58002e1ac97e95e8345eb4d3f
 DIST VMware-Workstation-Full-16.2.5-20904516.x86_64.bundle 548386581 BLAKE2B c94b1c86e09f1316bfe2e461a2fb2a339d80d9d3e2f13f180f27ed7088e025705fc5c328cec2b4b01ee6e5c21a2422791da91b564379a09ba671454af73fca85 SHA512 b23466363f64afd7e9e3f824021c8408ec712477ffc9a7b4f7e2653c81adeaac8584351d4cd28aec56e1cfc677b32f81f98f1d914d90a9784e2949e8ee3ce6d8
-DIST VMware-Workstation-Full-17.0.1-21139696.x86_64.bundle 538898391 BLAKE2B fb94bf6bd63437ec244eed579557b1c276e5b81a40b116156aed4bd4e9d8bd23c43d2f18fbf00b65e2c86c725d038cd5af213492bc7646305da1d97522f45d63 SHA512 053b98b4d2a43cf9b515bc9c222cd6b2da7c6ec8b8f7d045f11b5180db4a4c90504e1d895964d034ce93f11b8280e0ffa8e6d1b6126cd96aa35ca4dbdfbc9db9
+DIST VMware-Workstation-Full-17.0.2-21581411.x86_64.bundle 538902080 BLAKE2B 40a51a8090c89b6e4e18e7c6d6fa5968c243648e5aa865d0c6c6e237f717b6b5519f1aeba0ed00629b00c8dcc5cc817c008f487eac27a241a347efcf5d440816 SHA512 2451438ab6d1ed8cac9f3179aaa662664ea3918d0ee937eea7b05c3ef2472a0008971073ddc3117e216b1bd64c32ac5ce30107e34cea9cd381b5cc668dd95e37
 DIST com.vmware.fusion-16.2.5.20904516.zip.tar 656752640 BLAKE2B 4d535710aff501387293e6d325ae5859d3a4241263ad9357d68508841e2ffbbc039de547bc02bff215ee30cef77174bfef7b77b47ba66424c1aab37467fd1a62 SHA512 e2c18336a66d7b3526df475a218272c6d46020815c8eb7e29df75e98d0e6737773abc5488f54d8e97479e47e43ca3867f16d7c8af772f13492efec773df47bb8
-DIST com.vmware.fusion-17.0.1.21139696.zip.tar 709570560 BLAKE2B ab456cfa234d35cc5c0b87ac41f1c84e8d04094882b773a6e7ac2dfb01d9deff548ac4d9de8c209829080799b2e9d9585c140f13fa257c5077a5e48f9ca87e4d SHA512 a34c1dff8fc053126f2b138cf7f399fce1359575d9ba9e81f9a69abda809fcf516c360301f729484cb8f53a183141734c7432e57d6acb9ae1e85a352079b2805
-DIST unlocker-3.0.4.tar.gz 10910 BLAKE2B db4ac74090cc70b138c0f1651c9edb34bf3bb5152408d2055ab6df5f2fc75bbeffe46d0839328d43ee53a8763e25144e3cc6068e3993132bc7e2aee15f1a2f35 SHA512 93802fc19353c0d21ade7a33122a6caa6924d69f8faba004c32b6a65fca390e159cf7e988807541ab2cc150c1325c18a3ee787364ef86f1ec0157d29a36b8105
+DIST com.vmware.fusion-17.0.2.21581411.zip.tar 709570560 BLAKE2B ab456cfa234d35cc5c0b87ac41f1c84e8d04094882b773a6e7ac2dfb01d9deff548ac4d9de8c209829080799b2e9d9585c140f13fa257c5077a5e48f9ca87e4d SHA512 a34c1dff8fc053126f2b138cf7f399fce1359575d9ba9e81f9a69abda809fcf516c360301f729484cb8f53a183141734c7432e57d6acb9ae1e85a352079b2805
+DIST unlocker-3.0.5.tar.gz 10922 BLAKE2B a986c23b111f259ed14f284d2598d89a49d7e57cefdae164026385e195c601a569d16317dba2a4eb72c5f209c05220dbb9d3c7e8f7aed5c08c47de97e97eb7c0 SHA512 6e84cc9b69b8f6d2701e4b90320fa4aee1a2b21825b81d9380d0fef23b6720a0a86d9848d9bd4a3fcc7e35c9c5fd41759ded7ea0368a36ea0b8f1209d682c134
 DIST vmware-systemd-gentoo-02.tgz 14064 BLAKE2B 24ac2c2f295130f4aadad867ec88d652bd292cc60e6b471bb2e01069fe01d84dac3d8b0ca7690ebf218d663adfe0c1dc889d3f4f53cf3178b68291461260748b SHA512 3a382bfd5f1eb2b218d8012588ea55c1f22786dba35a1fc0fdfdb4e40b05e0e735ed09c6961684f6442e863c3ed72024ce01f19113bbd9ca47c32e3f43c55f42
-EBUILD vmware-workstation-16.2.5.20904516-r1.ebuild 14763 BLAKE2B bd98afec4d86985f5b5586773dd0c1945d7911f85f8cce61819aeca2b279b65ce8d6d770040402f704bfa46a4b8802822b0511e381adee9f377e79a937f13060 SHA512 881be69627eade3e70860a96d066720cafc58265df0a5ffb773626ecd51e31e4f819f3aa599ac44e1e4ff16db41012ce1a07ccce237704f149a20e061692834b
-EBUILD vmware-workstation-17.0.1.21139696.ebuild 14989 BLAKE2B 3e8bc034b025314d03d14126cf6c2e6e9e2622856d0bf6f79e4771a70f0c220cafbf8fd0ef6725cf61ba589eb0afb530a27760010155f480df1f78bde629b474 SHA512 5561d16887a7ccef81cd76a179578da3ee3a25531ec6c813a52bab894f2a2ed9e364b4bc755fcb88d454b10091d6551a956901044907ee7988c57d2b2cf6ac2d
+EBUILD vmware-workstation-16.2.5.20904516-r3.ebuild 14757 BLAKE2B 8f7ba8f0de2a8ea5cc820afde80dbe2e2465fad1d398af1d687404ab36235c9fd0743434fe94bd3b5dcd775a3cbb5e63bc72d9f79453a4c2bab9b542948c4dd1 SHA512 74d5e6cb2c33d887523008837d6e4b68be3e27e133b2279b5914896f3062fd792ec76ce2fad3d465722d082c1d610a679ef5ef575a1f6a609e42b98d02ecfcba
+EBUILD vmware-workstation-17.0.2.21581411.ebuild 14983 BLAKE2B ee4659c788d4c36f9602de2b7adda1f638a273395bfbcd13981ae5d968c1ef3e28648ec2174b751d552020050daed79316fcccee2e9fe3b8ab3ef8bb3c9ba8ab SHA512 0a143d2de5acfb4d14c8e75748b0adc747b27cd69836ef316d97fd08c186b69e5027411901046dbc9042d1d6475a243608a7d29d959e3de77d5957ab9a740c09
 MISC metadata.xml 1852 BLAKE2B 3d3241e2fa53d92bd9ffdf6523ea0cb8dd798520656b1e4c8bc20723657704252c6c94d7231f2d047bcf2f5115ba7e3f9df90db718b4be8b103848dfd624a56f SHA512 0e9ff0f750609178cd5fb2ebb91411287ef49e60ce1577bf263f7d7b61555d69f34e23998a36edfc7887bcb7be066e798eb4b2a7773d790047107a7f07609e15
diff --git a/app-emulation/vmware-workstation/files/vmware.rc b/app-emulation/vmware-workstation/files/vmware.rc
index b627869..4160c9f 100644
--- a/app-emulation/vmware-workstation/files/vmware.rc
+++ b/app-emulation/vmware-workstation/files/vmware.rc
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
@@ -11,17 +11,18 @@ 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 ;
+	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)
+			modprobe -v $(basename "${mod}" | cut -d '.' -f 1)
 			eend $?
 			break
 		fi
@@ -31,18 +32,18 @@ start() {
 	# 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 ;
+	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)
+			modprobe -v $(basename "${mod}" | cut -d '.' -f 1)
 			eend $?
 			break
 		fi
 	done
 
 	# vmblock
-	if [[ -f /lib/modules/$(uname -r)/misc/vmblock.ko ]]; then
+	if [[ -f /lib/modules/$(uname -r)/misc/vmblock.ko* ]]; then
 		modprobe -v vmblock
 		eend $?
 	fi
@@ -70,11 +71,11 @@ stop() {
 	# 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 ;
+	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)
+			modprobe -rv $(basename "${mod}" | cut -d '.' -f 1)
 			eend $?
 			break
 		fi
@@ -84,18 +85,18 @@ stop() {
 	# 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 ;
+	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)
+			modprobe -rv $(basename "${mod}" | cut -d '.' -f 1)
 			eend $?
 			break
 		fi
 	done
 
 	# vmblock
-	if [[ -f /lib/modules/$(uname -r)/misc/vmblock.ko ]]; then
+	if [[ -f /lib/modules/$(uname -r)/misc/vmblock.ko* ]]; then
 		modprobe -rv vmblock
 		eend $?
 	fi
diff --git a/app-emulation/vmware-workstation/vmware-workstation-16.2.5.20904516-r1.ebuild b/app-emulation/vmware-workstation/vmware-workstation-16.2.5.20904516-r1.ebuild
deleted file mode 100644
index 0d1bdac..0000000
--- a/app-emulation/vmware-workstation/vmware-workstation-16.2.5.20904516-r1.ebuild
+++ /dev/null
@@ -1,423 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..11} )
-inherit readme.gentoo-r1 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="12.2.5/20904517" # https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/
-SYSTEMD_UNITS_TAG="gentoo-02"
-UNLOCKER_VERSION="3.0.4"
-
-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-${MY_PV//./}-LX/${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}/x86/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}/x86/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"
-
-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
-	media-gfx/graphite2
-	media-libs/alsa-lib
-	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
-	sys-auth/polkit
-	virtual/libcrypt:*
-	x11-libs/libXinerama
-	x11-libs/libXxf86vm
-	x11-libs/libdrm
-	x11-libs/libxshmfence
-	x11-libs/startup-notification
-	x11-libs/xcb-util
-	x11-themes/hicolor-icon-theme
-"
-DEPEND="
-	${PYTHON_DEPS}
-	>=dev-util/patchelf-0.9
-	modules? ( ~app-emulation/vmware-modules-${PV_MODULES} )
-"
-BDEPEND="
-	app-admin/chrpath
-"
-
-S=${WORKDIR}/extracted
-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"
-# 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/
-
-	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 || die
-	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 "${ED}${VM_INSTALL_DIR}"/lib/vmware/*.so || die
-
-	# 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,python}
-	chrpath -k -r '/../lib:$ORIGIN/../lib' "${ED}${VM_INSTALL_DIR}"/lib/vmware-installer/${vmware_installer_version}/python/lib/lib-dynload/*.so >/dev/null || die
-	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-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,modconfig{,-console},netcfg,setup-helper,tray,unity-helper,vmblock-fuse,vprobe,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
-
-	# (we can't use "fperms" here, because globbing is done before the "${ED}"
-	# prefix is added to the path and this will obviously fail the first time
-	# the package is installed)
-	chmod 0755 "${ED}${VM_INSTALL_DIR}"/lib/vmware/bin/*
-
-	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 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
-
-	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.rc" > "${initscript}" || die
-		newinitd "${initscript}" vmware
-	fi
-
-	# 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
-
-	# 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
-
-	# metadata
-	mv "${ED}/usr/share/appdata" "${ED}/usr/share/metainfo"
-
-	# readme
-	readme.gentoo_create_doc
-}
-
-pkg_config() {
-	"${VM_INSTALL_DIR}"/bin/vmware-networks --postinstall ${PN},old,new
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-	elog "${DOC_CONTENTS}"
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
diff --git a/app-emulation/vmware-workstation/vmware-workstation-16.2.5.20904516-r3.ebuild b/app-emulation/vmware-workstation/vmware-workstation-16.2.5.20904516-r3.ebuild
new file mode 100644
index 0000000..c956073
--- /dev/null
+++ b/app-emulation/vmware-workstation/vmware-workstation-16.2.5.20904516-r3.ebuild
@@ -0,0 +1,423 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit readme.gentoo-r1 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="12.2.5/20904517" # https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/
+SYSTEMD_UNITS_TAG="gentoo-02"
+UNLOCKER_VERSION="3.0.5"
+
+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-${MY_PV//./}-LX/${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}/x86/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}/x86/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"
+
+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
+	media-gfx/graphite2
+	media-libs/alsa-lib
+	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
+	sys-auth/polkit
+	virtual/libcrypt:*
+	x11-libs/libXinerama
+	x11-libs/libXxf86vm
+	x11-libs/libdrm
+	x11-libs/libxshmfence
+	x11-libs/startup-notification
+	x11-libs/xcb-util
+	x11-themes/hicolor-icon-theme
+"
+DEPEND="
+	${PYTHON_DEPS}
+	>=dev-util/patchelf-0.9
+	modules? ( ~app-emulation/vmware-modules-${PV_MODULES} )
+"
+BDEPEND="
+	app-admin/chrpath
+"
+
+S=${WORKDIR}/extracted
+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"
+# 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/
+
+	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 || die
+	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 "${ED}${VM_INSTALL_DIR}"/lib/vmware/*.so || die
+
+	# 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,python}
+	chrpath -k -r '/../lib:$ORIGIN/../lib' "${ED}${VM_INSTALL_DIR}"/lib/vmware-installer/${vmware_installer_version}/python/lib/lib-dynload/*.so >/dev/null || die
+	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-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,modconfig{,-console},netcfg,setup-helper,tray,unity-helper,vmblock-fuse,vprobe,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
+
+	# (we can't use "fperms" here, because globbing is done before the "${ED}"
+	# prefix is added to the path and this will obviously fail the first time
+	# the package is installed)
+	chmod 0755 "${ED}${VM_INSTALL_DIR}"/lib/vmware/bin/*
+
+	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 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
+
+	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.rc" > "${initscript}" || die
+		newinitd "${initscript}" vmware
+	fi
+
+	# 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
+
+	# 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
+
+	# metadata
+	mv "${ED}/usr/share/appdata" "${ED}/usr/share/metainfo"
+
+	# readme
+	readme.gentoo_create_doc
+}
+
+pkg_config() {
+	"${VM_INSTALL_DIR}"/bin/vmware-networks --postinstall ${PN},old,new
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+	elog "${DOC_CONTENTS}"
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
diff --git a/app-emulation/vmware-workstation/vmware-workstation-17.0.1.21139696.ebuild b/app-emulation/vmware-workstation/vmware-workstation-17.0.1.21139696.ebuild
deleted file mode 100644
index 019e61f..0000000
--- a/app-emulation/vmware-workstation/vmware-workstation-17.0.1.21139696.ebuild
+++ /dev/null
@@ -1,426 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..11} )
-inherit readme.gentoo-r1 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="13.0.1/21139760" # https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/
-SYSTEMD_UNITS_TAG="gentoo-02"
-UNLOCKER_VERSION="3.0.4"
-
-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-${MY_PV//./}-LX/${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}/universal/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}/universal/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"
-
-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
-	media-gfx/graphite2
-	media-libs/alsa-lib
-	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
-	sys-auth/polkit
-	virtual/libcrypt:*
-	x11-libs/libXinerama
-	x11-libs/libXxf86vm
-	x11-libs/libdrm
-	x11-libs/libxshmfence
-	x11-libs/startup-notification
-	x11-libs/xcb-util
-	x11-themes/hicolor-icon-theme
-"
-DEPEND="
-	${PYTHON_DEPS}
-	>=dev-util/patchelf-0.9
-	modules? ( ~app-emulation/vmware-modules-${PV_MODULES} )
-"
-BDEPEND="
-	app-admin/chrpath
-"
-
-S=${WORKDIR}/extracted
-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"
-# 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/x86_x64/${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/
-
-	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 || die
-	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 "${ED}${VM_INSTALL_DIR}"/lib/vmware/*.so || die
-
-	# 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,python}
-	chrpath -k -r '/../lib:$ORIGIN/../lib' "${ED}${VM_INSTALL_DIR}"/lib/vmware-installer/${vmware_installer_version}/python/lib/lib-dynload/*.so >/dev/null || die
-	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-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,modconfig{,-console},netcfg,setup-helper,tray,unity-helper,vmblock-fuse,vprobe,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
-
-	# (we can't use "fperms" here, because globbing is done before the "${ED}"
-	# prefix is added to the path and this will obviously fail the first time
-	# the package is installed)
-	chmod 0755 "${ED}${VM_INSTALL_DIR}"/lib/vmware/bin/*
-
-	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 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
-
-	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.rc" > "${initscript}" || die
-		newinitd "${initscript}" vmware
-	fi
-
-	# 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
-
-	# 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
-
-	# metadata
-	mv "${ED}/usr/share/appdata" "${ED}/usr/share/metainfo"
-
-	# readme
-	readme.gentoo_create_doc
-}
-
-pkg_config() {
-	"${VM_INSTALL_DIR}"/bin/vmware-networks --postinstall ${PN},old,new
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-	elog "${DOC_CONTENTS}"
-	elog "---"
-	elog "If inserting your license key in the GUI fails, you can do it from the command line, as root:"
-	elog "/opt/vmware/lib/vmware/bin/vmware-vmx-debug --new-sn  XXXXX-XXXXX-XXXXX-XXXXX-XXXXX"
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
diff --git a/app-emulation/vmware-workstation/vmware-workstation-17.0.2.21581411.ebuild b/app-emulation/vmware-workstation/vmware-workstation-17.0.2.21581411.ebuild
new file mode 100644
index 0000000..f5f3191
--- /dev/null
+++ b/app-emulation/vmware-workstation/vmware-workstation-17.0.2.21581411.ebuild
@@ -0,0 +1,426 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit readme.gentoo-r1 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="13.0.1/21139760" # https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/
+SYSTEMD_UNITS_TAG="gentoo-02"
+UNLOCKER_VERSION="3.0.5"
+
+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-${MY_PV//./}-LX/${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}/universal/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}/universal/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"
+
+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
+	media-gfx/graphite2
+	media-libs/alsa-lib
+	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
+	sys-auth/polkit
+	virtual/libcrypt:*
+	x11-libs/libXinerama
+	x11-libs/libXxf86vm
+	x11-libs/libdrm
+	x11-libs/libxshmfence
+	x11-libs/startup-notification
+	x11-libs/xcb-util
+	x11-themes/hicolor-icon-theme
+"
+DEPEND="
+	${PYTHON_DEPS}
+	>=dev-util/patchelf-0.9
+	modules? ( ~app-emulation/vmware-modules-${PV_MODULES} )
+"
+BDEPEND="
+	app-admin/chrpath
+"
+
+S=${WORKDIR}/extracted
+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"
+# 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/x86_x64/${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/
+
+	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 || die
+	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 "${ED}${VM_INSTALL_DIR}"/lib/vmware/*.so || die
+
+	# 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,python}
+	chrpath -k -r '/../lib:$ORIGIN/../lib' "${ED}${VM_INSTALL_DIR}"/lib/vmware-installer/${vmware_installer_version}/python/lib/lib-dynload/*.so >/dev/null || die
+	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-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,modconfig{,-console},netcfg,setup-helper,tray,unity-helper,vmblock-fuse,vprobe,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
+
+	# (we can't use "fperms" here, because globbing is done before the "${ED}"
+	# prefix is added to the path and this will obviously fail the first time
+	# the package is installed)
+	chmod 0755 "${ED}${VM_INSTALL_DIR}"/lib/vmware/bin/*
+
+	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 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
+
+	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.rc" > "${initscript}" || die
+		newinitd "${initscript}" vmware
+	fi
+
+	# 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
+
+	# 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
+
+	# metadata
+	mv "${ED}/usr/share/appdata" "${ED}/usr/share/metainfo"
+
+	# readme
+	readme.gentoo_create_doc
+}
+
+pkg_config() {
+	"${VM_INSTALL_DIR}"/bin/vmware-networks --postinstall ${PN},old,new
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+	elog "${DOC_CONTENTS}"
+	elog "---"
+	elog "If inserting your license key in the GUI fails, you can do it from the command line, as root:"
+	elog "/opt/vmware/lib/vmware/bin/vmware-vmx-debug --new-sn  XXXXX-XXXXX-XXXXX-XXXXX-XXXXX"
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
-- 
cgit v1.2.3-65-gdbad