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

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

4 files changed, 21 insertions, 20 deletions

diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest
index 03bb72e..45d6343 100644
--- a/app-emulation/vmware-modules/Manifest
+++ b/app-emulation/vmware-modules/Manifest
@@ -1,3 +1,3 @@
-DIST vmware-modules-15.5.0.zip 590976 BLAKE2B 453e6336ce02896f6703e0c61c0e6a0c8064dac6b1055aa3608f3c9d88f97354fd519c07bf37f1d3afabb94c57122ae5d54048cb0b4f5ea19a22321a816b3f4a SHA512 470f04fc0328a1fa504f1a79203c2f14392812a6d8162487d38d5e2290e2562697505e9f28c28fd9c09e5ce7f3d3bc0faa225ac68c95939efc98e548d926a55e
-EBUILD vmware-modules-15.5.0-r1.ebuild 2455 BLAKE2B f4dfb78f6ff6128902b69eabd7923cae298c90e10b0b7886c0002e159f5aaf74bf4541fc7d943d4d8237491f4698b06f0ee36adcdb80539de2a17327cefbb731 SHA512 da3f30c0804dab753e2c28a3231356e7f02b902ecbc97d1c510886a3eccf5b35ac613157fd026137d40e69dcf64f859651857c1c0d9a13a8f801063b54b686ad
+DIST vmware-modules-15.5.1-5.4.zip 591121 BLAKE2B 7e72cb4dcf96bde3455e6c527ba37e364290ee2b5b67333a9345f385589b036642fe20d5980c510a2e2645653d85cbe1713a88c496bcf7f5f95d4f519adc4e99 SHA512 1d52c681bfeffdfda3cfd4ec7b5982bab879d328789a0c1da47769221eb9deee318f5e1bfa2576a83f9d2002e42ed1f6e9f812950e033eb95c4bfe8f95d85b1f
+EBUILD vmware-modules-15.5.1-r1.ebuild 2476 BLAKE2B 4e4e64318eda34e117afe7ad1c1b7afcac1b6d329b7363967dd28a1d5caa9cff66a86ea4dbd0a7fca0dd9f9e74b60df0c44e41d32c709ca35a2983c8eebcb30c SHA512 93d57141b4e1fd2582413cab9ae7586b830d9c2efbfd900f2b9ca30d5a0ee330af08904ff833eaf42296fcb9d9a663b6998807dc2e16758b6a139214be311f72
 MISC metadata.xml 322 BLAKE2B 178d5a7e0f6a26281fdeb655994b728e1b2e831a9bd7e07d6ed7c5ad2edb04d30bb8543ee5a1440f06e3a9eb1af20810a3e93800291f5feda877a644aacad14a SHA512 8ed1935f376c38b57fdcd973dab5a8dd714b2fbb74108228f3aab19cec95340c93f6ecff03b10fcafd261896efa711f47ef8c301f35fa0fc4490a4fb45f2fd55
diff --git a/app-emulation/vmware-modules/vmware-modules-15.5.0-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-15.5.1-r1.ebuild
index 6e025ba..5ea9bb0 100644
--- a/app-emulation/vmware-modules/vmware-modules-15.5.0-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-15.5.1-r1.ebuild
@@ -8,8 +8,8 @@ inherit eapi7-ver eutils flag-o-matic linux-info linux-mod user udev
 DESCRIPTION="VMware kernel modules"
 HOMEPAGE="https://github.com/mkubecek/vmware-host-modules"
 
-MY_KERNEL_VERSION="5.3"
-SRC_URI="https://github.com/mkubecek/vmware-host-modules/archive/w${PV}-k${MY_KERNEL_VERSION}.zip -> ${P}.zip"
+MY_KERNEL_VERSION="5.4"
+SRC_URI="https://github.com/mkubecek/vmware-host-modules/archive/w${PV}-k${MY_KERNEL_VERSION}.zip -> ${P}-${MY_KERNEL_VERSION}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
index 2025622..a431104 100644
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@@ -1,10 +1,9 @@
 AUX configure-hostd.sh 372 BLAKE2B 0ed2d479a46d69ff8498bfac180f0440fb57fb173fc1a427115872a40a47559725623399652e9663fa8a4ca0d7e020d5445bafb6c37f45449dea341fc9f6cce6 SHA512 87c84f5e51e8b4585a9a55f13771cd8b84f2e4e0bb33679e3a1b23eb84a5be5d523a57b6c770095c1d21712a98e9317bbd215ab027843b0586b35ecf9fb85b49
 AUX vmware-15.5.rc 2476 BLAKE2B dff25b43c5fa57186be2a5f0ca4606d26cd1c3f3dbeb91d855fc07a9fd576f446983c852c8e0b112c5616bb95dfddc7e2c738b4d0ca341c781d7addcb45068cd SHA512 9bae224387128b2cd221d509e2933042e3925fb041670907d8a47c70a488214206912fe25ab24c0bdeb31591149e62aba374d3fa63fdd08644e09667e195967f
 AUX vmware-server-15.5.rc 1506 BLAKE2B 886ed1de7a99320611a28a43b48cf17715fcab8bf533a73c28a1aa2f8d150ee2b84e1e510e864b18347f3bd7e43faec3cfc90f09d5ac9c0afe821f67654a68c4 SHA512 548ff69f87bee2b6c82bd931d22dd560370c4a00641ae47d05af05bbc72cedc8fd25054abc405a590b72227b10c5997d79f16ded67f3e0cfac142eb248b47d44
