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

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

4 files changed, 12 insertions, 165 deletions

diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
index 7923340..ed0cbaa 100644
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@@ -1,9 +1,7 @@
-AUX vmware-15.5.rc 2476 BLAKE2B dff25b43c5fa57186be2a5f0ca4606d26cd1c3f3dbeb91d855fc07a9fd576f446983c852c8e0b112c5616bb95dfddc7e2c738b4d0ca341c781d7addcb45068cd SHA512 9bae224387128b2cd221d509e2933042e3925fb041670907d8a47c70a488214206912fe25ab24c0bdeb31591149e62aba374d3fa63fdd08644e09667e195967f
 AUX vmware-16.1.rc 2476 BLAKE2B dff25b43c5fa57186be2a5f0ca4606d26cd1c3f3dbeb91d855fc07a9fd576f446983c852c8e0b112c5616bb95dfddc7e2c738b4d0ca341c781d7addcb45068cd SHA512 9bae224387128b2cd221d509e2933042e3925fb041670907d8a47c70a488214206912fe25ab24c0bdeb31591149e62aba374d3fa63fdd08644e09667e195967f
-AUX vmware-server-15.5.rc 1506 BLAKE2B 886ed1de7a99320611a28a43b48cf17715fcab8bf533a73c28a1aa2f8d150ee2b84e1e510e864b18347f3bd7e43faec3cfc90f09d5ac9c0afe821f67654a68c4 SHA512 548ff69f87bee2b6c82bd931d22dd560370c4a00641ae47d05af05bbc72cedc8fd25054abc405a590b72227b10c5997d79f16ded67f3e0cfac142eb248b47d44
 DIST VMware-Workstation-Full-16.1.2-17966106.x86_64.bundle 527417929 BLAKE2B de95a77f5a07d296bdcf68f12e96eb875a5c8f574a31b951ec49f917bbac86681fa0a6155e730b1329f5c1ec05a4e653f1ae1625767d65a2acde9b7be4a8d8e4 SHA512 30b5a97a3388cd68639f057ac6202df5654a484b56d14cdc4399b8a75365ee2301bd87b9c150ca708e76c7c3aedd666cfd118375c0631300a91648ce6456ee7d
 DIST com.vmware.fusion-16.1.2.17966106.zip.tar 657377280 BLAKE2B d05d5608c1faa1958bea1219524f60018a8b82fb15e8d5c09f05d5c8153e48366fe6e28d34899fd8eac9ffa0dcb4895d55af1742cb59474bbf5a00f6fcf3511c SHA512 601065cce615580315419c7885958b31566f2c462e7e992795b351a5bcb6b11c1c82bdbbcd172c79c7ceac1bf43dd0bcba02e91e8859591e070907f5cffe3277
 DIST unlocker-3.0.3.tar.gz 13521100 BLAKE2B 5fd3865d55bdc842b98f921e536f36103a69f635eabb741f17e4d6e3b0bda6c0561c082f5921e12c4ca49b9f10c9c12a9ea3be3c154e97979dbdbc3d4658528c SHA512 d83bd1ca0de2ce56d93479ec14d456cfdb7ebae07df631ec67aa3b97c5090ac0af8d2c02ed4373af06e8e980f84b801b78fb2c486cac62397b23e2af521fa020
 DIST vmware-systemd-gentoo-02.tgz 14064 BLAKE2B 24ac2c2f295130f4aadad867ec88d652bd292cc60e6b471bb2e01069fe01d84dac3d8b0ca7690ebf218d663adfe0c1dc889d3f4f53cf3178b68291461260748b SHA512 3a382bfd5f1eb2b218d8012588ea55c1f22786dba35a1fc0fdfdb4e40b05e0e735ed09c6961684f6442e863c3ed72024ce01f19113bbd9ca47c32e3f43c55f42
