*/*: Update vmware packages

Signed-off-by: Quetzaly Solano Gómez <gentoo@sattvik.com>

10 files changed, 65 insertions, 573 deletions

diff --git a/acct-group/vmware/Manifest b/acct-group/vmware/Manifest
index 97b9b2f..02cc7c4 100644
--- a/acct-group/vmware/Manifest
+++ b/acct-group/vmware/Manifest
@@ -1,2 +1,2 @@
-EBUILD vmware-0.ebuild 208 BLAKE2B 05ed5f620bb4b63714bcfc079859ffc8060a0ed467645406f8feb64de1fd74411892862b0f4bf3fd1eb3f7f1fd7c96a8010e21fd2d199b4a5bb7953d10af8ddf SHA512 14c386f5a5e1d7fbfa21d0cb794c6fda26f7e3f9396d8bc3ceac4adb585fe9a2a470d24acc915f5e525bca9b65a61f15a1d24d31b0874e8aa0c6ece35db3179b
+EBUILD vmware-0.ebuild 178 BLAKE2B 08daca5d8a5eb74571a2b518930e8e764527a9873cd99b998d4e2101f447c0faeeb03bcf67674211302dd263708681797966f66b9a0736bb60911cdee3d8504f SHA512 ac70faef2f3f85d836c1e175dd4e58b6b06792f45a20fffc6220ae9356f0372f2aaf694d789086c4b3775aa01fe8bd96938d709d08651601c579051f44fd1d12
 MISC metadata.xml 255 BLAKE2B 370628059d74d33c5d6c77c274490e2cea0b2380dcb6404599613b47d52d3315ea2de6e7f7a6df5f0cd67cdc57214c2d20b9d48a3acf182f7e72c3b36189339a SHA512 a20c0a73ec1be2bdbc597076be2585f67204a12ce04511d286a63bacc1004e639ea6b62819aded62254f9e8fdca2382922829674889c51dbe06e207174c4259d
diff --git a/acct-group/vmware/vmware-0.ebuild b/acct-group/vmware/vmware-0.ebuild
index 548f69f..56ec20c 100644
--- a/acct-group/vmware/vmware-0.ebuild
+++ b/acct-group/vmware/vmware-0.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit acct-group
 
-DESCRIPTION="A group for app-emulation/vmware-modules"
-
+DESCRIPTION="Group for VMware"
 ACCT_GROUP_ID="-1"
diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest
index d4bac4d..7fbff19 100644
--- a/app-emulation/vmware-modules/Manifest
+++ b/app-emulation/vmware-modules/Manifest
@@ -1,7 +1,5 @@
-AUX vmware-modules-16.2.5-kernel-6.4.10.patch 738 BLAKE2B 4bcd8bc16b70eb051fa3bd4f39b94342b41c9f847af814033f8762f790cbd037f8c4ba57e67a03ef2821b8061858b2249349b4437fc7ac51a49ede39e230cf6a SHA512 fd3b59676ae88048112ef315549c220b1499596182696429ab41830c538b1c946f09ac1ca6fd48e3ac19711fa2713c3bc3feb7464628163a3a9e96ddcb3395bf
-AUX vmware-modules-17.0.2-kernel-6.5.patch 1912 BLAKE2B 70c6f96fc9a05c1765fb072a1e950c2e09182f817e087d57046312136bed5be49b4eeb42e74bc50cfac9696b4a499c678d669249c3bee559b9f2f24f4f4bd4cd SHA512 3651393c3bb15cfd191b78bc99575cabff818891b81ed77c96efd9bd48151e36156214b6cd91d4b76a1914202bb8949cfbed5ce8dd0336bff8a4a568af7f9eb8
-DIST vmware-modules-16.2.5-3b4aadaeec916d2d39550808866413736bff4410.tar.gz 477813 BLAKE2B baf1e445dc97fa09c7465f0a7de0ea54a0a564ea58a8bb90bc1d09b65832dfc82af1a94ed2ae207ebfb4ab609d1156fc08e2cdeeae1e6ddf0a25949974523897 SHA512 cdd269c9012a59ca3847dfcfb6b0cf3868134803c463ef53ae0cd253618b85ef6745a1760a7e241ecf04bd70a8c06555ef9a9d854f8f8d3d0016d83ec4533ba5
 DIST vmware-modules-17.5.0-4c2a103fd2d71f2084f1fe7ceacb816b9832ffa2.tar.gz 488588 BLAKE2B 779a7495483ba6e6dd44bd432e1a7769cb96c1b19bddd8b703a711fa85ece9d2f6d1b4f5357f618a980de0b62f10fa5e1aaf0032747f8be4631031f17a1340bb SHA512 48caaebc0a8675a9dd746e6017da47e54f4cbfeac5a679917aefb735b0651a063e90c5f8094c5bcb100d9eaea72b28e5574a06d4eec72d05c600ff73411638e6
-EBUILD vmware-modules-16.2.5-r11.ebuild 3358 BLAKE2B 53ef9af1c6ff4a2dd66d00e43ce181a04b4a7610d678aae5341a7ae1dd5fee1d8784d7bf96661432c65ec5be1488cc56ab031851f93c9c479db37e01f6426779 SHA512 52ceb8e828fc3d0d92bb0dc5b485ee1a38f2e6bc186915342960788a37e4536c9d0b5a9a53eed89b04ef60b430799115a977fccd0a75baf39c766ee47571da48
+DIST vmware-modules-17.5.2-2c6d66f3f1947384038b765c897b102ecdb18298.tar.gz 488552 BLAKE2B 6864c9862af2a8c145c50d0a1215bb18adf6c5bfd5f2106a73ec807fc13c5f0938f3ec1d52836e988b233c92820736446d9a2e1d3f71c53985cea8d7803551ca SHA512 b3068632a2bc8d934473b271f8182954432fcec7b1ba297ee5f1ef7fd6db2289312cb94edfd15aa5842de2e3d529181aeb032f0fcfaee84bf3178681b8ba0104
 EBUILD vmware-modules-17.5.0-r3.ebuild 3234 BLAKE2B 43135d3f1707367cd09ca8afdc0604c175edbe2b503ccd8df04dfd4e77640e05bceecb2e4e3cf1d8783b65b9964e85fad6c61e762ccf4e2ca6fd65d3923c8db0 SHA512 658cee3b9645e6fba143e0424e2a9a86de2f480139904c3d13de3f8739ad6d6633c495903fdc3d1039f99ff739c0a819b293464173b2cabc799a0ce829b8b743
-MISC metadata.xml 350 BLAKE2B 771a6999f50a8022080be52002e0dc271f16100be5554b37ae36ea64243ed828a2d3dc8726052835ab48e11185f47a9c0fd1d4860e591a8f6c3f845e09c76b6d SHA512 378b6459e2f79f86f4cb7ff1306e0819ed160c0757d4aed1cfe40d87b73e83c5ab173835979f1a24e6c9d0f832d9a4fa678bbdbbbce10af35ecf3321d0edd6d9
+EBUILD vmware-modules-17.5.2.ebuild 3183 BLAKE2B 40fe4e094f56104d03d5b6f746f72d1b2829b0b030ea403082779eb9520cbc9408555ee0aa0a3a801f476240668a0e6fdce34f95ad24586af92bcce2218ec97b SHA512 99b3ed7e5a93a6463f855ba0eb724644f225e2ac9937b6572b9a6ffbd5621f11b1cb29c16569343cb1d5a2ea317a63a1d265540992f4b248dd558d99c9c0d85a
+MISC metadata.xml 258 BLAKE2B 32ba82775278c15115ba95e0a7c4072d819e915d97801ab5efcd5a9c9408e1659cb1423f6bc21bb8928cfb29c401c0bad5331b917b44d21bbf279b07c4fefca3 SHA512 1c1b55777f8e757404ad5df42c46e00f344e28a4067129b2dd93b17c13fb2656130e948e1dc6295dbb6e6da81eee5b012f9b3a002a95521e9ee12c2cd6df10db
diff --git a/app-emulation/vmware-modules/files/vmware-modules-16.2.5-kernel-6.4.10.patch b/app-emulation/vmware-modules/files/vmware-modules-16.2.5-kernel-6.4.10.patch
deleted file mode 100644
index 10c92fa..0000000
--- a/app-emulation/vmware-modules/files/vmware-modules-16.2.5-kernel-6.4.10.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ur vmware-host-modules-efc76a69acebb66409af5f267c51ccc027e057e6.orig/vmnet-only/bridge.c vmware-host-modules-efc76a69acebb66409af5f267c51ccc027e057e6/vmnet-only/bridge.c
---- vmware-host-modules-efc76a69acebb66409af5f267c51ccc027e057e6.orig/vmnet-only/bridge.c	2023-02-17 09:50:22.000000000 +0100
-+++ vmware-host-modules-efc76a69acebb66409af5f267c51ccc027e057e6/vmnet-only/bridge.c	2023-08-12 15:50:11.915654613 +0200
-@@ -45,6 +45,13 @@
- #include <net/tcp.h>
- #include <net/ipv6.h>
- 
-+/* This fixes moving skb_gso_segment(skb, 0); to net/gso.h from kernel 6.4.10
-+*  and later.
-+*/
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 4, 10)
-+#  include <net/gso.h>
-+#endif
-+
- #ifdef CONFIG_NET_RADIO
- #   include <linux/wireless.h>
- #endif
diff --git a/app-emulation/vmware-modules/files/vmware-modules-17.0.2-kernel-6.5.patch b/app-emulation/vmware-modules/files/vmware-modules-17.0.2-kernel-6.5.patch
deleted file mode 100644
index 412cf82..0000000
--- a/app-emulation/vmware-modules/files/vmware-modules-17.0.2-kernel-6.5.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From b049eda89ec1245a33c22f5d114f2d0396d5be65 Mon Sep 17 00:00:00 2001
-From: Michal Kubecek <mkubecek@suse.cz>
-Date: Mon, 21 Aug 2023 19:54:57 +0200
-Subject: [PATCH] vmmon: use get_user_pages to get page PFN
-
-As a side effect of mainline commit 0d940a9b270b ("mm/pgtable: allow
-pte_offset_map[_lock]() to fail") in 6.5-rc1, __pte_offset_map(), called by
-pte_offset_map(), is no longer exported.
-
-As this function is only used to get PFN from a virtual address, is is more
-appropriate (and reliable) to use get_user_pages infrastructure instead.
-
-Note: this is an experimental solution, more research will be needed to
-indentify the most appropriate get_user_pages_*() function and flags.
----
- vmmon-only/include/pgtbl.h | 23 +++++++++++++++++++++++
- 1 file changed, 23 insertions(+)
-
-diff --git a/vmmon-only/include/pgtbl.h b/vmmon-only/include/pgtbl.h
-index 0935e090..2334e290 100644
---- a/vmmon-only/include/pgtbl.h
-+++ b/vmmon-only/include/pgtbl.h
-@@ -25,6 +25,7 @@
- #include "compat_pgtable.h"
- #include "compat_spinlock.h"
- #include "compat_page.h"
-+#include "compat_version.h"
- 
- 
- /*
-@@ -45,6 +46,8 @@
-  *-----------------------------------------------------------------------------
-  */
- 
-+#if COMPAT_LINUX_VERSION_CHECK_LT(6, 5, 0)
-+
- static INLINE MPN
- PgtblVa2MPNLocked(struct mm_struct *mm, // IN: Mm structure of a process
-                   VA addr)              // IN: Address in the virtual address
-@@ -139,4 +142,24 @@ PgtblVa2MPN(VA addr)  // IN
-    return mpn;
- }
- 
-+#else /* COMPAT_LINUX_VERSION_CHECK_LT(6, 5, 0) */
-+
-+static INLINE MPN
-+PgtblVa2MPN(VA addr)  // IN
-+{
-+   struct page *page;
-+   int npages;
-+   MPN mpn;
-+
-+   npages = get_user_pages_unlocked(addr, 1, &page, FOLL_HWPOISON);
-+   if (npages != 1)
-+	   return INVALID_MPN;
-+   mpn = page_to_pfn(page);
-+   put_page(page);
-+
-+   return mpn;
-+}
-+
-+#endif /* COMPAT_LINUX_VERSION_CHECK_LT(6, 5, 0) */
-+
- #endif /* __PGTBL_H__ */
diff --git a/app-emulation/vmware-modules/metadata.xml b/app-emulation/vmware-modules/metadata.xml
index f73f2e3..ad506b9 100644
--- a/app-emulation/vmware-modules/metadata.xml
+++ b/app-emulation/vmware-modules/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<upstream>
-		<remote-id type="github">mkubecek/vmare-host-modules</remote-id>
-	</upstream>
 	<maintainer type="person">
 		<email>stefantalpalaru@yahoo.com</email>
 		<name>Ștefan Talpalaru</name>
