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

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

3 files changed, 13 insertions, 17 deletions

diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
index 4595a1b..16407c3 100644
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@@ -11,6 +11,6 @@ DIST com.vmware.fusion.tools.darwinPre15-14.1.7.12989993.zip.tar 2478080 BLAKE2B
 DIST com.vmware.fusion.tools.darwinPre15-15.1.0.13591040.zip.tar 2478080 BLAKE2B 0aa99f074ccf1959d965320210f394b33b1ee7f10877656d5d8985c124890fe5833c03133d9c4b9d8742a1f71e375b375d6dd5722598a5f5eaba74a1591e992f SHA512 76bd675f4880e6267d3dff1fa53a00f8e98cd4806c12aa595d5e13d87b56c5a74cb18cda0a4afc3842e9d1d92f16aa70543d1c012065308a6c96d7e709f16835
 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-14.1.7.12989993-r3.ebuild 21388 BLAKE2B b9e56059330efedc351adeb76c594760de97a4644edf34caaf1c44b19284e574badeafa3fd4dc22ac200da4fa64775f0c6588443b6235326f971b535d1b2ffdd SHA512 9a8691c7c91e99519dbad0f04232b46e5524408a8e1fb380a885f219753a15f9ecb4215655086fc4b0f7ccb2b395c931d7172ee50c31940deafe2b0c84a8b13b
-EBUILD vmware-workstation-15.1.0.13591040-r2.ebuild 21559 BLAKE2B 60914931898300ae8b9599fd102e91217937e256a0fd5764ad9ddc7a225ee320a1cb883c7692ca6d58613e67a6534e3f94e5345994bce393107c92c4e36406c5 SHA512 f97649dad43e7e17b65cfd6b307836c34358cf5366d357c29435fec2c7cae50b8071ab29e54ab52292bdb812a16e3dcbbed819270e4946e6e656ea9be273972a
+EBUILD vmware-workstation-14.1.7.12989993-r6.ebuild 21727 BLAKE2B 26e718024c1e99e001c1f3774f222f3745dadf5590bc4f349463a1935eaf3fa20f1cd26892e2489c85c082f4627665823429d1dc3afa632655f015b9143acd4b SHA512 a642693976c732b6ad2ec9d543c6919d8d343d1f8479ca123f7374fc847727c170ea1943ac03c7ec480f9f6e2f5c6ed005e13eba0a821d56a1818271961d269b
+EBUILD vmware-workstation-15.1.0.13591040-r4.ebuild 21584 BLAKE2B 1aa78c8401292898ff69ded072ace31897e47806c0fcb77cab765ffb652183edbd753da85b2c3e84fc9a28b49baed03dd2e8e7bae5f2c7d5576572ca8f20d544 SHA512 0f500e6d3b28b9fbae8cda498be020c19052cee44de1a182600be29a686c48104695d4c727dc1d057dc8f2be7a54b46aea6c3b0b9322781e03a6013b82c6dc26
 MISC metadata.xml 2031 BLAKE2B 00e17d5cc895b1d1c12263653b9824fb3340e4a8ea7bfb44f878ab7c3b59db2238d71a8b4daedd2b7307206c6aba9dbf7ab7410f845cb9a6362fda41b11c06fd SHA512 1c1ed18e2cd0c2112c2e6dfeded9a3bc9c9d554d926e411c2c49d90c36c17941996c9d0ff62a3ab6f8df8ad0cd22b6a72d1889a4017dffae8a27f974ac8a7212
diff --git a/app-emulation/vmware-workstation/vmware-workstation-14.1.7.12989993-r3.ebuild b/app-emulation/vmware-workstation/vmware-workstation-14.1.7.12989993-r6.ebuild
index 6266c88..d329c02 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-14.1.7.12989993-r3.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-14.1.7.12989993-r6.ebuild
@@ -27,8 +27,8 @@ SRC_URI="
 
 LICENSE="GPL-2 GPL-3 MIT-with-advertising vmware"
 SLOT="0"
-KEYWORDS="~amd64"
-IUSE="bundled-libs cups doc macos-guests +modules ovftool server systemd vix"
+KEYWORDS=""
+IUSE="+bundled-libs cups doc macos-guests +modules ovftool server 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
@@ -180,7 +180,7 @@ RDEPEND="
 	dev-libs/icu
 	dev-libs/json-c
 	dev-libs/nettle:0/6.2
-	gnome-base/dconf
+	<gnome-base/dconf-0.30.1
 	gnome-base/gconf
 	gnome-base/libgnome-keyring
 	media-gfx/graphite2
@@ -226,11 +226,6 @@ QA_WX_LOAD="opt/vmware/lib/vmware/tools-upgraders/vmware-tools-upgrader-32 opt/v
 # 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}"
@@ -470,6 +465,8 @@ src_install() {
 	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
@@ -704,6 +701,8 @@ pkg_postinst() {
 	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
+	ewarn "This version has reached its 'end of general support' from VMware: https://www.vmware.com/content/dam/digitalmarketing/vmware/en/pdf/support/product-lifecycle-matrix.pdf"
+	ewarn "If you choose to use this instead of the newer version and you're affected by some security issue, you have only yourself to blame."
 	readme.gentoo_print_elog
 }
 
diff --git a/app-emulation/vmware-workstation/vmware-workstation-15.1.0.13591040-r2.ebuild b/app-emulation/vmware-workstation/vmware-workstation-15.1.0.13591040-r4.ebuild
index ff40b1a..b19a239 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-15.1.0.13591040-r2.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-15.1.0.13591040-r4.ebuild
@@ -33,7 +33,7 @@ SRC_URI="
 LICENSE="GPL-2 GPL-3 MIT-with-advertising vmware"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="bundled-libs cups doc macos-guests +modules ovftool server systemd vix"
+IUSE="+bundled-libs cups doc macos-guests +modules ovftool server 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
@@ -185,7 +185,7 @@ RDEPEND="
 	dev-libs/icu
 	dev-libs/json-c
 	dev-libs/nettle:0/6.2
-	gnome-base/dconf
+	<gnome-base/dconf-0.30.1
 	gnome-base/gconf
 	gnome-base/libgnome-keyring
 	media-gfx/graphite2
@@ -231,11 +231,6 @@ QA_WX_LOAD="opt/vmware/lib/vmware/tools-upgraders/vmware-tools-upgrader-32 opt/v
 # 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}"
@@ -475,6 +470,8 @@ src_install() {
 	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