-DIST VMware-Workstation-Full-15.5.0-14665864.x86_64.bundle 535436416 BLAKE2B 47c8abea912071910000b5f28f47cac0d229b1194fe03b3c58959704bb867062f1bab3de516163adf0487d3079779d09e60a5a66439007d523f293db69c44ca2 SHA512 693f6d666b908864f666b8ed7a33e3020958657e189a151b917e5fdfb1c9a88cb83fda731b684942f521b30543b92f57865b902b01017c40967b5363f2babaed
-DIST com.vmware.fusion.tools.darwin-15.5.0.14665864.zip.tar 2826240 BLAKE2B 648e1ad94d89000f27f8abb61c7251c2d1c53ec76bf13bc54688b4353ea1295ae39861a372a981899c4faed78e17b8f6c15fbff6bbe90b5061783f5f1b2ea4e3 SHA512 479569c70d9c0dea6a04b6d832f4419ae042128b18e7d9f7f7a037a5d32d3eb93fdc87aa7ace8669f5377b8ad65cc1ffd5c81e6b60d38e270c437bd55b724054
-DIST com.vmware.fusion.tools.darwinPre15-15.5.0.14665864.zip.tar 2478080 BLAKE2B 0aa99f074ccf1959d965320210f394b33b1ee7f10877656d5d8985c124890fe5833c03133d9c4b9d8742a1f71e375b375d6dd5722598a5f5eaba74a1591e992f SHA512 76bd675f4880e6267d3dff1fa53a00f8e98cd4806c12aa595d5e13d87b56c5a74cb18cda0a4afc3842e9d1d92f16aa70543d1c012065308a6c96d7e709f16835
+DIST VMware-Workstation-Full-15.5.1-15018445.x86_64.bundle 535555604 BLAKE2B 97f4071bfd4f42683463bedcb5637671166281ccc8083f96f47843657f0eb0f1fa0e2decd4748d2d52f4bbac45bf393e0353e0093d0e8fdbe1c80f4fda434c9d SHA512 34fc2033b43587c9a9dcdef64b5d2fa5bef1f8d26264318a99fa3380eeb1b991c7085046cf30fbb8544a79763836be01d3c111c7e81f3ac825ba23d5d016ae38
+DIST com.vmware.fusion-15.5.1.15018445.zip.tar 548044800 BLAKE2B 2c18772cb85a5fadc69d6b042868964ea3883a47888b338ed0d943b9438ecec81b967f890d646e6883a502d0f73f614c1cfef92eeb63e57cf1bf31b95ad21b7a SHA512 44aebcfa3bed8bfe97069e81f201058300a4b9b5e1b1b77da07a75150ccbe28909f33cd74cb93e91a0fe6bfb37e4db2b59a2677832f08c74d8896dcb90049c52
 DIST unlocker-3.0.2.tar.gz 15984801 BLAKE2B e157ed24ad6cea1ab16dd5fc11935b7cdbb3fb0a1e0a9c059eb100f0c57508b749884111b93a9f272ad2c5a9ecd4fadb177ccac47d7688665c5fa8f100fcd2b1 SHA512 83a390562761791531574c05d2a5caacd936b45b32f26a1e5ba953ce32e27af29cb3ac0984c552c2eb9cfdf033d4b95fae1c33a70f2b169563d74d1ea188dacf
 DIST vmware-systemd-gentoo-02.tgz 14064 BLAKE2B 24ac2c2f295130f4aadad867ec88d652bd292cc60e6b471bb2e01069fe01d84dac3d8b0ca7690ebf218d663adfe0c1dc889d3f4f53cf3178b68291461260748b SHA512 3a382bfd5f1eb2b218d8012588ea55c1f22786dba35a1fc0fdfdb4e40b05e0e735ed09c6961684f6442e863c3ed72024ce01f19113bbd9ca47c32e3f43c55f42
