Merge branch 'master' of git://git.gentoo.org/proj/vmware

16 files changed, 421 insertions, 205 deletions

diff --git a/app-emulation/vmware-modules/files/304-4.6-00-user-pages.patch b/app-emulation/vmware-modules/files/304-4.6-00-user-pages.patch
new file mode 100644
index 0000000..dc677c2
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-4.6-00-user-pages.patch
@@ -0,0 +1,84 @@
+--- ./vmci-only/linux/driver.c.old	2016-05-19 19:00:09.784669042 +0200
++++ ./vmci-only/linux/driver.c	2016-05-19 19:00:47.480671150 +0200
+@@ -1468,7 +1468,11 @@
+    int retval;
+ 
+    down_read(&current->mm->mmap_sem);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 99)
++   retval = get_user_pages(addr,
++#else
+    retval = get_user_pages(current, current->mm, addr,
++#endif
+                            1, 1, 0, &page, NULL);
+    up_read(&current->mm->mmap_sem);
+ 
+--- ./vmci-only/linux/vmciKernelIf.c.old	2016-05-19 18:57:04.344658673 +0200
++++ ./vmci-only/linux/vmciKernelIf.c	2016-05-19 19:03:28.600680159 +0200
+@@ -1835,7 +1835,11 @@
+       if (dirty) {
+          set_page_dirty(pages[i]);
+       }
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 99)
++      put_page(pages[i]);
++#else
+       page_cache_release(pages[i]);
++#endif
+       pages[i] = NULL;
+    }
+ }
+@@ -2049,9 +2053,13 @@
+    int err = VMCI_SUCCESS;
+ 
+    down_write(&current->mm->mmap_sem);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 99)
++   retval = get_user_pages((VA)produceUVA,
++#else
+    retval = get_user_pages(current,
+                            current->mm,
+                            (VA)produceUVA,
++#endif
+                            produceQ->kernelIf->numPages,
+                            1, 0,
+                            produceQ->kernelIf->u.h.headerPage,
+@@ -2063,9 +2071,13 @@
+       goto out;
+    }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 99)
++   retval = get_user_pages((VA)consumeUVA,
++#else
+    retval = get_user_pages(current,
+                            current->mm,
+                            (VA)consumeUVA,
++#endif
+                            consumeQ->kernelIf->numPages,
+                            1, 0,
+                            consumeQ->kernelIf->u.h.headerPage,
+--- ./vmmon-only/linux/hostif.c.old	2016-05-19 18:50:42.872637343 +0200
++++ ./vmmon-only/linux/hostif.c	2016-05-19 18:53:40.208647259 +0200
+@@ -1163,7 +1163,11 @@
+    int retval;
+ 
+    down_read(&current->mm->mmap_sem);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 99)
++   retval = get_user_pages((unsigned long)uvAddr,
++#else
+    retval = get_user_pages(current, current->mm, (unsigned long)uvAddr,
++#endif
+                            numPages, 0, 0, ppages, NULL);
+    up_read(&current->mm->mmap_sem);
+ 
+--- ./vmnet-only/userif.c.old	2016-05-19 18:52:45.904644222 +0200
++++ ./vmnet-only/userif.c	2016-05-19 18:53:28.599646610 +0200
+@@ -113,7 +113,11 @@
+    int retval;
+ 
+    down_read(&current->mm->mmap_sem);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 99)
++   retval = get_user_pages(addr,
++#else
+    retval = get_user_pages(current, current->mm, addr,
++#endif
+ 			   1, 1, 0, &page, NULL);
+    up_read(&current->mm->mmap_sem);
+ 
diff --git a/app-emulation/vmware-modules/files/304-4.7-00-trans_start.patch b/app-emulation/vmware-modules/files/304-4.7-00-trans_start.patch
new file mode 100644
index 0000000..751924f
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-4.7-00-trans_start.patch
@@ -0,0 +1,11 @@
+--- ./vmnet-only/netif.c.old	2016-05-19 20:13:14.259914206 +0200
++++ ./vmnet-only/netif.c	2016-05-19 20:13:21.250914596 +0200
+@@ -465,7 +465,7 @@
+    VNetSend(&netIf->port.jack, skb);
+ 
+    netIf->stats.tx_packets++;
+-   dev->trans_start = jiffies;
++   netif_trans_update(dev);
+ 
+    return 0;
+ }
diff --git a/app-emulation/vmware-modules/files/304-4.7-01-readlink_copy.patch b/app-emulation/vmware-modules/files/304-4.7-01-readlink_copy.patch
new file mode 100644
index 0000000..5fccd97
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-4.7-01-readlink_copy.patch
@@ -0,0 +1,16 @@
+--- vmblock-only/linux/inode.c	2016-08-03 19:26:15.293707751 +0200
++++ vmblock-only/linux/inode.c.new	2016-08-03 21:37:42.199148756 +0200
+@@ -205,10 +205,11 @@
+ 
+ #if LINUX_VERSION_CODE <= KERNEL_VERSION(3, 14, 99)
+ 	return vfs_readlink(dentry, buffer, buflen, iinfo->name);
++#elif LINUX_VERSION_CODE <= KERNEL_VERSION(4, 6, 99)
++    return readlink_copy(buffer, buflen, iinfo->name);
+ #else
+-       return readlink_copy(buffer, buflen, iinfo->name);
++    return generic_readlink(dentry, buffer, buflen);
+ #endif
+-
+ }
+ 
+ 
diff --git a/app-emulation/vmware-modules/files/304-hardened.patch b/app-emulation/vmware-modules/files/304-hardened.patch
index cc3e041..822bd57 100644
--- a/app-emulation/vmware-modules/files/304-hardened.patch
+++ b/app-emulation/vmware-modules/files/304-hardened.patch
@@ -1,8 +1,6 @@
-diff --git a/vmmon-only/linux/driver.c b/vmmon-only/linux/driver.c
-index b21dd44..960c2aa 100644
---- a/vmmon-only/linux/driver.c
-+++ b/vmmon-only/linux/driver.c
-@@ -178,7 +178,22 @@ static struct vm_operations_struct vmuser_mops = {
+--- vmmon-only/linux/driver.c.orig	2016-07-28 22:10:27.464215083 +0200
++++ vmmon-only/linux/driver.c	2016-07-28 22:54:20.796362329 +0200
+@@ -124,7 +124,16 @@ static struct vm_operations_struct vmuse
  #endif
  };
  
@@ -10,25 +8,19 @@ index b21dd44..960c2aa 100644
 +static struct file_operations vmuser_fops = {
 +   .owner = THIS_MODULE,
 +   .poll = LinuxDriverPoll,
-+#ifdef HAVE_UNLOCKED_IOCTL
-+   .unlocked_ioctl = LinuxDriver_UnlockedIoctl,
-+#else
-+   .ioctl = LinuxDriver_Ioctl,
-+#endif
-+#ifdef HAVE_COMPAT_IOCTL
-+   .compat_ioctl = LinuxDriver_UnlockedIoctl,
-+#endif
++   .unlocked_ioctl = LinuxDriver_Ioctl,
++   .compat_ioctl = LinuxDriver_Ioctl,
 +   .open = LinuxDriver_Open,
 +   .release = LinuxDriver_Close,
 +   .mmap = LinuxDriverMmap
 +};
 +
  static struct timer_list tscTimer;
- 
- /*
-@@ -357,27 +372,6 @@ init_module(void)
-    spin_lock_init(&linuxState.pollListLock);
- #endif
+ static Atomic_uint32 tsckHz;
+ static VmTimeStart tsckHzStartTime;
+@@ -317,21 +326,6 @@ init_module(void)
+    linuxState.fastClockPriority = -20;
+    linuxState.swapSize = VMMON_UNKNOWN_SWAP_SIZE;
  
 -   /*
 -    * Initialize the file_operations structure. Because this code is always
@@ -39,14 +31,8 @@ index b21dd44..960c2aa 100644
 -   memset(&vmuser_fops, 0, sizeof vmuser_fops);
 -   vmuser_fops.owner = THIS_MODULE;
 -   vmuser_fops.poll = LinuxDriverPoll;
--#ifdef HAVE_UNLOCKED_IOCTL
--   vmuser_fops.unlocked_ioctl = LinuxDriver_UnlockedIoctl;
--#else
--   vmuser_fops.ioctl = LinuxDriver_Ioctl;
--#endif
--#ifdef HAVE_COMPAT_IOCTL
--   vmuser_fops.compat_ioctl = LinuxDriver_UnlockedIoctl;
--#endif
+-   vmuser_fops.unlocked_ioctl = LinuxDriver_Ioctl;
+-   vmuser_fops.compat_ioctl = LinuxDriver_Ioctl;
 -   vmuser_fops.open = LinuxDriver_Open;
 -   vmuser_fops.release = LinuxDriver_Close;
 -   vmuser_fops.mmap = LinuxDriverMmap;
@@ -54,13 +40,11 @@ index b21dd44..960c2aa 100644
  #ifdef VMX86_DEVEL
     devel_init_module();
     linuxState.minor = 0;
-diff --git a/vmnet-only/driver.c b/vmnet-only/driver.c
-index b12b982..40bd4cf 100644
---- a/vmnet-only/driver.c
-+++ b/vmnet-only/driver.c
-@@ -165,7 +165,22 @@ static long  VNetFileOpUnlockedIoctl(struct file * filp,
+--- vmnet-only/driver.c.orig	2016-04-15 01:48:48.000000000 +0200
++++ vmnet-only/driver.c	2016-07-28 22:54:20.797362329 +0200
+@@ -137,7 +137,16 @@ static ssize_t  VNetFileOpWrite(struct f
+ static long  VNetFileOpUnlockedIoctl(struct file * filp,
                                       unsigned int iocmd, unsigned long ioarg);
- #endif
  
 -static struct file_operations vnetFileOps;
 +static struct file_operations vnetFileOps = {
@@ -68,21 +52,15 @@ index b12b982..40bd4cf 100644
 +   .read = VNetFileOpRead,
 +   .write = VNetFileOpWrite,
 +   .poll = VNetFileOpPoll,
-+#ifdef HAVE_UNLOCKED_IOCTL
 +   .unlocked_ioctl = VNetFileOpUnlockedIoctl,
-+#else
-+   .ioctl = VNetFileOpIoctl,
-+#endif
-+#ifdef HAVE_COMPAT_IOCTL
 +   .compat_ioctl = VNetFileOpUnlockedIoctl,
-+#endif
 +   .open = VNetFileOpOpen,
 +   .release = VNetFileOpClose
 +};
  
  /*
   * Utility functions
-@@ -476,28 +491,6 @@ init_module(void)
+@@ -317,22 +326,6 @@ init_module(void)
        goto err_proto;
     }
  
@@ -97,14 +75,8 @@ index b12b982..40bd4cf 100644
 -   vnetFileOps.read = VNetFileOpRead;
 -   vnetFileOps.write = VNetFileOpWrite;
 -   vnetFileOps.poll = VNetFileOpPoll;
--#ifdef HAVE_UNLOCKED_IOCTL
 -   vnetFileOps.unlocked_ioctl = VNetFileOpUnlockedIoctl;
--#else
--   vnetFileOps.ioctl = VNetFileOpIoctl;
--#endif
--#ifdef HAVE_COMPAT_IOCTL
 -   vnetFileOps.compat_ioctl = VNetFileOpUnlockedIoctl;
--#endif
 -   vnetFileOps.open = VNetFileOpOpen;
 -   vnetFileOps.release = VNetFileOpClose;
 -
diff --git a/app-emulation/vmware-modules/files/308-4.05-00-vmblock-follow_link.patch b/app-emulation/vmware-modules/files/308-4.05-00-vmblock-follow_link.patch
index c139292..03311b0 100644
--- a/app-emulation/vmware-modules/files/308-4.05-00-vmblock-follow_link.patch
+++ b/app-emulation/vmware-modules/files/308-4.05-00-vmblock-follow_link.patch
@@ -1,12 +1,12 @@
---- vmblock-only/linux/inode.c	2016-01-30 19:13:04.019947435 +0100
-+++ vmblock-only/linux/inode.c.new	2016-01-30 19:13:56.226950354 +0100
+--- vmblock-only/linux/inode.c.old	2016-05-27 15:12:49.315632906 +0200
++++ vmblock-only/linux/inode.c	2016-05-27 22:57:39.550192422 +0200
 @@ -44,7 +44,9 @@
  static int InodeOpReadlink(struct dentry *, char __user *, int);
  #endif
-
+ 
 -#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99)
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 99)
-+static const char *InodeOpFollowlink(struct dentry *dentry, struct inode *inode, void **cookie);
++static const char *InodeOpFollowlink(struct dentry *dentry, struct inode *inode, struct delayed_call *done);
 +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99)
  static const char *InodeOpFollowlink(struct dentry *dentry, void **cookie);
  #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
@@ -21,21 +21,23 @@
     .follow_link = InodeOpFollowlink,
 +#endif
  };
-
+ 
  /*
-@@ -231,6 +237,9 @@
+@@ -231,7 +237,10 @@
  static int
  #endif
  InodeOpFollowlink(struct dentry *dentry,  // IN : dentry of symlink
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99)
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 99)
 +                  struct inode *inode,
-+#endif
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99)
++                  struct delayed_call *done)
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99)
                    void **cookie)          // OUT: stores opaque pointer
  #else
-@@ -241,12 +250,20 @@
+                   struct nameidata *nd)   // OUT: stores result
+@@ -241,18 +250,28 @@
     VMBlockInodeInfo *iinfo;
-
+ 
     if (!dentry) {
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 99)
 +      ret = -ECHILD;
@@ -45,7 +47,7 @@
 +#endif
        goto out;
     }
-
+ 
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 99)
 +   iinfo = INODE_TO_IINFO(inode);
 +#else
@@ -54,3 +56,12 @@
     if (!iinfo) {
        ret = -EINVAL;
        goto out;
+    }
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 99)
++   return iinfo->name;
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99)
+    return *cookie = iinfo->name;
+ #else
+    nd_set_link(nd, iinfo->name);
diff --git a/app-emulation/vmware-modules/files/308-4.06-00-user-pages.patch b/app-emulation/vmware-modules/files/308-4.06-00-user-pages.patch
new file mode 100644
index 0000000..dc677c2
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-4.06-00-user-pages.patch
@@ -0,0 +1,84 @@
+--- ./vmci-only/linux/driver.c.old	2016-05-19 19:00:09.784669042 +0200
++++ ./vmci-only/linux/driver.c	2016-05-19 19:00:47.480671150 +0200
+@@ -1468,7 +1468,11 @@
+    int retval;
+ 
+    down_read(&current->mm->mmap_sem);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 99)
++   retval = get_user_pages(addr,
++#else
+    retval = get_user_pages(current, current->mm, addr,
++#endif
+                            1, 1, 0, &page, NULL);
+    up_read(&current->mm->mmap_sem);
+ 
+--- ./vmci-only/linux/vmciKernelIf.c.old	2016-05-19 18:57:04.344658673 +0200
++++ ./vmci-only/linux/vmciKernelIf.c	2016-05-19 19:03:28.600680159 +0200
+@@ -1835,7 +1835,11 @@
+       if (dirty) {
+          set_page_dirty(pages[i]);
+       }
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 99)
++      put_page(pages[i]);
++#else
+       page_cache_release(pages[i]);
++#endif
+       pages[i] = NULL;
+    }
+ }
+@@ -2049,9 +2053,13 @@
+    int err = VMCI_SUCCESS;
+ 
+    down_write(&current->mm->mmap_sem);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 99)
++   retval = get_user_pages((VA)produceUVA,
++#else
+    retval = get_user_pages(current,
+                            current->mm,
+                            (VA)produceUVA,
++#endif
+                            produceQ->kernelIf->numPages,
+                            1, 0,
+                            produceQ->kernelIf->u.h.headerPage,
+@@ -2063,9 +2071,13 @@
+       goto out;
+    }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 99)
++   retval = get_user_pages((VA)consumeUVA,
++#else
+    retval = get_user_pages(current,
+                            current->mm,
+                            (VA)consumeUVA,
++#endif
+                            consumeQ->kernelIf->numPages,
+                            1, 0,
+                            consumeQ->kernelIf->u.h.headerPage,
+--- ./vmmon-only/linux/hostif.c.old	2016-05-19 18:50:42.872637343 +0200
++++ ./vmmon-only/linux/hostif.c	2016-05-19 18:53:40.208647259 +0200
+@@ -1163,7 +1163,11 @@
+    int retval;
+ 
+    down_read(&current->mm->mmap_sem);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 99)
++   retval = get_user_pages((unsigned long)uvAddr,
++#else
+    retval = get_user_pages(current, current->mm, (unsigned long)uvAddr,
++#endif
+                            numPages, 0, 0, ppages, NULL);
+    up_read(&current->mm->mmap_sem);
+ 
+--- ./vmnet-only/userif.c.old	2016-05-19 18:52:45.904644222 +0200
++++ ./vmnet-only/userif.c	2016-05-19 18:53:28.599646610 +0200
+@@ -113,7 +113,11 @@
+    int retval;
+ 
+    down_read(&current->mm->mmap_sem);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 99)
++   retval = get_user_pages(addr,
++#else
+    retval = get_user_pages(current, current->mm, addr,
++#endif
+ 			   1, 1, 0, &page, NULL);
+    up_read(&current->mm->mmap_sem);
+ 
diff --git a/app-emulation/vmware-modules/files/308-4.07-00-trans_start.patch b/app-emulation/vmware-modules/files/308-4.07-00-trans_start.patch
new file mode 100644
index 0000000..751924f
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-4.07-00-trans_start.patch
@@ -0,0 +1,11 @@
+--- ./vmnet-only/netif.c.old	2016-05-19 20:13:14.259914206 +0200
++++ ./vmnet-only/netif.c	2016-05-19 20:13:21.250914596 +0200
+@@ -465,7 +465,7 @@
+    VNetSend(&netIf->port.jack, skb);
+ 
+    netIf->stats.tx_packets++;
+-   dev->trans_start = jiffies;
++   netif_trans_update(dev);
+ 
+    return 0;
+ }
diff --git a/app-emulation/vmware-modules/files/308-4.07-01-readlink_copy.patch b/app-emulation/vmware-modules/files/308-4.07-01-readlink_copy.patch
new file mode 100644
index 0000000..5fccd97
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-4.07-01-readlink_copy.patch
@@ -0,0 +1,16 @@
+--- vmblock-only/linux/inode.c	2016-08-03 19:26:15.293707751 +0200
++++ vmblock-only/linux/inode.c.new	2016-08-03 21:37:42.199148756 +0200
+@@ -205,10 +205,11 @@
+ 
+ #if LINUX_VERSION_CODE <= KERNEL_VERSION(3, 14, 99)
+ 	return vfs_readlink(dentry, buffer, buflen, iinfo->name);
++#elif LINUX_VERSION_CODE <= KERNEL_VERSION(4, 6, 99)
++    return readlink_copy(buffer, buflen, iinfo->name);
+ #else
+-       return readlink_copy(buffer, buflen, iinfo->name);
++    return generic_readlink(dentry, buffer, buflen);
+ #endif
+-
+ }
+ 
+ 
diff --git a/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild
index 86bea59..ba97b17 100644
--- a/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild
@@ -101,6 +101,9 @@ src_prepare() {
 	kernel_is ge 4 2 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.2-03-vsock.patch"
 	kernel_is ge 4 3 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.3-00-misc_deregister.patch"
 	kernel_is ge 4 5 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.5-00-get_link.patch"
+	kernel_is ge 4 6 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.6-00-user-pages.patch"
+	kernel_is ge 4 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.7-00-trans_start.patch"
+	kernel_is ge 4 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.7-01-readlink_copy.patch"
 
 	# Allow user patches so they can support RC kernels and whatever else
 	epatch_user
diff --git a/app-emulation/vmware-modules/vmware-modules-308.1.0.ebuild b/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild
index 0412eca..da4a7a1 100644
--- a/app-emulation/vmware-modules/vmware-modules-308.1.0.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild
@@ -101,6 +101,9 @@ src_prepare() {
 	kernel_is ge 4 2 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.02-01-sk_alloc.patch"
 	kernel_is ge 4 3 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.03-00-vmci-misc_deregister.patch"
 	kernel_is ge 4 5 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.05-00-vmblock-follow_link.patch"
+	kernel_is ge 4 6 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.06-00-user-pages.patch"
+	kernel_is ge 4 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.07-00-trans_start.patch"
+	kernel_is ge 4 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.07-01-readlink_copy.patch"
 
 	# Allow user patches so they can support RC kernels and whatever else
 	epatch_user
diff --git a/app-emulation/vmware-player/Manifest b/app-emulation/vmware-player/Manifest
index 998ca15..d319473 100644
--- a/app-emulation/vmware-player/Manifest
+++ b/app-emulation/vmware-player/Manifest
@@ -1,3 +1,3 @@
-DIST VMware-Player-12.1.0-3272444.x86_64.bundle.tar 138854400 SHA256 ae124888e3cef2cb8d687d0029b32ddf56dca8314d125cad66539c16501a1787 SHA512 0766ff543c4d61ff842ee8aa7b7ef7ed13c1a8adaadef2872cdd47b8029fb0b794588d9d49e4ad8cd5919793663e465439d2b7d8782f72f28461f8a008141151 WHIRLPOOL d972d76ba01295ece11cfee89a138ecea00b512de93f1a279a4ef8444333e672e094216ccaa59a4a8b78432d8b49998addb0b0a0b1abc566f8ccaa7724f7f580
+DIST VMware-Player-12.1.1-3770994.x86_64.bundle.tar 140697600 SHA256 4b2d6c8026f7948cbbc084ccfedaa899a897047152b86c8a2be1bf80fb935a8e SHA512 f00609a1e41355146c5a77732f2eb8f01d30c0ab7822840a29b9b84c01218d129b8e08349e2e6bbf0c900b826d3aba3b4026a61c6705564539ffff17652511ce WHIRLPOOL ee628665689ae03c70a11e3d34bb5ccf1b640ab14eaaed8f93dc4bd50329f9144e44163e83811ea5380fa8749c7196d64139c4809435094c173b39ec2c93b4fb
 DIST VMware-Player-7.1.2-2780323.x86_64.bundle.tar 211128320 SHA256 baa60996b3bed5ba89db1a0fd9a2cc263ea07ac1cf2d6f3aab68c728cc960efc SHA512 c4465a4cbf97b9fe3aa2d6a1c690047251a37929867e0b3cbddf6643b59ef8e618809973543150e6cd9a3bdba0c9c04fb55171616c2179a0ff80ee7302e07fc2 WHIRLPOOL f0bc539647a5f3838a486d62506881f752e426e2e7299b20f2828c285cb041c777f93f3d29627ff4187edfd92e43e37e70647828ce537adb67db0fe3e99fccb0
 DIST vmware-systemd-gentoo-02.tgz 14064 SHA256 7ab23cb41bb8fbeca43bfd3baee35928731177620ae374ebb3b19b827d1a3210 SHA512 3a382bfd5f1eb2b218d8012588ea55c1f22786dba35a1fc0fdfdb4e40b05e0e735ed09c6961684f6442e863c3ed72024ce01f19113bbd9ca47c32e3f43c55f42 WHIRLPOOL dd7ac934584894f4a0ae86a9122080c49a4d09924011bc12dc1530ac6b5ee11fac6d55d6e5b306bb24d749a509236d3e39870b4d6b2ff5de37f6e54707ff8bb6
diff --git a/app-emulation/vmware-player/vmware-player-12.1.0.3272444-r2.ebuild b/app-emulation/vmware-player/vmware-player-12.1.1.3770994.ebuild
index 90577d8..b5866c4 100644
--- a/app-emulation/vmware-player/vmware-player-12.1.0.3272444-r2.ebuild
+++ b/app-emulation/vmware-player/vmware-player-12.1.1.3770994.ebuild
@@ -26,7 +26,7 @@ LICENSE="vmware GPL-2 GPL-3"
 SLOT="0"
 KEYWORDS="-* ~amd64"
 IUSE="bundled-libs cups doc ovftool +vmware-tools"
-RESTRICT="mirror strip preserve-libs"
+RESTRICT="mirror strip"
 
 BUNDLED_LIBS_DIR=/opt/vmware/lib/vmware/lib
 
@@ -88,7 +88,6 @@ BUNDLED_LIBS="
 "
 
 BUNDLED_LIB_DEPENDS="
-	app-accessibility/at-spi2-core
 	dev-cpp/atkmm
 	dev-cpp/cairomm
 	dev-cpp/glibmm:2
@@ -96,19 +95,15 @@ BUNDLED_LIB_DEPENDS="
 	dev-cpp/pangomm
 	dev-libs/atk
 	dev-libs/glib:2
-	dev-libs/libaio
 	dev-libs/libgcrypt:11/11
 	dev-libs/libgpg-error
 	dev-libs/libsigc++:2
 	dev-libs/libxml2
 	dev-libs/openssl:0
-	gnome-base/librsvg:2
 	media-libs/fontconfig
 	media-libs/freetype
 	media-libs/libpng:1.2
 	net-misc/curl
-	sys-apps/dbus
-	sys-apps/pcsc-lite
 	sys-fs/fuse
 	sys-libs/zlib
 	x11-libs/cairo
@@ -116,63 +111,31 @@ BUNDLED_LIB_DEPENDS="
 	x11-libs/gtk+:2
 	x11-libs/libXau
 	x11-libs/libXcomposite
-	x11-libs/libXcursor
 	x11-libs/libXdamage
-	x11-libs/libXdmcp
 	x11-libs/libXfixes
-	x11-libs/libXft
-	x11-libs/libXinerama
 	x11-libs/libXrandr
 	x11-libs/libXrender
 	x11-libs/pango
-	x11-libs/pangox-compat
 	x11-libs/pixman
 "
 
 # vmware should not use virtual/libc as this is a
 # precompiled binary package thats linked to glibc.
 RDEPEND="
-	app-arch/bzip2
-	dev-libs/dbus-glib
-	dev-libs/expat
-	dev-libs/gmp:0
-	dev-libs/icu
-	dev-libs/json-c
-	dev-libs/libcroco
-	dev-libs/libffi
-	dev-libs/libgcrypt:0/20
-	dev-libs/libtasn1:0/6
-	dev-libs/nettle:0/6
-	gnome-base/gconf
-	gnome-base/libgnome-keyring
-	media-gfx/graphite2
 	media-libs/alsa-lib
-	media-libs/harfbuzz:0/0.9.18
-	media-libs/libart_lgpl
-	media-libs/libpng:0
-	media-libs/libvorbis
-	media-libs/mesa
-	net-dns/libidn
-	net-libs/gnutls
 	net-print/cups
-	sys-apps/tcp-wrappers
-	sys-apps/util-linux
-	x11-libs/libICE
-	x11-libs/libSM
 	x11-libs/libX11
+	x11-libs/libXcursor
 	x11-libs/libXext
 	x11-libs/libXi
+	x11-libs/libXinerama
 	x11-libs/libXtst
-	x11-libs/libXxf86vm
-	x11-libs/libdrm
-	x11-libs/libxcb
-	x11-libs/libxshmfence
 	x11-libs/startup-notification
-	x11-libs/xcb-util
 	x11-themes/hicolor-icon-theme
 	bundled-libs? (
-		media-libs/jbigkit:0/2.1
 		media-libs/tiff:3
+		x11-libs/libICE
+		x11-libs/libSM
 		virtual/jpeg:62
 	)
 	!bundled-libs? ( ${BUNDLED_LIB_DEPENDS} )
@@ -210,35 +173,45 @@ src_unpack() {
 }
 
 clean_bundled_libs() {
-	einfo "Removing bundled libraries"
-	for libname in ${BUNDLED_LIBS} ; do
-		rm -rv "${S}"/lib/lib/${libname} || die "Failed removing bundled ${libname}"
-	done
-
-	rm -rv "${S}"/lib/libconf || die "Failed removing bundled gtk conf libs"
-
-	# Among the bundled libs there are libcrypto.so.1.0.1 and libssl.so.1.0.1
-	# (needed by libcds.so) which seem to be compiled from openssl-1.0.1h.
-	# Upstream real sonames are *so.1.0.0 so it's necessary to fix DT_NEEDED link
-	# in libcds.so to be able to use system libs.
-	pushd >/dev/null .
-	cd "${S}"/lib/lib/libcds.so
-	einfo "Patching libcds.so"
-	patchelf --replace-needed libssl.so.1.0.{1,0} \
-	         --replace-needed libcrypto.so.1.0.{1,0} \
-	         libcds.so
-	popd >/dev/null
-
-	# vmware-player seems to use a custom version of libgksu2.so, for this reason
-	# we leave the bundled version. The libvmware-gksu.so library declares simply DT_NEEDED
-	# libgksu2.so.0 but it uses at runtime the bundled version, patch the lib to avoid portage
-	# preserve-libs mechanism to be triggered when a system lib is available (but not required)
-	pushd >/dev/null .
-	cd "${S}"/lib/lib/libvmware-gksu.so
-	einfo "Patching libvmware-gksu.so"
-	patchelf --set-rpath "\$ORIGIN/../libgksu2.so.0" \
-	         libvmware-gksu.so
-	popd >/dev/null
+	if ! use bundled-libs ; then
+		einfo "Removing bundled libraries"
+		for libname in ${BUNDLED_LIBS} ; do
+			rm -rv "${S}"/lib/lib/${libname} || die "Failed removing bundled ${libname}"
+		done
+
+		rm -rv "${S}"/lib/libconf || die "Failed removing bundled gtk conf libs"
+
+		# Among the bundled libs there are libcrypto.so.1.0.1 and libssl.so.1.0.1
+		# (needed by libcds.so) which seem to be compiled from openssl-1.0.1h.
+		# Upstream real sonames are *so.1.0.0 so it's necessary to fix DT_NEEDED link
+		# in libcds.so to be able to use system libs.
+		pushd >/dev/null .
+		einfo "Patching libcds.so"
+		cd "${S}"/lib/lib/libcds.so || die
+		patchelf --replace-needed libssl.so.1.0.{1,0} \
+				 --replace-needed libcrypto.so.1.0.{1,0} \
+				 libcds.so || die
+		popd >/dev/null
+
+		# vmware-player seems to use a custom version of libgksu2.so, for this reason
+		# we leave the bundled version. The libvmware-gksu.so library declares simply DT_NEEDED
+		# libgksu2.so.0 but it uses at runtime the bundled version, patch the lib to avoid portage
+		# preserve-libs mechanism to be triggered when a system lib is available (but not required)
+		pushd >/dev/null .
+		einfo "Patching libvmware-gksu.so"
+		cd "${S}"/lib/lib/libvmware-gksu.so || die
+		patchelf --set-rpath "\$ORIGIN/../libgksu2.so.0" \
+				 libvmware-gksu.so || die
+		popd >/dev/null
+	else
+		# if librsvg is not installed in the system then vmware doesn't start
+		pushd >/dev/null .
+		einfo "Patching svg_loader.so"
+		cd "${S}"/lib/libconf/lib/gtk-2.0/2.10.0/loaders || die
+		patchelf --set-rpath "\$ORIGIN/../../../../../lib/librsvg-2.so.2" \
+				 svg_loader.so || die
+		popd >/dev/null
+	fi
 }
 
 src_prepare() {
@@ -247,9 +220,7 @@ src_prepare() {
 	# Bug 459566
 	mv lib/libvmware-netcfg.so lib/lib/
 
-	if ! use bundled-libs ; then
-		clean_bundled_libs
-	fi
+	clean_bundled_libs
 
 	DOC_CONTENTS="
 /etc/env.d is updated during ${PN} installation. Please run:\n
@@ -340,7 +311,6 @@ src_install() {
 		PATH='${VM_INSTALL_DIR}/bin'
 		ROOTPATH='${VM_INSTALL_DIR}/bin'
 	EOF
-
 	use bundled-libs && echo 'VMWARE_USE_SHIPPED_LIBS=1' >> "${envd}"
 
 	doenvd "${envd}"
diff --git a/app-emulation/vmware-tools/Manifest b/app-emulation/vmware-tools/Manifest
index c6f45e6..79d00b8 100644
--- a/app-emulation/vmware-tools/Manifest
+++ b/app-emulation/vmware-tools/Manifest
@@ -1,4 +1,5 @@
 DIST vmware-tools-freebsd-10.0.5-3228253.x86_64.component.tar 15349760 SHA256 14cc57924327bec553804cf601e561465acdd0b01299dbedc89bf0e63ea8bcee SHA512 3b7fabb26b6a0aeaa05603b8635166a1f4fad223b90e4564f6656f158a9bb47171dc023c3b83698d1cb114b0517acf82054767a99336b3e5ded1f2d702bb4e3a WHIRLPOOL bb6c808019c294861064d8b358c01e11ccad03db6b4548a5979f5680bd3cfa4b8b1227fca95a0e6756af4626b428e377aae04cc190f6280751a8a5585ccb5edf
+DIST vmware-tools-freebsd-10.0.6-3595377.x86_64.component.tar 15349760 SHA256 550948fc344afe30dd7b30cfa7dea82ef6a4823b2728ffea6b1d3e483ea1eb86 SHA512 af323adc9f60fca2069ad680758843febe727fc31abd96b95069d3f725d340159d202e87ff7481475d2cebfc76ee09b2d32a2f047d8a265f0f5645a56770d2e3 WHIRLPOOL 72954349e1a14fba734482bbc7d4489107703b394504f7bf079b8563e970e16f5fe3093aa7307c690492cf70c7766645439e03d885994316bb33509f8959aca2
 DIST vmware-tools-freebsd-9.6.5-2700073.i386.component.tar 15216640 SHA256 d900d0ee4f9f185f1914f80cb9b0a7df8fcf027e1009def7c2b81a7ac15e5d0b SHA512 5e070544e85137b7f032e2c1e4567233adadac274abc727b4dcfdfdddd455bc5f080499b306c6bdf7e5bbe17f6610fdece1c2ef541d5b89081ec5d342145071e WHIRLPOOL 1cc29331cefb25628425553707b8c8572eddc1b208856eac409d0123901918677d95fe82cc6028f0debcd7b28a8d524e1f29357b399629c30653eced80d12a7b
 DIST vmware-tools-freebsd-9.6.5-2700073.x86_64.component.tar 15216640 SHA256 7a2435330281b039727ab8a10736a95393bc143e6b3bfea6e9b7d18a7bf4ba15 SHA512 e78b1d85bcff951d4661374eb687c388d0b299d3d1cd6e4344d3a0439219f82a1e59f335cd5284fb371304223038ef358b59006504b061d702981bec7afa3408 WHIRLPOOL 42ea166a2b5ec8986d4d7b04dc2d13c76fb2509d6f9993d1dcceb7479332de0032589acfc749996a255b5487173f8ec03dc859b897a5f894fd2dde964db45220
 DIST vmware-tools-freebsd-9.9.2-2496824.x86_64.component.tar 15267840 SHA256 92331cc0c1b6340e23c7f06f36fef6d2945385527f9f49f06c1d9099bbec03d9 SHA512 d58ddaa59b8c939484aa60fe27f2ae857564cb3e607ec76163aec9c02b11115c0d592cb77dfe123397b0700ca7617c2a69e624a6279b6e4fb99101e5ced43bbd WHIRLPOOL e02783002ab5b862c69de1f5d68ec7690b2c6cd9013cdffd2df6b7337bc8e2b532438568cfa503d5b9d23af8c1d35512097522ccc2e4a92dca71e04225d4ff8f
@@ -6,6 +7,7 @@ DIST vmware-tools-freebsd-9.9.3-2780323.x86_64.component.tar 15267840 SHA256 9f0
 DIST vmware-tools-freebsd-9.9.4-3206955.x86_64.component.tar 15267840 SHA256 83206e70e79749f7fa50a26930046c58061b538e3b912d2270a93ee400c5a365 SHA512 3112c0cb5ff2cd6a2309f6bdf51bfccee5e1a8dc01910239a30adbdd516c7f9838133d245a3fd0c95eb909e9fe9b8df0b89135adeb90d5bd4843ddc2db7782ff WHIRLPOOL 29f36ad06ecd4cb7f9faa91924cb7a756cea9c18faf8fff67c0bbc1be10a8a1145724375f09467fefa1a41bd7f6f9196698806833ee105c6a86dd49910260b40
 DIST vmware-tools-freebsd-9.9.5-3848939.x86_64.component.tar 15247360 SHA256 13ed234ff002652b4bd46b56617c4ae88211cdf4303ab9868b3204915ba7cb14 SHA512 b9061bbd9ef1411f1372a8d371863ac84e294ffa340853690759783717a1bb31ea77c272ae83d7e203aaba3a4e093231e96d477ba6a8213b28eb18920b66570e WHIRLPOOL 73849afcf5acf1071c2e4911a5e20051907e8a1b02dbf3a7fbbbd5fb0426f501323a56daf7226e6956cbc68b541d1fb65f23da3a02ba10c25455e9de285afbb3
 DIST vmware-tools-linux-10.0.5-3228253.x86_64.component.tar 72038400 SHA256 bdc01737a53ec49998fa7195ed74a5beeefe9ab18ace195a8ed4d79a311351e7 SHA512 6b087a02b925e146c319f561f6e2e4b712113137672dff508f247fe1389b6022a1cc067c22bb33269f6fa97f66e1d38aed5c2c72dc3cc2a8a3f5c7b2d3b259b2 WHIRLPOOL 8c73f475a1f31fe20ae3c52dd685fb2dbe5573be702e9cd8114ca8c68d2232dbd5a678f5925a7ca47f0f4adf028ebcbe6a9adf870bf13511c4db2b9e6e039746
+DIST vmware-tools-linux-10.0.6-3595377.x86_64.component.tar 72099840 SHA256 ca24a954e6f636abdf38cc14e6d668ef0b40ba07707701c21fc88eea640a9ba1 SHA512 33c3815e1f70a663090adeb00f5a5c58d06146bca95181bdaef30dd19b09b38f8441cb1722fd882eb7c83436a963843d12d05cd57767a7b6514fd5bcc69d939a WHIRLPOOL c465dafba0e9d716d02e0795c38dfad5c163398675c886a7c60059c57114543ab04dc26e4f5af56d867dcd0cc272409fef4b391408a413feac29d06578726199
 DIST vmware-tools-linux-9.6.5-2700073.i386.component.tar 61337600 SHA256 aad21f54da7bb37169dc85fd84062f3976618ce63034c6785235bd6d5aa580f4 SHA512 133c4958d904755ef9a4fdc13ea686aa69b325301c435a8cf7ea77a246a072099864c3b3654d5ad35bfda2b849d3c0e31afdc8654959f0ca2df07c9d822bf9f7 WHIRLPOOL 66ceb444996985f264892d7bbee5ab8a7122796691fedf321e108e1bc81c54646ca3fe325688f4824ef781e7f9ae7058d4f440e2f0219bd58c985195eb9332b2
 DIST vmware-tools-linux-9.6.5-2700073.x86_64.component.tar 61337600 SHA256 dd1fea6f4e99f676cef89d6ad1f9880e28d324f5051a95a6216cb48045c39ea8 SHA512 a607713f410a405ff8364adc7a300223ffa26d5cfd8f0612ec39c371057d6a65744de5e4a2eb552e488cdcb9dbc9ae6ddff7e89b533a9cbe531969453eefe291 WHIRLPOOL 5d851d3a3b9e7ab3b5ff48fa43f40330e88c6cdf083b9a975032b9d2868e9ad3e6e73d9c64db5fba0838eebcf182d9406434abf20d4fe76f74b136a00948684c
 DIST vmware-tools-linux-9.9.2-2496824.x86_64.component.tar 62044160 SHA256 3b08dc7dedb9312ddb465c96435120f87053cd1e456e42dc60fba9e0367044f1 SHA512 8bf3022715f40440838225b1ab2e0fb265c7920da3445a252898d3a4d845e93cbd1af34829e470da0bf9427342adeefd2e5b3df915ec63417fa33d9fa995b783 WHIRLPOOL ba49c9e645528ffb59187937a1b1dc01026da9386ddbcf489b25a3ff7d0b1d799c60beb7c820e5472b6b001c56f7b1bdbf6af1e22f8d78fc1ec4c6d32b7aa9d4
@@ -13,6 +15,7 @@ DIST vmware-tools-linux-9.9.3-2780323.x86_64.component.tar 62095360 SHA256 6ed26
 DIST vmware-tools-linux-9.9.4-3206955.x86_64.component.tar 62085120 SHA256 d1482b6c78f5a7bf5820b174fe5fdd6f0fcaa3ed66c12eefa32e6b59358c376c SHA512 4c2b64b399a802fc1f7ef13878d0c8772507c971d5f515c6323e29a65b6d6fcb27ed48996ad5c6db0ff4d9a19db597b6d8b2eb1c3292cacd47cba9db5c65ef5f WHIRLPOOL 2ee2ad16b108aedf106f5dc017a08859505229734e4b87f81714c436f2fe43469acf6e41bd88473325d67c8396ea4330e7eb4141581da988bd2636ee153eadb8
 DIST vmware-tools-linux-9.9.5-3848939.x86_64.component.tar 62310400 SHA256 f82ee1d2eeb9a3d95af9d888a9ef72ca629cb6bc666d1d280b1932237a751997 SHA512 f1e972a0b509b774844343eec347f06655473a2d5c722631f41c837757ff9a7f9599fd684ee162252be82770236da8e6b6abea154684ed897c403c5d50bcba4b WHIRLPOOL b67a61d6dde78f8713f236317a79160ddc5fc2c1955e20744ecf2ab4c800b50e01bc7104f733049a678163edf80fd2dbc621e78184f8c7d76326c780da88eea5
 DIST vmware-tools-netware-10.0.5-3228253.x86_64.component.tar 81920 SHA256 897565e9cf18c9531d153843610e524c6ec390c6cccc10d670a9684a16127ed5 SHA512 0e2469f7312736f75bc985313675501c6973fa8bb4cc20669fbd086432d8a49e128ca007b1b87a14f94adc751a017cd1ba5c8cd0a18fe1d30451c019293bd906 WHIRLPOOL d5e18eabc933fa18ea1f08dcbac9ef77b443f51a56defe29e0c6399741af53ad24fa3bfd434ea7b41c0adeeb8bebe45b9a80e8379ef5e1bd2f3ef02dedbaeac2
+DIST vmware-tools-netware-10.0.6-3595377.x86_64.component.tar 81920 SHA256 1522ed88a1ca11cd803f08adcd4d48a9aef69a5a85308f3ac4db616f515a3c84 SHA512 b3a1bfe9fe2bfa5a394b90986c271b5441096724df7b3dec0a0bd7e7d64f42673f2966d987cdd40cf5729d4cd312b8ae42491278fb945cea88821041fae135b1 WHIRLPOOL 1b3271ea925495f553feb70c5ffebac4cb1c3238c8771c578839b4160cdbdf3612fef8e4f4fe8908ae47f574b1ae24db2f18e0e7a9f72c46c0b7d5be90861d45
 DIST vmware-tools-netware-9.6.5-2700073.i386.component.tar 81920 SHA256 5ec311062c98a8bd86fa86d2b762b89ad2642c0ba7d95f8d42734c43f3dc7139 SHA512 d5ad09faee4fc5e4d3e9f5ab0423dc4a28cd316b70193277dfc4e26b8daef372af4ba3e9994ed488a6a051ab4f0e2980f6e8a1ab0b911f7f93d29556d3826617 WHIRLPOOL a911c63efece39e149f4086cfdd8e5c29adce1f2553481328988bc946ab6c6653033f967b7f8970c3b859bb245c57e4d70a432bda3a618da9c5b740f8303e24b
 DIST vmware-tools-netware-9.6.5-2700073.x86_64.component.tar 81920 SHA256 78d3a8e66efeeb831658e50fe012e1d1d6bc4cfdf426008c6a21456757e5238c SHA512 bb6a37252beb66c6843ee851dbb71d169f1eace25f2874ec6c577d32ba1df5791e046fb5039e09ee11f536cb0078685665070d2399756130c3bdd6bad2a43e20 WHIRLPOOL 05c41c61715f9cddc89cadf1d2891be9bc13933a1649761087022b592e28b08db5a12b69ea3055750bb7f19688be1f18df4422ebb0650133e2711a30a7bafec6
 DIST vmware-tools-netware-9.9.2-2496824.x86_64.component.tar 81920 SHA256 a590932c3b0294b14ea16c93c76547f2ff7a552019ca79646422d0f5025fd20f SHA512 df18e77a2cb6be56d0009f75d4fb040d5275191456c6dbe44d1d69f741edbabd48cefc0ac6c0a29a8b624bd635accc1665c79c3b7c185d0f4cb3047c5839b7f1 WHIRLPOOL 56f11f4e98bc186519338ff31fd742d0ab16790f1cdf9d8a739fedf53fc88acbe15500c04df892a64b19b042ae20a302ec9326a835ab072b4d51da0cd1ffea04
@@ -20,6 +23,7 @@ DIST vmware-tools-netware-9.9.3-2780323.x86_64.component.tar 81920 SHA256 51ae63
 DIST vmware-tools-netware-9.9.4-3206955.x86_64.component.tar 81920 SHA256 b95be3085178f75eb8b3f69a4c5ca8e4418615e72f42f3b254b3571f8b8e72d5 SHA512 758496e9cae854d02badec3474edeb7e53b4604edd5f1c84216d3488d8f65763a97840a4db023bb7513c91bb3c44d03a8fa67d4435cf6ccb16679ab995ee4159 WHIRLPOOL 4974e17b438633afd5a8046369dd1d935b6587a40d1e1e4bd378606a13914310f8f4e60d084a3ab735b510d8b13403afb41e078235227ce269786d54d0fabc64
 DIST vmware-tools-netware-9.9.5-3848939.x86_64.component.tar 81920 SHA256 8f8d83d9aaa7c22a34844b950727d2440ffaa9ecfc08c927cd8d11ced380f894 SHA512 2cd18f450a8bceab427bd52e6969155b5de58a8f9ffbf6094fd1379556ad987be20c0c08a6181dabd6e033d7e750e2527f63bec39efd86e997ee0712e0ebb6f7 WHIRLPOOL 8e8acb0fa7262bb405259a9a9e8f833bc7708a4b248a49186d03f26afe4bb60164c67d4b3a98be8da83c9e0af02b12238780af44d7810bd3388bc6241d448492
 DIST vmware-tools-solaris-10.0.5-3228253.x86_64.component.tar 12800000 SHA256 c4fc2137808dc1c099185950cc92c6b0e4c22743468c27f3d7148b7e55757ca8 SHA512 4caebd4d4c4ca7c0526830fd8eadfdfceea0cdd21d2f832edb12c48adb5ed82de7eef1c155dec1a167747f1550580e74f202c741a38e87c58058e180f4c6c610 WHIRLPOOL 7f28ff039058cfc74a0666855715ca8837e855333cf7c812433566f937762262f689e0d690caca54af271ef1f5cf427d228b1ecba4c506b2dceca33b342e948a
+DIST vmware-tools-solaris-10.0.6-3595377.x86_64.component.tar 12800000 SHA256 93f43bee9e5ca273d7dabfdc36bacc6a9ce387dd649cbf62d7a772f8627aec28 SHA512 7e2eae371f6f88a101423a5d987af0b96665227c0fe188252f9215fa87eb6f0d3ce2673658b80b6a3b6fcb5ce89197844608111c725ca776598a6edc5d9f961b WHIRLPOOL a11f117ce1a1ea8ef5d5065daf5fb474216faf2f4a568ea3357b5d11f856305f8e5568ff561820edd80998885d9c37e2309da9f4b106f77bb88c6fe7b4143e11
 DIST vmware-tools-solaris-9.6.5-2700073.i386.component.tar 12830720 SHA256 dfff56bd05aea2f732d893be9bd7b52d5b0a3f4f993bb8a275a429fabedd03d5 SHA512 e5c51665119fce5655cc24cc6ff5815250cd291ab7216eaa5eba6056b70e31734c111ae33189c4cb78c9f95336141f012c35c61cbf1ac2887dd264af8e5d7823 WHIRLPOOL 6429b2ed61a1ecba0ab290a9e37c642350782f257364b984abdda3b448e0b11996c0c1c909811620074b1b18a1206cc5f7a6872765766b3d0dcb2d1a978cc784
 DIST vmware-tools-solaris-9.6.5-2700073.x86_64.component.tar 12830720 SHA256 4995ee79f2aa8093fd8caa9bf5e9d2085f3b9a5b6de6b105069c68a97a01ef11 SHA512 f36aa070959bfe94dca921f7c776f878a56a116b5ab7a0da6a55acd34943b7b9631a4184d3aaa773387aed303922aa8d7e9f5b3f24c5d8d9eafbf3d02fb9bf88 WHIRLPOOL 558aa2a21da94b4741d3dc6195ee705e918947511408560ca836937ca094fe66efd2582e967e7fac941dabbaee86b4727f7010782eded8abdcfc05d66fe779a7
 DIST vmware-tools-solaris-9.9.2-2496824.x86_64.component.tar 13015040 SHA256 af2974298a6149a869532fe9c2fa1afff68565340d50a3712d72326c29a40f08 SHA512 2c399b37e539b4cd4419e4c34b8af22baf621bd45fb39640936b0c30724719f45ac49ff470121a1453ff4dac9f4ce06192c653a75dc12fb49e3122f6692ce046 WHIRLPOOL b950ecf772d902dea333270dc65d44fbbb3c4b388ffcf7b7e5f6f00c23b8ae7ea2bef567563d14f8236418b1af5c5800ce4797d0e486d0deba295bdcb71868d2
@@ -27,6 +31,7 @@ DIST vmware-tools-solaris-9.9.3-2780323.x86_64.component.tar 13015040 SHA256 5ab
 DIST vmware-tools-solaris-9.9.4-3206955.x86_64.component.tar 13015040 SHA256 3dfb5754640c100ae7047573be1b20f83e395e99592313e0f168f62a9a947163 SHA512 d56f859037aa5c9081ae036c719dd97e4ae2c20b65bd9d0670b189b030778058999f90656bc6ebe752ef2f22d43458752764cace8441bbfbb1086187dcaa2be3 WHIRLPOOL bd4464dc630ea0c2f310200a80d54171f60fc872fc83007672c4cd5d912db090a535ef46cb0c86931da9dfd44929850a0f8aee14f909d5b5512278cf90e8f27e
 DIST vmware-tools-solaris-9.9.5-3848939.x86_64.component.tar 12718080 SHA256 4bf5da579a37e943c3478f98ddf35f7f6d3be1af4ede8c066660f3ed7e3940f4 SHA512 60259acfea19e82fcaf7130be85d800909f4317f5b83a1d419ae85981bd4ace208b99aa9c4869715857ab948a3144d15c442e0625934147432862ed247fb02a8 WHIRLPOOL 18adcd57be29f1471231940db394324752f3c26ba87d8c40b33522e138c05d4f26275d05738834598877bc626d7a3598741dceb66716ffdb0776d73f94ae58c1
 DIST vmware-tools-winPre2k-10.0.5-3228253.x86_64.component.tar 11530240 SHA256 9719a09f8630b685fbf44e9eee89ea0855dfedc70ccc8ca212bf42102b41b4e0 SHA512 b120d88ab8483383f258f54299daf3c2893ae6df96262fbe40a8e29390b5bca1978b6be1a8dafc46f2a72ec0bd8fe0d17469538e09f5c4527ae664e9331d2d1c WHIRLPOOL fc0e2668951a18a7345f13ba7ce0a7caab3431d8481e7dfe3f7affd31a9136445eeb84a24ed6864ed314a18f142709e1a169059b6e94e165b73bfb9c9dde0e77
+DIST vmware-tools-winPre2k-10.0.6-3595377.x86_64.component.tar 11530240 SHA256 f5695f14340656d931953774dce585b5ca2a65ed48ea6c848b7dd8c67133b586 SHA512 00dcaf095b63ab0b537f920ae1d56004c642805c473528fd4f3f70217cf3d28c11eb3e6afc93799503563afa213ac540c416c1707aafc7825b470183b9cc0dc1 WHIRLPOOL 15f9b8e2685d46df4f690038a3b2dc856580fb5185aa54773f41e89d6563575ebec4ea7c0346a3a0401c4ab61f278a47224109ed7a725b71273e7f1f3ca2c393
 DIST vmware-tools-winPre2k-9.6.5-2700073.i386.component.tar 11458560 SHA256 8b381b1c787466a96bf0f9536df05f58aa62c5c10d6fdeaedd136c6a49e09b8c SHA512 17bcbc4aa84e5e212732860cf34d4c4d8b4c806bd137b497e6dab9f023cf26af5a43a83f6f4d30f9d6e7df87f85b7a33e8ab0626c56450ea024b17e45ab1e1db WHIRLPOOL c3b45bbf5cc49f8b9dd64517dbd9e258ae60de59ea6beeed0b88745f7ba8beef1da9cba577d7829fa25dccf2c51ca919f36db5e7c141e7a4e1d62abe5b9fd187
 DIST vmware-tools-winPre2k-9.6.5-2700073.x86_64.component.tar 11458560 SHA256 55e856f7a701174c3f1f0257d2a8054b836b5e14b328cadcd21e792db03afd3f SHA512 bbc80f18ec0e08d26850220124d0e9187fe9d80472dbd55269c63d05b51ecc7374d7e6066aa5e9fc9bcd027b218925084fb30ddd48dc3828df9c09a9c3579699 WHIRLPOOL f01ad51f8944a167e19abc876f31a6e08f85920d1e17272edff44e4c4871090694e87749cdbd83ffab6deba8569cfec4b600b9de5f930e57405e831dc73a0cd9
 DIST vmware-tools-winPre2k-9.9.2-2496824.x86_64.component.tar 11530240 SHA256 af08bcc956943bc0ed09e37e03bf2005f32cabdd5697d0398f32b6c1943677c3 SHA512 bdce5073ee5937f7e6cf0944360fda5c5e136f7f19f00bbc5fffb7c6e8ce328494309697e4dfabeece73380421f9e6fa34dadaf3c6d540e676a491245de79d36 WHIRLPOOL b59a72c2d63368119998e3d26267f032f8923f792e0031cbd4805911cf65e0a3d39be3d5bb1489b5fac84fba50554d212b9fcaabec726810ed35f1c36e94defe
@@ -34,6 +39,7 @@ DIST vmware-tools-winPre2k-9.9.3-2780323.x86_64.component.tar 11530240 SHA256 56
 DIST vmware-tools-winPre2k-9.9.4-3206955.x86_64.component.tar 11530240 SHA256 58956405bda8c1eeda43dc22b5bbd9e077cc653f6b4bc2ff1bf0dc071152b2a6 SHA512 6394d73f0258bb831d52e4202ddded8173d3c0dbba3a5686f0eae362196a59b5fd7e9d40403483f7bffa90ab3d6daee340a86d69e9a9b5beb278e17b1c98f8e0 WHIRLPOOL a0620f05d8f6b9acdfdaf462a2718888e31e738c332aa189c367f277403c9a6e038eea0386f1ec4b8a9e9e5671a3e51bb67c7dc80d42f2f05b5244ed5ae79e04
 DIST vmware-tools-winPre2k-9.9.5-3848939.x86_64.component.tar 11530240 SHA256 f639c6a29b8f69e0ca6867ecd773bb82c81672c2ccf1a9b8c7fc565fd913dbb1 SHA512 953748c71bc823a92807f6831f1d4f85fcae2ff2fdfb6b39ec88db909eeafb15d5bab13707a7f4b4b93fbbb36ae3a171e12bba706e5ca13effdc0f7ae960d956 WHIRLPOOL 0cabbc54af81ce726dec64a50902e7209a9595ccca802ad8f28aba7794cebca5e17f0fe03ceddfea22cfa09cf1224c4cb00ad5e498a00000a97f771763ae012a
 DIST vmware-tools-windows-10.0.5-3228253.x86_64.component.tar 90511360 SHA256 6d1bf0cb3e5f8f840a2f69ed61392b81a7c362d470e99bbae58a623255450244 SHA512 c9b797b9b563175978f714b923502fd14fc471d6360daa708aeca9928d38bf030b89e6cdc6c9fa534f9d334ae1e01573f898fc68f5e274edd2ef062f2e8da271 WHIRLPOOL f73d3faadd83f6bd05b66ce04280154eb8a2a21ed205b4194a77ba3bf305cf04a8f6b13192879371cf06e9a5366402bf5aac5a98647af3b06d078587484338cd
+DIST vmware-tools-windows-10.0.6-3595377.x86_64.component.tar 90777600 SHA256 4d0682f76f7787e05a156e47c9c6ca87f3d617934a3ca0993d468f62a6d3ca59 SHA512 e51c309987f79a5f96fa4a89735e045d93ced151f14ca365eb88ffbc2fa7eaa5106945782f139afb0aed520626672e95c4bd35238dfd1257e2835268e9e8bf65 WHIRLPOOL a7e736e172e056683e20a0faec07da95f3efe6400823492a97becd6f1f931cd66721a71bf5ebf50eeea849f32b38e0e3dfccf66e3f9d10522872d618bea36381
 DIST vmware-tools-windows-9.6.5-2700073.i386.component.tar 69294080 SHA256 6aba23b1bd9f7877c7fd54102f634dbf6d0d61fe2640d2e56f280395ad595f45 SHA512 fb63d93dd2ca26aeae42f27ce4b0dcda4991f10e0077a8384b8c7bbc3dbf73fa1f62f986a6c5661b70aed59e3841dc9a63b0de76c637ef62d919f9b667149dae WHIRLPOOL 8969ab16cc660b39626f40af69563bd85f40547d4656e156c4ef79221b6d71f8c9cd1b9ec6e0657f1c61f7104748cf84c356a5ff50339462f998d677a762eee5
 DIST vmware-tools-windows-9.6.5-2700073.x86_64.component.tar 69294080 SHA256 effeb7d57c0c916de4b18f80df4cd8d9fcf00d0dda886b2ba0ce23179b3ad0fa SHA512 bcf036d3fa54b1b0ae98370a54f0e5d95ba68a6476fc79f60615d5754f370b8724d0ccaa6c826f843ebb3e1eb1afceb03701214774ff0b1e40742be5e9adad3f WHIRLPOOL 595918763b0b31ab07725b19c9642730bfb4ed14cec44ed4920bed0aed38b3d71ffab9a931b2923aef63514ff180f4f2221e1b6694418578ca1d2960531e4438
 DIST vmware-tools-windows-9.9.2-2496824.x86_64.component.tar 71485440 SHA256 3ef86f0bfce6f9396b4868d2fc067baa425cf9d1db2c4361dad81adb8fb02b69 SHA512 0c1df24026f96d160c3e3f4afac127d82f5ba1a4aabff4ca8fa64a60cde4b67b648601144d54a97bc760636bea1f9e71229b05bdc1c6d2959b3be93c1dc421eb WHIRLPOOL 090e49c1452987a77010e20f23f24f747e3158d4cc7ab6604d3fada16bb42410b34631c82d1580611bb7364faa1174108cce037ec4cc873821fe68e3d745cb3c
diff --git a/app-emulation/vmware-tools/vmware-tools-10.0.6.3595377.ebuild b/app-emulation/vmware-tools/vmware-tools-10.0.6.3595377.ebuild
new file mode 100644
index 0000000..225076c
--- /dev/null
+++ b/app-emulation/vmware-tools/vmware-tools-10.0.6.3595377.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit versionator vmware-bundle
+
+MY_PV="$(replace_version_separator 3 - $PV)"
+BASE_URI="http://softwareupdate.vmware.com/cds/vmw-desktop/ws/12.1.1/3770994/linux/packages/"
+
+DESCRIPTION="VMware Tools for guest operating systems"
+HOMEPAGE="http://www.vmware.com/products/player/"
+
+LICENSE="vmware"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+RESTRICT="mirror"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+IUSE_VMWARE_GUEST="freebsd linux netware solaris windows winPre2k"
+
+VM_INSTALL_DIR="/opt/vmware"
+
+for guest in ${IUSE_VMWARE_GUEST} ; do
+	SRC_URI+=" vmware_guest_${guest}? (
+		amd64? ( ${BASE_URI}vmware-tools-${guest}-${MY_PV}.x86_64.component.tar )
+		)"
+	IUSE+=" vmware_guest_${guest}"
+done ; unset guest
+
+src_unpack() {
+	local arch
+	if use x86 ; then arch='i386'
+	elif use amd64 ; then arch='x86_64'
+	fi
+	local guest ; for guest in ${IUSE_VMWARE_GUEST} ; do
+		if use "vmware_guest_${guest}" ; then
+			local component="vmware-tools-${guest}-${MY_PV}.${arch}.component"
+			unpack "${component}.tar"
+			vmware-bundle_extract-component "${component}"
+		fi
+	done
+}
+
+src_install() {
+	insinto "${VM_INSTALL_DIR}"/lib/vmware/isoimages
+	local somethingdone;
+	local guest ; for guest in ${IUSE_VMWARE_GUEST} ; do
+		if use "vmware_guest_${guest}" ; then
+			doins "${guest}".iso{,.sig}
+			somethingdone=yes
+		fi
+	done
+
+	[ -n "${somethingdone}" ] || ewarn  "You should set VMWARE_GUEST in make.conf to specify which operating systems you need."
+}
diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
index 86af63e..bf6ac30 100644
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@@ -1,4 +1,4 @@
 DIST VMware-Workstation-11.1.3-3206955.x86_64.bundle.tar 259594240 SHA256 a8d333d6f6677eb1d70b3572e5bf8f34ebb6cb77bdee4b94d6ea8033f579ed5d SHA512 8cb4781dc388bcaeb82f19d18e0bf2608d393f18c4e255a1c89c9090954bbee5e78ebde5cec6df06d9c037ed4f0595a7a801d76b3a8e2b960f6822bbf1094d1b WHIRLPOOL 5ba631502ff4dbf0e480e932e9a21cbb06d25d68b9ac412beb41680d3d0e678c630ba692e7e52cda2399574b28698ca5deb6a6c54b4614ab752159b6036a0094
-DIST VMware-Workstation-12.1.0-3272444.x86_64.bundle.tar 170639360 SHA256 b15d2ae889465e6e080b84474ca49ebd6c21a0bce701a0f74d34b6e930869043 SHA512 bd64fe19ebb96b06cd34795dab46490cb0e1fe4822dbce4678185fb2cba3e921170feac7904771c14ece3450ddb0e86f5f4d03081551367b8c70afe77df3fab7 WHIRLPOOL 7d72352e272358c25fe49b05c4cdc5653bffef9e20cc2151a2f032fecb98eb7831a922d8dca0ce509d8944abeaff951e9ece8b11dac6782facc762e3b54c2aac
+DIST VMware-Workstation-12.1.1-3770994.x86_64.bundle.tar 176445440 SHA256 a2c1888e6360245cf65fd19e86b7f74c63788e652145dc9a786aebbda0dd9e15 SHA512 55880e7aa6f7c968d82c88f36c1f406f587cccc9e25bdb9d1de1ffcfccb609811c525967bb2fefcf6375ce59f0f78d4dcc258c006b4a0db642dc3233e8fc9556 WHIRLPOOL 833eceedc1e9b7f3a0b73a039d1647faa9a5966a8a34e26c4955348092ebd9983f2f0ba2b8acb37805b339f492278916d06d68db7bb52a219126d7e78b02c469
 DIST vmware-systemd-gentoo-01.tgz 1884 SHA256 e92c694865f1b29f4d7a39efa1dd87bc71dc5f922573f00a3d31ee8e27a8c335 SHA512 454ab93997781bd0a9accddb2ac7bb446f07ea7cddef5640369025c30e03592e14869e0f0f7b4457db2f1ada31c98051426016c86201afa8bc8e3aa4ccc2f875 WHIRLPOOL 9202583b617532ab2612b384da307218e7c93c2962f0d233e28bea066b07163c9bc51c0a599309f9d703c5575ebeb292d787716225624dc1c2fdff3c44fa3513
 DIST vmware-systemd-gentoo-02.tgz 14064 SHA256 7ab23cb41bb8fbeca43bfd3baee35928731177620ae374ebb3b19b827d1a3210 SHA512 3a382bfd5f1eb2b218d8012588ea55c1f22786dba35a1fc0fdfdb4e40b05e0e735ed09c6961684f6442e863c3ed72024ce01f19113bbd9ca47c32e3f43c55f42 WHIRLPOOL dd7ac934584894f4a0ae86a9122080c49a4d09924011bc12dc1530ac6b5ee11fac6d55d6e5b306bb24d749a509236d3e39870b4d6b2ff5de37f6e54707ff8bb6
diff --git a/app-emulation/vmware-workstation/vmware-workstation-12.1.0.3272444-r2.ebuild b/app-emulation/vmware-workstation/vmware-workstation-12.1.1.3770994.ebuild
index d698aa8..fa77191 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-12.1.0.3272444-r2.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-12.1.1.3770994.ebuild
@@ -88,7 +88,6 @@ BUNDLED_LIBS="
 "
 
 BUNDLED_LIB_DEPENDS="
-	app-accessibility/at-spi2-core
 	dev-cpp/atkmm
 	dev-cpp/cairomm
 	dev-cpp/glibmm:2
@@ -96,19 +95,15 @@ BUNDLED_LIB_DEPENDS="
 	dev-cpp/pangomm
 	dev-libs/atk
 	dev-libs/glib:2
-	dev-libs/libaio
 	dev-libs/libgcrypt:11/11
 	dev-libs/libgpg-error
 	dev-libs/libsigc++:2
 	dev-libs/libxml2
 	dev-libs/openssl:0
-	gnome-base/librsvg:2
 	media-libs/fontconfig
 	media-libs/freetype
 	media-libs/libpng:1.2
 	net-misc/curl
-	sys-apps/dbus
-	sys-apps/pcsc-lite
 	sys-fs/fuse
 	sys-libs/zlib
 	x11-libs/cairo
@@ -116,63 +111,31 @@ BUNDLED_LIB_DEPENDS="
 	x11-libs/gtk+:2
 	x11-libs/libXau
 	x11-libs/libXcomposite
-	x11-libs/libXcursor
 	x11-libs/libXdamage
-	x11-libs/libXdmcp
 	x11-libs/libXfixes
-	x11-libs/libXft
-	x11-libs/libXinerama
 	x11-libs/libXrandr
 	x11-libs/libXrender
 	x11-libs/pango
-	x11-libs/pangox-compat
 	x11-libs/pixman
 "
 
 # vmware should not use virtual/libc as this is a
 # precompiled binary package thats linked to glibc.
 RDEPEND="
-	app-arch/bzip2
-	dev-libs/dbus-glib
-	dev-libs/expat
-	dev-libs/gmp:0
-	dev-libs/icu
-	dev-libs/json-c
-	dev-libs/libcroco
-	dev-libs/libffi
-	dev-libs/libgcrypt:0/20
-	dev-libs/libtasn1:0/6
-	dev-libs/nettle:0/6
-	gnome-base/gconf
-	gnome-base/libgnome-keyring
-	media-gfx/graphite2
 	media-libs/alsa-lib
-	media-libs/harfbuzz:0/0.9.18
-	media-libs/libart_lgpl
-	media-libs/libpng:0
-	media-libs/libvorbis
-	media-libs/mesa
-	net-dns/libidn
-	net-libs/gnutls
 	net-print/cups
-	sys-apps/tcp-wrappers
-	sys-apps/util-linux
-	x11-libs/libICE
-	x11-libs/libSM
 	x11-libs/libX11
+	x11-libs/libXcursor
 	x11-libs/libXext
 	x11-libs/libXi
+	x11-libs/libXinerama
 	x11-libs/libXtst
-	x11-libs/libXxf86vm
-	x11-libs/libdrm
-	x11-libs/libxcb
-	x11-libs/libxshmfence
 	x11-libs/startup-notification
-	x11-libs/xcb-util
 	x11-themes/hicolor-icon-theme
 	bundled-libs? (
-		media-libs/jbigkit:0/2.1
 		media-libs/tiff:3
+		x11-libs/libICE
+		x11-libs/libSM
 		virtual/jpeg:62
 	)
 	!bundled-libs? ( ${BUNDLED_LIB_DEPENDS} )
@@ -223,35 +186,45 @@ src_unpack() {
 }
 
 clean_bundled_libs() {
-	einfo "Removing bundled libraries"
-	for libname in ${BUNDLED_LIBS} ; do
-		rm -rv "${S}"/lib/lib/${libname} || die "Failed removing bundled ${libname}"
-	done
+	if ! use bundled-libs ; then
+		einfo "Removing bundled libraries"
+		for libname in ${BUNDLED_LIBS} ; do
+			rm -rv "${S}"/lib/lib/${libname} || die "Failed removing bundled ${libname}"
+		done
 
-	rm -rv "${S}"/lib/libconf || die "Failed removing bundled gtk conf libs"
-
-	# Among the bundled libs there are libcrypto.so.1.0.1 and libssl.so.1.0.1
-	# (needed by libcds.so) which seem to be compiled from openssl-1.0.1h.
-	# Upstream real sonames are *so.1.0.0 so it's necessary to fix DT_NEEDED link
-	# in libcds.so to be able to use system libs.
-	pushd >/dev/null .
-	einfo "Patching libcds.so"
-	cd "${S}"/lib/lib/libcds.so || die
-	patchelf --replace-needed libssl.so.1.0.{1,0} \
-	         --replace-needed libcrypto.so.1.0.{1,0} \
-	         libcds.so || die
-	popd >/dev/null
-
-	# vmware-workstation seems to use a custom version of libgksu2.so, for this reason
-	# we leave the bundled version. The libvmware-gksu.so library declares simply DT_NEEDED
-	# libgksu2.so.0 but it uses at runtime the bundled version, patch the lib to avoid portage
-	# preserve-libs mechanism to be triggered when a system lib is available (but not required)
-	pushd >/dev/null .
-	einfo "Patching libvmware-gksu.so"
-	cd "${S}"/lib/lib/libvmware-gksu.so || die
-	patchelf --set-rpath "\$ORIGIN/../libgksu2.so.0" \
-	         libvmware-gksu.so || die
-	popd >/dev/null
+		rm -rv "${S}"/lib/libconf || die "Failed removing bundled gtk conf libs"
+
+		# Among the bundled libs there are libcrypto.so.1.0.1 and libssl.so.1.0.1
+		# (needed by libcds.so) which seem to be compiled from openssl-1.0.1h.
+		# Upstream real sonames are *so.1.0.0 so it's necessary to fix DT_NEEDED link
+		# in libcds.so to be able to use system libs.
+		pushd >/dev/null .
+		einfo "Patching libcds.so"
+		cd "${S}"/lib/lib/libcds.so || die
+		patchelf --replace-needed libssl.so.1.0.{1,0} \
+				 --replace-needed libcrypto.so.1.0.{1,0} \
+				 libcds.so || die
+		popd >/dev/null
+
+		# vmware-workstation seems to use a custom version of libgksu2.so, for this reason
+		# we leave the bundled version. The libvmware-gksu.so library declares simply DT_NEEDED
+		# libgksu2.so.0 but it uses at runtime the bundled version, patch the lib to avoid portage
+		# preserve-libs mechanism to be triggered when a system lib is available (but not required)
+		pushd >/dev/null .
+		einfo "Patching libvmware-gksu.so"
+		cd "${S}"/lib/lib/libvmware-gksu.so || die
+		patchelf --set-rpath "\$ORIGIN/../libgksu2.so.0" \
+				 libvmware-gksu.so || die
+		popd >/dev/null
+	else
+		# if librsvg is not installed in the system then vmware doesn't start
+		pushd >/dev/null .
+		einfo "Patching svg_loader.so"
+		cd "${S}"/lib/libconf/lib/gtk-2.0/2.10.0/loaders || die
+		patchelf --set-rpath "\$ORIGIN/../../../../../lib/librsvg-2.so.2" \
+				 svg_loader.so || die
+		popd >/dev/null
+	fi
 }
 
 src_prepare() {
@@ -264,9 +237,7 @@ src_prepare() {
 		rm -f vmware-workstation-server/bin/{openssl,configure-hostd.sh}
 	fi
 
-	if ! use bundled-libs ; then
-		clean_bundled_libs
-	fi
+	clean_bundled_libs
 
 	DOC_CONTENTS="
 /etc/env.d is updated during ${PN} installation. Please run:\n