-EBUILD vmware-workstation-16.1.2.17966106-r1.ebuild 14524 BLAKE2B 2fa4ccddfb88ee4b1c62434d1147511c952d141ffcf4ee68cdd45bddfa0621062a49748acc28b8405110d8f5c55d1258ab863980aa52a2de194653196392ac4a SHA512 202037785ad69894505799f94d7b24570fa8e7bd2633c143cac2a92d36d57d5afb05ef2048f2d3900dab92219f9ee997145f0f9112134485e7016ac8921b83b4
+EBUILD vmware-workstation-16.1.2.17966106-r3.ebuild 14703 BLAKE2B fccac12dac65f9bbdd7a10c0b2176aead2fa7a53c922134694ce0138b12555c75f3bd0e9df2f6ba8500de6fecd710fed6c84fc0a9ee7ddf419aca419071f999f SHA512 06898bc6d926420a34027aade11fa71e90b1ccfe179dbac282259d7c0412966cc5feb47b69eabd9854d9e63258b7935a1452f903b187ff0f285d70589f2e1ac6
 MISC metadata.xml 1852 BLAKE2B 3d3241e2fa53d92bd9ffdf6523ea0cb8dd798520656b1e4c8bc20723657704252c6c94d7231f2d047bcf2f5115ba7e3f9df90db718b4be8b103848dfd624a56f SHA512 0e9ff0f750609178cd5fb2ebb91411287ef49e60ce1577bf263f7d7b61555d69f34e23998a36edfc7887bcb7be066e798eb4b2a7773d790047107a7f07609e15