-EBUILD vmware-workstation-15.5.0.14665864-r4.ebuild 18511 BLAKE2B b14aa59425e509524a9aeb8b8b1869eda7155ee77a915de190b2d443e66d42f4058e013098ac263d726407df24b5800a19a2952f3720993b52a81d6938747523 SHA512 6135bab7e08bbf60a837f5ed755b0535e362b74d3ab6800400ea6568066a68e45ca6df2332506fbc2c9ea588590f69a818218b0d796684284409666f98a1bcbe
+EBUILD vmware-workstation-15.5.1.15018445-r1.ebuild 18588 BLAKE2B 64000b9e6dbb53cf23677f78fa388cd1c006816d9c06b63579c37d402ee19e32daecec924a239c6dacda6d0dc604bb79ed7024d2f9055f8a5bd2aed78f0f2b56 SHA512 94107dc18464d9373bac96a41610513e453ab121ffb4a72f7b6c4d9282171c282847efc897128ce260c380b76cc1654deded7a274d6a694e411adba546d7ad8d
 MISC metadata.xml 1852 BLAKE2B 3d3241e2fa53d92bd9ffdf6523ea0cb8dd798520656b1e4c8bc20723657704252c6c94d7231f2d047bcf2f5115ba7e3f9df90db718b4be8b103848dfd624a56f SHA512 0e9ff0f750609178cd5fb2ebb91411287ef49e60ce1577bf263f7d7b61555d69f34e23998a36edfc7887bcb7be066e798eb4b2a7773d790047107a7f07609e15
diff --git a/app-emulation/vmware-workstation/vmware-workstation-15.5.0.14665864-r4.ebuild b/app-emulation/vmware-workstation/vmware-workstation-15.5.1.15018445-r1.ebuild
index aaf39c3..fe0ae2e 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-15.5.0.14665864-r4.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-15.5.1.15018445-r1.ebuild
@@ -10,7 +10,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="11.1.0/13668589" # https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/
+VMWARE_FUSION_VER="11.5.1/15018442" # https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/
 SYSTEMD_UNITS_TAG="gentoo-02"
 
 DESCRIPTION="Emulate a complete PC without the performance overhead of most emulators"
@@ -19,8 +19,8 @@ SRC_URI="
 	https://download3.vmware.com/software/wkst/file/${MY_P}.x86_64.bundle
 	macos-guests? (
 		https://github.com/DrDonk/unlocker/archive/3.0.2.tar.gz -> unlocker-3.0.2.tar.gz
-		vmware-tools-darwinPre15? ( https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/${VMWARE_FUSION_VER}/packages/com.vmware.fusion.tools.darwinPre15.zip.tar -> com.vmware.fusion.tools.darwinPre15-${PV}.zip.tar )
-		vmware-tools-darwin? ( https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/${VMWARE_FUSION_VER}/packages/com.vmware.fusion.tools.darwin.zip.tar -> com.vmware.fusion.tools.darwin-${PV}.zip.tar )
+		vmware-tools-darwinPre15? ( https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/${VMWARE_FUSION_VER}/core/com.vmware.fusion.zip.tar -> com.vmware.fusion-${PV}.zip.tar )
+		vmware-tools-darwin? ( https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/${VMWARE_FUSION_VER}/core/com.vmware.fusion.zip.tar -> com.vmware.fusion-${PV}.zip.tar )
 	)
 	systemd? ( https://github.com/akhuettel/systemd-vmware/archive/${SYSTEMD_UNITS_TAG}.tar.gz -> vmware-systemd-${SYSTEMD_UNITS_TAG}.tgz )
 	"
@@ -53,7 +53,7 @@ RDEPEND="
 	dev-libs/gmp:0
 	dev-libs/icu
 	dev-libs/json-c
-	dev-libs/nettle:0/6.2
+	dev-libs/nettle:0
 	gnome-base/dconf
 	gnome-base/gconf
 	gnome-base/libgnome-keyring
@@ -118,14 +118,16 @@ src_unpack() {
 		rm -r extracted/vmware-vix-core extracted/vmware-vix-lib-Workstation* || die "unable to remove dir"
 	fi
 
-	for guest in ${DARWIN_GUESTS}; do
-		if use vmware-tools-${guest}; then
-			mkdir extracted/vmware-tools-${guest}
-			unzip -q com.vmware.fusion.tools.${guest}.zip payload/\*
-			mv payload/* extracted/vmware-tools-${guest}/
-			rm -r payload com.vmware.fusion.tools.${guest}.zip
-		fi
-	done
+	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() {