diff --git a/app-emulation/vmware-modules/vmware-modules-16.2.5-r11.ebuild b/app-emulation/vmware-modules/vmware-modules-17.5.2.ebuild
index 451fcca..901cf9f 100644
--- a/app-emulation/vmware-modules/vmware-modules-16.2.5-r11.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-17.5.2.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit flag-o-matic linux-mod udev
+inherit flag-o-matic linux-mod-r1 udev
 
 DESCRIPTION="VMware kernel modules"
 HOMEPAGE="https://github.com/mkubecek/vmware-host-modules"
 
 # Highest kernel version known to work:
-MY_KERNEL_VERSION="6.7"
+MY_KERNEL_VERSION="6.8"
 
 # Upstream does not want to tag versions or anything that looks like properly
 # releasing the software, so we need to just pick a commit from
@@ -17,24 +17,20 @@ MY_KERNEL_VERSION="6.7"
 # and test it ourselves.
 #
 # Details: https://github.com/mkubecek/vmware-host-modules/issues/158#issuecomment-1228341760
-MY_COMMIT="3b4aadaeec916d2d39550808866413736bff4410"
+MY_COMMIT="2c6d66f3f1947384038b765c897b102ecdb18298"
 
 SRC_URI=" https://github.com/mkubecek/vmware-host-modules/archive/${MY_COMMIT}.tar.gz -> ${P}-${MY_COMMIT}.tar.gz"
+S="${WORKDIR}/vmware-host-modules-${MY_COMMIT}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
 
-RDEPEND="acct-group/vmware"
-
 RESTRICT="mirror"
 
-S="${WORKDIR}/vmware-host-modules-${MY_COMMIT}"
-
-PATCHES=(
-	"${FILESDIR}/vmware-modules-16.2.5-kernel-6.4.10.patch"
-	"${FILESDIR}/vmware-modules-17.0.2-kernel-6.5.patch"
-)
+RDEPEND="
+	acct-group/vmware
+"
 
 pkg_setup() {
 	CONFIG_CHECK="~HIGH_RES_TIMERS"
@@ -47,7 +43,7 @@ pkg_setup() {
 	CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI ~VMWARE_VMCI_VSOCKETS"
 
 	linux-info_pkg_setup
-	linux-mod_pkg_setup
+	linux-mod-r1_pkg_setup
 
 	if kernel_is gt ${MY_KERNEL_VERSION//./ }; then
 		ewarn
@@ -55,18 +51,10 @@ pkg_setup() {
 		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() {
@@ -80,8 +68,16 @@ src_prepare() {
 	default
 }
 
+src_compile() {
+	for mod in vmmon vmnet; do
+		local modlist+=( ${mod}=misc:"${S}"/${mod}-only )
+	done
+
+	linux-mod-r1_src_compile
+}
+
 src_install() {
-	linux-mod_src_install
+	linux-mod-r1_src_install
 	local udevrules="${T}/60-vmware.rules"
 	cat > "${udevrules}" <<-EOF
 		KERNEL=="vmci",  GROUP="vmware", MODE="660"
@@ -109,12 +105,11 @@ src_install() {
 }
 
 pkg_postinst() {
-	linux-mod_pkg_postinst
+	linux-mod-r1_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 059fde9..2859aaf 100644
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@@ -1,10 +1,7 @@
 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.5.0-22583795.x86_64.bundle 510247285 BLAKE2B 271d690b73f4db432f8ff85595f6c82ef741fa8a3ee8a63bd4889c3674916fc07de7766522af54a47e552abfece0c2b5545bbc749175e8d899e0ef6d24c87377 SHA512 cef8351c7298f4a79319cbb1e288df3dbb825e9dcd3f2c2678551a4dd5744b1b7d146eb780d0b20c16a3b08d3dce05b2a4206264f07291ec4ebc4b0c3e061119
-DIST com.vmware.fusion-16.2.5.20904516.zip.tar 656752640 BLAKE2B 4d535710aff501387293e6d325ae5859d3a4241263ad9357d68508841e2ffbbc039de547bc02bff215ee30cef77174bfef7b77b47ba66424c1aab37467fd1a62 SHA512 e2c18336a66d7b3526df475a218272c6d46020815c8eb7e29df75e98d0e6737773abc5488f54d8e97479e47e43ca3867f16d7c8af772f13492efec773df47bb8
-DIST com.vmware.fusion-17.5.0.22583795.zip.tar 727603200 BLAKE2B d428aec381789ac006389bc8dffdf12dc65f2f127ed752bb7423f66f191cc2f23bd1b5fe0ebac23af186ea1fae6d7319f110df38d3afb1b814da2c6155ed29d4 SHA512 f241cfaf43b81e61446c2a525cc0df9c6de469173612f8bef87154f4cb2ecfffaf1e026a026d5f523c1a91fb65c6e5cdae024b2987913e60b7ff63d280b81a5a
+DIST VMware-Workstation-17.5.2-23775571.x86_64.bundle.tar 201635840 BLAKE2B 3b26976c03359cda1c5cdc7954a9dfd9e57852c120db96a7dde89358ef36f506b6d9d1912834e8fb20f6f38d1aa030bbfbea95ba45c58b05f0475580fa5ea8ce SHA512 6724b4ff19605173a54f2c476084415e9fc89ef6f1863a5a6d96d82f1cc52922a003fa951b14198fed6ee60374541439a24d40f6b47cce8e6bb9c9371a13df52
+DIST com.vmware.fusion-17.5.2.23775571.zip.tar 791531520 BLAKE2B 4b96a4f22744683cb0aedd10d9da0373e31723c58e0b068c492b5721b780a0dbc510c17c4da9aacaa5f26b00a4dd45409446a4266615a005288ed9f8dad3a83b SHA512 b00862714b631c05da83f9776a033ddb867641824b353b198728f298c592be039c4ec8b301a0a84c1043d479c5b4fb6440a2ee9afa8b0010ca4fa4bb60b62107
 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-r4.ebuild 14758 BLAKE2B 173b5b8fe67efb8252f33a5666fa0f0af457f0cda5ca5603acee658a54ca68f36491f08729e4868f2f5026bb81428c8a4c24fb66c2ad08fae5f59b3d8de436ff SHA512 fc2c1e421358857d33617f9abd005fefb68fd21918be8a56f8906b4a76b253aed6d75c86aed508e432a3a907f5b098b118bf4bba3d160a5c535c2c6e3fbc81c3
-EBUILD vmware-workstation-17.5.0.22583795.ebuild 14814 BLAKE2B 594bee3033d35261dc8ebf116d8d07d97e6daeb685bfd3ecad1736c827f1f506e7cc8502902c3c89ca694efbe62e4eae9f713e0bb621193e033d61c8d52cb262 SHA512 225fa63b827047d3cbef8bce17ad21cc1ca403cd7d76b608eae83dfb591f695c2116adb8a63d3831bbb5b68fed6fddcdd7b0969bc2cb54590effee79d03d94ee
+EBUILD vmware-workstation-17.5.2.23775571.ebuild 15051 BLAKE2B 8aea64cea929a487337386d347de605549189649f05321f942b6ca87683d11af4b57c7ef5158067795f738ef18f7ffef612b84bc5086ff6fb9a9c29f89fb0a89 SHA512 0bd9081006249afcc4f9a41b1c023733151fa3a3335f184e08083a849c5c236783d93ce7f4a5d09b5e747e5099e7053d110de60a399e462309cc742adb1e79b0
 MISC metadata.xml 1852 BLAKE2B 3d3241e2fa53d92bd9ffdf6523ea0cb8dd798520656b1e4c8bc20723657704252c6c94d7231f2d047bcf2f5115ba7e3f9df90db718b4be8b103848dfd624a56f SHA512 0e9ff0f750609178cd5fb2ebb91411287ef49e60ce1577bf263f7d7b61555d69f34e23998a36edfc7887bcb7be066e798eb4b2a7773d790047107a7f07609e15
diff --git a/app-emulation/vmware-workstation/vmware-workstation-16.2.5.20904516-r4.ebuild b/app-emulation/vmware-workstation/vmware-workstation-16.2.5.20904516-r4.ebuild
deleted file mode 100644
index e615380..0000000
--- a/app-emulation/vmware-workstation/vmware-workstation-16.2.5.20904516-r4.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_{10..12} )
-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.5.0.22583795.ebuild b/app-emulation/vmware-workstation/vmware-workstation-17.5.2.23775571.ebuild
index 994e781..5bfd58b 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-17.5.0.22583795.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-17.5.2.23775571.ebuild
@@ -1,24 +1,26 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit readme.gentoo-r1 pam python-any-r1 systemd xdg-utils
 
-MY_PN="VMware-Workstation-Full"
+#MY_PN="VMware-Workstation-Full"
+MY_PN="VMware-Workstation"
 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.5.0/22583790" # https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/
+VMWARE_FUSION_VER="13.5.2/23775688" # 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/"
+	#https://download3.vmware.com/software/WKST-${MY_PV//./}-LX/${MY_P}.x86_64.bundle
 SRC_URI="
-	https://download3.vmware.com/software/WKST-${MY_PV//./}-LX/${MY_P}.x86_64.bundle
+	https://softwareupdate.vmware.com/cds/vmw-desktop/ws/${MY_PV}/${PV_BUILD}/linux/core/${MY_P}.x86_64.bundle.tar
 	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 )
@@ -26,6 +28,7 @@ SRC_URI="
 	)
 	systemd? ( https://github.com/akhuettel/systemd-vmware/archive/${SYSTEMD_UNITS_TAG}.tar.gz -> vmware-systemd-${SYSTEMD_UNITS_TAG}.tgz )
 	"
+S=${WORKDIR}/extracted
 
 LICENSE="GPL-2 GPL-3 MIT-with-advertising vmware"
 SLOT="0"
@@ -83,7 +86,6 @@ BDEPEND="
 	app-admin/chrpath
 "
 
-S=${WORKDIR}/extracted
 VM_INSTALL_DIR="/opt/vmware"
 
 QA_PREBUILT="/opt/*"
@@ -140,13 +142,6 @@ src_prepare() {
 		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
@@ -193,7 +188,7 @@ src_install() {
 	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"
+		"${ED}/etc/vmware-installer/bootstrap" || die
 
 	# install the ancillaries
 	insinto /usr
@@ -250,7 +245,9 @@ src_install() {
 		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
+		sed -i \
+			-e 's/readlink/readlink -f/' \
+			"${ED}${VM_INSTALL_DIR}"/lib/vmware-ovftool/ovftool || die
 		dosym ../lib/vmware-ovftool/ovftool "${VM_INSTALL_DIR}"/bin/ovftool
 
 		cd - >/dev/null
@@ -339,23 +336,28 @@ src_install() {
 	if use modules; then
 		# install the init.d script
 		local initscript="${T}/vmware.rc"
-		sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
+		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" \
+	sed -i \
+		-e "s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g" \
+		"${ED}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/gtk-3.0/gdk-pixbuf.loaders || die
+	sed -i \
+		-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" \
+		"${ED}/usr/share/applications/vmware-player.desktop" || die
+	sed -i \
+		-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" \
+		"${ED}/usr/share/applications/vmware-workstation.desktop" || die
+	sed -i \
+		-e "s:@@BINARY@@:${EPREFIX}${VM_INSTALL_DIR}/bin/vmware-netcfg:g" \
 		-e "/^Encoding/d" \
-		-i "${ED}/usr/share/applications/vmware-netcfg.desktop" || die
+		"${ED}/usr/share/applications/vmware-netcfg.desktop" || die
 
 	# install systemd unit files
 	if use systemd; then
@@ -364,6 +366,12 @@ src_install() {
 
 	# enable macOS guests support
 	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 || die
+
 		python3 "${WORKDIR}"/unlocker-*/unlocker.py >/dev/null || die "unlocker.py failed"
 	fi
 
@@ -385,7 +393,9 @@ src_install() {
 				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
+			if [[ -e "vmware-tools-${guest}/${guest}.iso" ]]; then
+				doins "vmware-tools-${guest}/${guest}.iso"
+			fi
 		fi
 	done