diff --git a/app-emulation/vmware-workstation/files/vmware-15.5.rc b/app-emulation/vmware-workstation/files/vmware-15.5.rc
deleted file mode 100644
index b627869..0000000
--- a/app-emulation/vmware-workstation/files/vmware-15.5.rc
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need localmount
-	use net
-}
-
-start() {
-	ebegin Starting VMware USB Arbitrator
-	@@BINDIR@@/vmware-usbarbitrator
-	eend $?
-	ebegin Starting VMware services
-
-	# vmci might be:
-	# 1) built as external kernel module
-	# 2) built as internal kernel module (with name vmw_vmci)
-	# 3) embedded in the kernel
-	for mod in /lib/modules/$(uname -r)/misc/vmci.ko \
-		/lib/modules/$(uname -r)/kernel/drivers/misc/vmw_vmci/vmw_vmci.ko ;
-	do
-		if [[ -f "${mod}" ]] ; then
-			modprobe -v $(basename "${mod}" .ko)
-			eend $?
-			break
-		fi
-	done
-
-	# vsock might be:
-	# 1) built as external kernel module
-	# 2) built as internal kernel module (with name vmw_vsock_vmci_transport)
-	# 3) embedded in the kernel
-	for mod in /lib/modules/$(uname -r)/misc/vsock.ko \
-		/lib/modules/$(uname -r)/kernel/net/vmw_vsock/vmw_vsock_vmci_transport.ko ;
-	do
-		if [[ -f "${mod}" ]] ; then
-			modprobe -v $(basename "${mod}" .ko)
-			eend $?
-			break
-		fi
-	done
-
-	# vmblock
-	if [[ -f /lib/modules/$(uname -r)/misc/vmblock.ko ]]; then
-		modprobe -v vmblock
-		eend $?
-	fi
-
-	# vmci or vsock were already loaded by the previous modprobe,
-	# no need to do it here
-	# quiet for vmci because it may not be there
-	modprobe -av vmmon vmnet
-	eend $?
-	@@BINDIR@@/vmware-networks --start
-	eend $?
-}
-
-stop() {
-	ebegin Stopping VMware USB Arbitrator
-	killall --wait vmware-usbarbitrator
-	eend $?
-	@@BINDIR@@/vmware-networks --stop
-	eend $?
-	ebegin Stopping VMware services
-	modprobe -rv vmmon vmnet
-	eend $?
-
-	# vsock might be:
-	# 1) built as external kernel module
-	# 2) built as internal kernel module (with name vmw_vsock_vmci_transport)
-	# 3) embedded in the kernel
-	for mod in /lib/modules/$(uname -r)/misc/vsock.ko \
-		/lib/modules/$(uname -r)/kernel/net/vmw_vsock/vmw_vsock_vmci_transport.ko ;
-	do
-		if [[ -f "${mod}" ]] ; then
-			modprobe -rv $(basename "${mod}" .ko)
-			eend $?
-			break
-		fi
-	done
-
-	# vmci might be:
-	# 1) built as external kernel module
-	# 2) built as internal kernel module (with name vmw_vmci)
-	# 3) embedded in the kernel
-	for mod in /lib/modules/$(uname -r)/misc/vmci.ko \
-		/lib/modules/$(uname -r)/kernel/drivers/misc/vmw_vmci/vmw_vmci.ko ;
-	do
-		if [[ -f "${mod}" ]] ; then
-			modprobe -rv $(basename "${mod}" .ko)
-			eend $?
-			break
-		fi
-	done
-
-	# vmblock
-	if [[ -f /lib/modules/$(uname -r)/misc/vmblock.ko ]]; then
-		modprobe -rv vmblock
-		eend $?
-	fi
-}
diff --git a/app-emulation/vmware-workstation/files/vmware-server-15.5.rc b/app-emulation/vmware-workstation/files/vmware-server-15.5.rc
deleted file mode 100644
index 8f9b7dd..0000000
--- a/app-emulation/vmware-workstation/files/vmware-server-15.5.rc
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need localmount vmware
-	use net
-}
-
-checkconfig() {
-	checkpath -d /var/run/vmware
-
-	# Check if certificates exist.  If not, we need to generate them, ala sshd.
-	if [ ! -e @@ETCDIR@@/ssl/rui.key -o ! -e @@ETCDIR@@/ssl/rui.crt ]; then
-		checkpath -d -m 0600 @@ETCDIR@@/ssl
-		openssl req -x509 -days 365 -newkey rsa:2048 -keyout @@ETCDIR@@/ssl/rui.key -out @@ETCDIR@@/ssl/rui.crt -config @@ETCDIR@@/ssl/hostd.ssl.config
-		checkpath -f -m 0600 @@ETCDIR@@/ssl/rui.key @@ETCDIR@@/ssl/rui.crt
-	fi
-}
-
-start() {
-	checkconfig
-
-	ebegin Starting VMware Authentication Daemon
-	start-stop-daemon --start \
-		--exec @@PREFIX@@/sbin/vmware-authdlauncher
-	eend $?
-	ebegin Starting VMware Workstation Server
-	start-stop-daemon --start \
-		--pidfile /var/run/vmware/vmware-hostd.PID \
-		--exec @@BINDIR@@/vmware-hostd \
-		-- -a -d @@ETCDIR@@/hostd/config.xml
-	eend $?
-}
-
-stop() {
-	ebegin "Shutdown VMs in the AutoStart Sequence"
-	local HOHO_ADMIN="$(@@BINDIR@@/vmware-wssc-adminTool "@@ETCDIR@@/hostd/authorization.xml" 2>/dev/null)"
-
-	if [ "x" != "x${HOHO_ADMIN}" ]; then
-		@@BINDIR@@/vmware-vim-cmd -U "${HOHO_ADMIN}" hostsvc/autostartmanager/autostop
-	fi
-	eend $?
-
-	ebegin Stopping VMware Workstation Server
-	start-stop-daemon --stop \
-		--pidfile /var/run/vmware/vmware-hostd.PID
-	eend $?
-	ebegin Stopping VMware Authentication Daemon
-	killall --wait vmware-authdlauncher
-	eend $?
-}
diff --git a/app-emulation/vmware-workstation/vmware-workstation-16.1.2.17966106-r1.ebuild b/app-emulation/vmware-workstation/vmware-workstation-16.1.2.17966106-r3.ebuild
index 3c8a390..15ca96d 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-16.1.2.17966106-r1.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-16.1.2.17966106-r3.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} )
-inherit eutils readme.gentoo-r1 gnome2-utils pam python-any-r1 systemd xdg-utils
+inherit eutils readme.gentoo-r1 pam python-any-r1 systemd xdg-utils
 
 MY_PN="VMware-Workstation-Full"
 MY_PV=$(ver_cut 1-3)
@@ -82,7 +82,9 @@ DEPEND="
 	${PYTHON_DEPS}
 	>=dev-util/patchelf-0.9
 	modules? ( ~app-emulation/vmware-modules-${PV_MODULES} )
-	ovftool? ( app-admin/chrpath )
+"
+BDEPEND="
+	app-admin/chrpath
 "
 
 S=${WORKDIR}/extracted
@@ -187,6 +189,7 @@ src_install() {
 	# 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
@@ -393,6 +396,10 @@ src_install() {
 		fi
 	done
 
+	# metadata
+	mv "${ED}/usr/share/appdata" "${ED}/usr/share/metainfo"
+
+	# readme
 	readme.gentoo_create_doc
 }
 
@@ -400,19 +407,15 @@ pkg_config() {
 	"${VM_INSTALL_DIR}"/bin/vmware-networks --postinstall ${PN},old,new
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	elog "${DOC_CONTENTS}"
 }
 
 pkg_postrm() {
 	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }