app-emulation/*: Update vmware modules

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

8 files changed, 108 insertions, 29 deletions

diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest
index 4d24524..003983a 100644
--- a/app-emulation/vmware-modules/Manifest
+++ b/app-emulation/vmware-modules/Manifest
@@ -1,5 +1,7 @@
-DIST vmware-modules-16.2.5-efc76a69acebb66409af5f267c51ccc027e057e6.tar.gz 477764 BLAKE2B f5735949a8e0a9c2f576e4f10191e65e5f2dc3425faff8a52c35d822d4b6ac08e7afb40cb7cd590eba05159cb28957467b30a0adff70319faf1f619d498e44c2 SHA512 c3442ca9e4a83270ce30a18c8d2de756cf2d894e2ea1478533e4b3ade324272142ddf4f8d11b7ebc22b19303262bb10eabc26f9b2e79da7c7eda31776b382e87
-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
+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 3376 BLAKE2B 368dc10051c34ffbfaffc0f36d8e3ad3d14c135375262fb4925894e848ae8784b45a59c3247a26499c01ca94a39ec6c267562fdcd5555466e6f3be8910fbe9c5 SHA512 cef684aed2d8e01875fec193b3840454e6403b6f4f84d60b120b39826864f0481f0cfe243cd21634930791fcb7b05f3efc2c65982ab816b853c058ccd87ff58b
+EBUILD vmware-modules-17.5.0-r3.ebuild 3252 BLAKE2B 2ec921840376daff7ccfa00087d22c0a5f3e049cf5a3d26b365d29f4e0d756cf4f2f6fe39bb309f02abe3f3f69acb76d34fda70b8188c0b349837454220a31c7 SHA512 5eb2c2fccfb1fd3da6bf1d2a3cb3544361fddb69b651917035895a43617ecea78d416ec165c8f20718c93a21802936cffdac0d63cff939537b5dbbf3f1852c7f
 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
new file mode 100644
index 0000000..10c92fa
--- /dev/null
+++ b/app-emulation/vmware-modules/files/vmware-modules-16.2.5-kernel-6.4.10.patch
@@ -0,0 +1,17 @@
+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
new file mode 100644
index 0000000..412cf82
--- /dev/null
+++ b/app-emulation/vmware-modules/files/vmware-modules-17.0.2-kernel-6.5.patch
@@ -0,0 +1,64 @@
+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/vmware-modules-17.0.2.ebuild b/app-emulation/vmware-modules/vmware-modules-16.2.5-r11.ebuild
index f637afa..59a87df 100644
--- a/app-emulation/vmware-modules/vmware-modules-17.0.2.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-16.2.5-r11.ebuild
@@ -9,15 +9,15 @@ DESCRIPTION="VMware kernel modules"
 HOMEPAGE="https://github.com/mkubecek/vmware-host-modules"
 
 # Highest kernel version known to work:
-MY_KERNEL_VERSION="6.3"
+MY_KERNEL_VERSION="6.7"
 
-# Upstream doesn't want to tag versions or anything that looks like properly
+# 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
 # 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"
+MY_COMMIT="3b4aadaeec916d2d39550808866413736bff4410"
 
 SRC_URI=" https://github.com/mkubecek/vmware-host-modules/archive/${MY_COMMIT}.tar.gz -> ${P}-${MY_COMMIT}.tar.gz"
 
@@ -33,6 +33,11 @@ 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"
+)
+
 pkg_setup() {
 	CONFIG_CHECK="~HIGH_RES_TIMERS"
 	if kernel_is -ge 5 5; then
@@ -41,7 +46,7 @@ pkg_setup() {
 	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"
+	CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI ~VMWARE_VMCI_VSOCKETS"
 
 	linux-info_pkg_setup
 	linux-mod_pkg_setup
diff --git a/app-emulation/vmware-modules/vmware-modules-16.2.5-r4.ebuild b/app-emulation/vmware-modules/vmware-modules-17.5.0-r3.ebuild
index 76ed42a..c8e0260 100644
--- a/app-emulation/vmware-modules/vmware-modules-16.2.5-r4.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-17.5.0-r3.ebuild
@@ -9,15 +9,15 @@ DESCRIPTION="VMware kernel modules"
 HOMEPAGE="https://github.com/mkubecek/vmware-host-modules"
 
 # Highest kernel version known to work:
-MY_KERNEL_VERSION="6.3"
+MY_KERNEL_VERSION="6.7"
 
-# Upstream doesn't want to tag versions or anything that looks like properly
+# 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
 # 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"
+MY_COMMIT="4c2a103fd2d71f2084f1fe7ceacb816b9832ffa2"
 
 SRC_URI=" https://github.com/mkubecek/vmware-host-modules/archive/${MY_COMMIT}.tar.gz -> ${P}-${MY_COMMIT}.tar.gz"
 
@@ -41,7 +41,7 @@ pkg_setup() {
 	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"
+	CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI ~VMWARE_VMCI_VSOCKETS"
 
 	linux-info_pkg_setup
 	linux-mod_pkg_setup
diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
index 3144f63..059fde9 100644
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@@ -1,10 +1,10 @@
 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.2-21581411.x86_64.bundle 538902080 BLAKE2B 40a51a8090c89b6e4e18e7c6d6fa5968c243648e5aa865d0c6c6e237f717b6b5519f1aeba0ed00629b00c8dcc5cc817c008f487eac27a241a347efcf5d440816 SHA512 2451438ab6d1ed8cac9f3179aaa662664ea3918d0ee937eea7b05c3ef2472a0008971073ddc3117e216b1bd64c32ac5ce30107e34cea9cd381b5cc668dd95e37
+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.0.2.21581411.zip.tar 709570560 BLAKE2B ab456cfa234d35cc5c0b87ac41f1c84e8d04094882b773a6e7ac2dfb01d9deff548ac4d9de8c209829080799b2e9d9585c140f13fa257c5077a5e48f9ca87e4d SHA512 a34c1dff8fc053126f2b138cf7f399fce1359575d9ba9e81f9a69abda809fcf516c360301f729484cb8f53a183141734c7432e57d6acb9ae1e85a352079b2805
+DIST com.vmware.fusion-17.5.0.22583795.zip.tar 727603200 BLAKE2B d428aec381789ac006389bc8dffdf12dc65f2f127ed752bb7423f66f191cc2f23bd1b5fe0ebac23af186ea1fae6d7319f110df38d3afb1b814da2c6155ed29d4 SHA512 f241cfaf43b81e61446c2a525cc0df9c6de469173612f8bef87154f4cb2ecfffaf1e026a026d5f523c1a91fb65c6e5cdae024b2987913e60b7ff63d280b81a5a
 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-r3.ebuild 14757 BLAKE2B 8f7ba8f0de2a8ea5cc820afde80dbe2e2465fad1d398af1d687404ab36235c9fd0743434fe94bd3b5dcd775a3cbb5e63bc72d9f79453a4c2bab9b542948c4dd1 SHA512 74d5e6cb2c33d887523008837d6e4b68be3e27e133b2279b5914896f3062fd792ec76ce2fad3d465722d082c1d610a679ef5ef575a1f6a609e42b98d02ecfcba
-EBUILD vmware-workstation-17.0.2.21581411.ebuild 14983 BLAKE2B ee4659c788d4c36f9602de2b7adda1f638a273395bfbcd13981ae5d968c1ef3e28648ec2174b751d552020050daed79316fcccee2e9fe3b8ab3ef8bb3c9ba8ab SHA512 0a143d2de5acfb4d14c8e75748b0adc747b27cd69836ef316d97fd08c186b69e5027411901046dbc9042d1d6475a243608a7d29d959e3de77d5957ab9a740c09
+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
 MISC metadata.xml 1852 BLAKE2B 3d3241e2fa53d92bd9ffdf6523ea0cb8dd798520656b1e4c8bc20723657704252c6c94d7231f2d047bcf2f5115ba7e3f9df90db718b4be8b103848dfd624a56f SHA512 0e9ff0f750609178cd5fb2ebb91411287ef49e60ce1577bf263f7d7b61555d69f34e23998a36edfc7887bcb7be066e798eb4b2a7773d790047107a7f07609e15
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-r4.ebuild
index c956073..e615380 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-16.2.5.20904516-r3.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-16.2.5.20904516-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit readme.gentoo-r1 pam python-any-r1 systemd xdg-utils
 
 MY_PN="VMware-Workstation-Full"
diff --git a/app-emulation/vmware-workstation/vmware-workstation-17.0.2.21581411.ebuild b/app-emulation/vmware-workstation/vmware-workstation-17.5.0.22583795.ebuild
index f5f3191..994e781 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-17.0.2.21581411.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-17.5.0.22583795.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit readme.gentoo-r1 pam python-any-r1 systemd xdg-utils
 
 MY_PN="VMware-Workstation-Full"
@@ -11,7 +11,7 @@ MY_PV=$(ver_cut 1-3)
 PV_MODULES="${MY_PV}"
 PV_BUILD=$(ver_cut 4)
 MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}"
-VMWARE_FUSION_VER="13.0.1/21139760" # https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/
+VMWARE_FUSION_VER="13.5.0/22583790" # https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/
 SYSTEMD_UNITS_TAG="gentoo-02"
 UNLOCKER_VERSION="3.0.5"
 
@@ -32,7 +32,7 @@ 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"
+IUSE="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
@@ -62,7 +62,6 @@ RDEPEND="
 	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
@@ -200,14 +199,6 @@ src_install() {
 	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