commit:     23b9132c92becaeb5a40c1862f98b211f22abddf
Author:     Fabio Rossi <rossi.f <AT> inwind <DOT> it>
AuthorDate: Sun Jun 25 15:31:51 2017 +0000
Commit:     Fabio Rossi <rossi.f <AT> inwind <DOT> net>
CommitDate: Sun Jun 25 15:31:51 2017 +0000
URL:        https://gitweb.gentoo.org/proj/vmware.git/commit/?id=23b9132c

Cleaning the overlay removing old files.

Let's clean the overlay keeping only last version of each major release,
this simplifies the management of the files. At a certain point it might
be even possible to import older versions that are now package-masked in
the main Gentoo repository.

 .../files/304-4.11-00-missing-headers-p2.patch     |  20 -
 ...-p1.patch => 304-4.11-00-missing-headers.patch} |  20 +
 .../files/308-4.06-00-user-pages-p1.patch          |  68 ---
 ...pages-p2.patch => 308-4.06-00-user-pages.patch} |   0
 .../files/308-4.09-00-user-pages-p2.patch          |  26 -
 ...pages-p1.patch => 308-4.09-00-user-pages.patch} |   0
 .../files/308-4.11-00-missing-headers-p2.patch     |  20 -
 ...-p1.patch => 308-4.11-00-missing-headers.patch} |   0
 .../vmware-modules/vmware-modules-304.2.ebuild     | 113 ----
 .../vmware-modules/vmware-modules-304.3-r1.ebuild  | 123 -----
 .../vmware-modules/vmware-modules-304.4-r1.ebuild  |   3 +-
 .../vmware-modules/vmware-modules-304.4.ebuild     | 123 -----
 .../vmware-modules/vmware-modules-308.1.1.ebuild   | 162 ------
 .../vmware-modules/vmware-modules-308.5.7.ebuild   |   6 +-
 .../vmware-player/files/list-bundle-components.xsl |  17 -
 .../vmware-player/files/list-component-files.xsl   |  19 -
 app-emulation/vmware-player/files/vmware-12.1.rc   |  92 ----
 .../vmware-player-12.1.1.3770994.ebuild            | 388 -------------
 .../files/list-bundle-components.xsl               |  17 -
 .../files/list-component-files.xsl                 |  19 -
 .../vmware-workstation/files/vmware-11.0.rc        |  92 ----
 .../vmware-workstation/files/vmware-11.2.rc        |  92 ----
 .../vmware-workstation/files/vmware-12.1.rc        |  92 ----
 .../vmware-workstation/files/vmware-9.0.rc         |  92 ----
 .../vmware-workstation/files/vmware-server-11.0.rc |  55 --
 .../vmware-workstation/files/vmware-server-11.2.rc |  55 --
 .../vmware-workstation/files/vmware-server-12.1.rc |  55 --
 .../vmware-workstation/files/vmware-server-9.0.rc  |  55 --
 .../vmware-workstation-11.1.3.3206955-r3.ebuild    | 549 -------------------
 .../vmware-workstation-11.1.3.3206955-r4.ebuild    | 549 -------------------
 .../vmware-workstation-12.1.1.3770994.ebuild       | 599 ---------------------
 31 files changed, 24 insertions(+), 3497 deletions(-)

diff --git 
a/app-emulation/vmware-modules/files/304-4.11-00-missing-headers-p2.patch 
b/app-emulation/vmware-modules/files/304-4.11-00-missing-headers-p2.patch
deleted file mode 100644
index 29a0c9d..0000000
--- a/app-emulation/vmware-modules/files/304-4.11-00-missing-headers-p2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- vmmon-only/linux/hostif.c  2017-05-06 16:56:09.000000000 +0200
-+++ vmmon-only/linux/hostif.c.new      2017-05-06 16:56:41.000000000 +0200
-@@ -73,6 +73,7 @@
- #include <linux/capability.h>
- #include <linux/kthread.h>
- #include <linux/wait.h>
-+#include <linux/sched/signal.h>
- 
- #include <asm/apic.h>
- 
---- vmnet-only/userif.c        2017-03-13 04:05:59.000000000 +0100
-+++ vmnet-only/userif.c.new    2017-05-06 16:58:32.000000000 +0200
-@@ -36,6 +36,7 @@
- #include <linux/slab.h>
- #include <linux/version.h>
- #include <linux/wait.h>
-+#include <linux/sched/signal.h>
- 
- #include <net/checksum.h>
- #include <net/sock.h>

diff --git 
a/app-emulation/vmware-modules/files/304-4.11-00-missing-headers-p1.patch 
b/app-emulation/vmware-modules/files/304-4.11-00-missing-headers.patch
similarity index 69%
rename from 
app-emulation/vmware-modules/files/304-4.11-00-missing-headers-p1.patch
rename to app-emulation/vmware-modules/files/304-4.11-00-missing-headers.patch
index 215bcf3..4e8f991 100644
--- a/app-emulation/vmware-modules/files/304-4.11-00-missing-headers-p1.patch
+++ b/app-emulation/vmware-modules/files/304-4.11-00-missing-headers.patch
@@ -38,3 +38,23 @@
  #include <asm/io.h>
  #if defined(__x86_64__) && LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 12)
  #   include <linux/ioctl32.h>
+--- vmmon-only/linux/hostif.c  2017-05-06 16:56:09.000000000 +0200
++++ vmmon-only/linux/hostif.c.new      2017-05-06 16:56:41.000000000 +0200
+@@ -73,6 +73,7 @@
+ #include <linux/capability.h>
+ #include <linux/kthread.h>
+ #include <linux/wait.h>
++#include <linux/sched/signal.h>
+ 
+ #include <asm/apic.h>
+ 
+--- vmnet-only/userif.c        2017-03-13 04:05:59.000000000 +0100
++++ vmnet-only/userif.c.new    2017-05-06 16:58:32.000000000 +0200
+@@ -36,6 +36,7 @@
+ #include <linux/slab.h>
+ #include <linux/version.h>
+ #include <linux/wait.h>
++#include <linux/sched/signal.h>
+ 
+ #include <net/checksum.h>
+ #include <net/sock.h>

diff --git a/app-emulation/vmware-modules/files/308-4.06-00-user-pages-p1.patch 
b/app-emulation/vmware-modules/files/308-4.06-00-user-pages-p1.patch
deleted file mode 100644
index 9012176..0000000
--- a/app-emulation/vmware-modules/files/308-4.06-00-user-pages-p1.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- ./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, 6, 0)
-+   retval = get_user_pages(addr, 1, 1, 0, &page, NULL);
-+#else
-    retval = get_user_pages(current, current->mm, addr,
-                            1, 1, 0, &page, NULL);
-+#endif
-    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
-@@ -2049,6 +2049,13 @@
-    int err = VMCI_SUCCESS;
- 
-    down_write(&current->mm->mmap_sem);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
-+   retval = get_user_pages((VA)produceUVA,
-+                           produceQ->kernelIf->numPages,
-+                           1, 0,
-+                           produceQ->kernelIf->u.h.headerPage,
-+                           NULL);
-+#else
-    retval = get_user_pages(current,
-                            current->mm,
-                            (VA)produceUVA,
-@@ -2056,6 +2063,7 @@
-                            1, 0,
-                            produceQ->kernelIf->u.h.headerPage,
-                            NULL);
-+#endif
-    if (retval < produceQ->kernelIf->numPages) {
-       Log("get_user_pages(produce) failed (retval=%d)\n", retval);
-       VMCIReleasePages(produceQ->kernelIf->u.h.headerPage, retval, FALSE);
---- ./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, 6, 0)
-+   retval = get_user_pages((unsigned long)uvAddr, numPages, 0, 0, ppages, 
NULL);
-+#else
-    retval = get_user_pages(current, current->mm, (unsigned long)uvAddr,
-                            numPages, 0, 0, ppages, NULL);
-+#endif
-    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,8 +113,12 @@
-    int retval;
- 
-    down_read(&current->mm->mmap_sem);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
-+   retval = get_user_pages(addr, 1, 1, 0, &page, NULL);
-+#else
-    retval = get_user_pages(current, current->mm, addr,
--                         1, 1, 0, &page, NULL);
-+                           1, 1, 0, &page, NULL);
-+#endif
-    up_read(&current->mm->mmap_sem);
- 
-    if (retval != 1) {

diff --git a/app-emulation/vmware-modules/files/308-4.06-00-user-pages-p2.patch 
b/app-emulation/vmware-modules/files/308-4.06-00-user-pages.patch
similarity index 100%
rename from app-emulation/vmware-modules/files/308-4.06-00-user-pages-p2.patch
rename to app-emulation/vmware-modules/files/308-4.06-00-user-pages.patch

diff --git a/app-emulation/vmware-modules/files/308-4.09-00-user-pages-p2.patch 
b/app-emulation/vmware-modules/files/308-4.09-00-user-pages-p2.patch
deleted file mode 100644
index 5c4c869..0000000
--- a/app-emulation/vmware-modules/files/308-4.09-00-user-pages-p2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- ./vmnet-only/userif.c      2017-02-23 12:29:00.909852764 +0100
-+++ ./vmnet-only/userif.c.new  2017-02-23 12:28:51.309852227 +0100
-@@ -113,7 +113,9 @@
-    int retval;
- 
-    down_read(&current->mm->mmap_sem);
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
-+   retval = get_user_pages(addr, 1, FOLL_WRITE, &page, NULL);
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
-    retval = get_user_pages(addr, 1, 1, 0, &page, NULL);
- #else
-    retval = get_user_pages(current, current->mm, addr,
---- ./vmmon-only/linux/hostif.c        2017-02-23 12:19:59.772822506 +0100
-+++ ./vmmon-only/linux/hostif.c.new    2017-02-23 12:26:42.661845034 +0100
-@@ -1167,7 +1167,9 @@
-    int retval;
- 
-    down_read(&current->mm->mmap_sem);
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
-+   retval = get_user_pages((unsigned long)uvAddr, numPages, 0, ppages, NULL);
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
-    retval = get_user_pages((unsigned long)uvAddr, numPages, 0, 0, ppages, 
NULL);
- #else
-    retval = get_user_pages(current, current->mm, (unsigned long)uvAddr,

diff --git a/app-emulation/vmware-modules/files/308-4.09-00-user-pages-p1.patch 
b/app-emulation/vmware-modules/files/308-4.09-00-user-pages.patch
similarity index 100%
rename from app-emulation/vmware-modules/files/308-4.09-00-user-pages-p1.patch
rename to app-emulation/vmware-modules/files/308-4.09-00-user-pages.patch

diff --git 
a/app-emulation/vmware-modules/files/308-4.11-00-missing-headers-p2.patch 
b/app-emulation/vmware-modules/files/308-4.11-00-missing-headers-p2.patch
deleted file mode 100644
index 29a0c9d..0000000
--- a/app-emulation/vmware-modules/files/308-4.11-00-missing-headers-p2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- vmmon-only/linux/hostif.c  2017-05-06 16:56:09.000000000 +0200
-+++ vmmon-only/linux/hostif.c.new      2017-05-06 16:56:41.000000000 +0200
-@@ -73,6 +73,7 @@
- #include <linux/capability.h>
- #include <linux/kthread.h>
- #include <linux/wait.h>
-+#include <linux/sched/signal.h>
- 
- #include <asm/apic.h>
- 
---- vmnet-only/userif.c        2017-03-13 04:05:59.000000000 +0100
-+++ vmnet-only/userif.c.new    2017-05-06 16:58:32.000000000 +0200
-@@ -36,6 +36,7 @@
- #include <linux/slab.h>
- #include <linux/version.h>
- #include <linux/wait.h>
-+#include <linux/sched/signal.h>
- 
- #include <net/checksum.h>
- #include <net/sock.h>

diff --git 
a/app-emulation/vmware-modules/files/308-4.11-00-missing-headers-p1.patch 
b/app-emulation/vmware-modules/files/308-4.11-00-missing-headers.patch
similarity index 100%
rename from 
app-emulation/vmware-modules/files/308-4.11-00-missing-headers-p1.patch
rename to app-emulation/vmware-modules/files/308-4.11-00-missing-headers.patch

diff --git a/app-emulation/vmware-modules/vmware-modules-304.2.ebuild 
b/app-emulation/vmware-modules/vmware-modules-304.2.ebuild
deleted file mode 100644
index 173592f..0000000
--- a/app-emulation/vmware-modules/vmware-modules-304.2.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod user versionator udev
-
-PV_MAJOR=$(get_major_version)
-PV_MINOR=$(get_version_component_range 2)
-
-DESCRIPTION="VMware kernel modules"
-HOMEPAGE="http://www.vmware.com/";
-
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="pax_kernel +vmci +vsock"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-       || ( =app-emulation/vmware-player-7.1.${PV_MINOR}*
-       =app-emulation/vmware-workstation-11.1.${PV_MINOR}* )"
-
-S=${WORKDIR}
-
-pkg_setup() {
-       CONFIG_CHECK="~HIGH_RES_TIMERS"
-       if kernel_is ge 2 6 37 && kernel_is lt 2 6 39; then
-               CONFIG_CHECK="${CONFIG_CHECK} BKL"
-       fi
-       if use vmci ; then
-               CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI"
-       else
-               CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI"
-       fi
-       if use vsock ; then
-               CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI_VSOCKETS"
-       else
-               CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI_VSOCKETS"
-       fi
-
-       linux-info_pkg_setup
-
-       linux-mod_pkg_setup
-
-       VMWARE_GROUP=${VMWARE_GROUP:-vmware}
-
-       VMWARE_MODULE_LIST_ALL="vmblock vmmon vmnet vmci vsock"
-       VMWARE_MODULE_LIST="vmblock vmmon vmnet"
-       use vmci && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} vmci"
-       use vsock && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} vsock"
-
-       VMWARE_MOD_DIR="${PN}-${PVR}"
-
-       BUILD_TARGETS="auto-build KERNEL_DIR=${KERNEL_DIR} 
KBUILD_OUTPUT=${KV_OUT_DIR}"
-
-       enewgroup "${VMWARE_GROUP}"
-       filter-flags -mfpmath=sse -mavx -mpclmul -maes
-
-       for mod in ${VMWARE_MODULE_LIST}; do
-               MODULE_NAMES="${MODULE_NAMES} ${mod}(misc:${S}/${mod}-only)"
-       done
-}
-
-src_unpack() {
-       cd "${S}"
-       for mod in ${VMWARE_MODULE_LIST_ALL}; do
-               tar -xf /opt/vmware/lib/vmware/modules/source/${mod}.tar
-       done
-}
-
-src_prepare() {
-       epatch "${FILESDIR}/${PV_MAJOR}-makefile-kernel-dir.patch"
-       epatch "${FILESDIR}/${PV_MAJOR}-makefile-include.patch"
-       epatch "${FILESDIR}/${PV_MAJOR}-netdevice.patch"
-       use pax_kernel && epatch "${FILESDIR}/${PV_MAJOR}-hardened.patch"
-       epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
-
-       kernel_is ge 3 10 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.10-00-dentry.patch"
-       kernel_is ge 3 10 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.10-01-inode.patch"
-       kernel_is ge 3 10 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.10-02-control.patch"
-       kernel_is ge 3 11 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.10-03-inline.patch"
-       kernel_is ge 3 11 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.11-00-readdir.patch"
-       kernel_is ge 3 11 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.11-01-filldir.patch"
-       kernel_is ge 3 15 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.15-00-vsock.patch"
-       kernel_is ge 3 18 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.18-00-version-redefined.patch"
-       kernel_is ge 3 19 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.19-00-compat-namei.patch"
-       #kernel_is ge 3 19 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.19-01-dentry.patch"
-       kernel_is ge 3 19 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.19-02-vmblock-path.patch"
-       #kernel_is ge 3 19 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.19-03-iovec.patch"
-       kernel_is ge 3 19 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.19-04-iovec.patch"
-       kernel_is ge 3 19 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.19-05-vmci_qpair.patch"
-       kernel_is ge 3 19 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.19-06-vsock.patch"
-       kernel_is ge 3 19 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.19-07-vsock.patch"
-
-       # Allow user patches so they can support RC kernels and whatever else
-       epatch_user
-}
-
-src_install() {
-       linux-mod_src_install
-       local udevrules="${T}/60-vmware.rules"
-       cat > "${udevrules}" <<-EOF
-               KERNEL=="vmci",  GROUP="vmware", MODE="660"
-               KERNEL=="vmw_vmci",  GROUP="vmware", MODE="660"
-               KERNEL=="vmmon", GROUP="vmware", MODE="660"
-               KERNEL=="vsock", GROUP="vmware", MODE="660"
-       EOF
-       udev_dorules "${udevrules}"
-}

diff --git a/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild 
b/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild
deleted file mode 100644
index a10a9f4..0000000
--- a/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod user versionator udev
-
-PV_MAJOR=$(get_major_version)
-PV_MINOR=$(get_version_component_range 2)
-
-DESCRIPTION="VMware kernel modules"
-HOMEPAGE="http://www.vmware.com/";
-
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="pax_kernel +vmci +vsock"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-       || ( =app-emulation/vmware-player-7.1.${PV_MINOR}*
-       =app-emulation/vmware-workstation-11.1.${PV_MINOR}* )"
-
-S=${WORKDIR}
-
-pkg_setup() {
-       CONFIG_CHECK="~HIGH_RES_TIMERS"
-       if kernel_is ge 2 6 37 && kernel_is lt 2 6 39; then
-               CONFIG_CHECK="${CONFIG_CHECK} BKL"
-       fi
-       if use vmci ; then
-               CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI"
-       else
-               CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI"
-       fi
-       if use vsock ; then
-               CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI_VSOCKETS"
-       else
-               CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI_VSOCKETS"
-       fi
-
-       linux-info_pkg_setup
-
-       linux-mod_pkg_setup
-
-       VMWARE_GROUP=${VMWARE_GROUP:-vmware}
-
-       VMWARE_MODULE_LIST_ALL="vmblock vmmon vmnet vmci vsock"
-       VMWARE_MODULE_LIST="vmblock vmmon vmnet"
-       use vmci && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} vmci"
-       use vsock && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} vsock"
-
-       VMWARE_MOD_DIR="${PN}-${PVR}"
-
-       BUILD_TARGETS="auto-build KERNEL_DIR=${KERNEL_DIR} 
KBUILD_OUTPUT=${KV_OUT_DIR}"
-
-       enewgroup "${VMWARE_GROUP}"
-       filter-flags -mfpmath=sse
-
-       for mod in ${VMWARE_MODULE_LIST}; do
-               MODULE_NAMES="${MODULE_NAMES} ${mod}(misc:${S}/${mod}-only)"
-       done
-}
-
-src_unpack() {
-       cd "${S}"
-       for mod in ${VMWARE_MODULE_LIST_ALL}; do
-               tar -xf /opt/vmware/lib/vmware/modules/source/${mod}.tar
-       done
-}
-
-src_prepare() {
-       epatch "${FILESDIR}/${PV_MAJOR}-makefile-kernel-dir.patch"
-       epatch "${FILESDIR}/${PV_MAJOR}-makefile-include.patch"
-       epatch "${FILESDIR}/${PV_MAJOR}-netdevice.patch"
-       use pax_kernel && epatch "${FILESDIR}/${PV_MAJOR}-hardened.patch"
-       epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
-
-       kernel_is ge 3 10 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.10-00-dentry.patch"
-       kernel_is ge 3 10 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.10-01-inode.patch"
-       kernel_is ge 3 10 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.10-02-control.patch"
-       kernel_is ge 3 11 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.10-03-inline.patch"
-       kernel_is ge 3 11 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.11-00-readdir.patch"
-       kernel_is ge 3 11 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.11-01-filldir.patch"
-       kernel_is ge 3 15 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.15-00-vsock.patch"
-       kernel_is ge 3 18 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.18-00-version-redefined.patch"
-       kernel_is ge 3 19 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.19-00-compat-namei.patch"
-       #kernel_is ge 3 19 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.19-01-dentry.patch"
-       kernel_is ge 3 19 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.19-02-vmblock-path.patch"
-       #kernel_is ge 3 19 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.19-03-iovec.patch"
-       kernel_is ge 3 19 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.19-04-iovec.patch"
-       kernel_is ge 3 19 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.19-05-vmci_qpair.patch"
-       kernel_is ge 3 19 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.19-06-vsock.patch"
-       kernel_is ge 3 19 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.19-07-vsock.patch"
-       kernel_is ge 4 2 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.2-00-inode_op.patch"
-       kernel_is ge 4 2 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.2-01-vmci_vmalloc.patch"
-       kernel_is ge 4 2 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.2-02-vsock.patch"
-       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"
-       kernel_is ge 4 8 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.8-00-nr_anon_mapped.patch"
-
-       # Allow user patches so they can support RC kernels and whatever else
-       epatch_user
-}
-
-src_install() {
-       linux-mod_src_install
-       local udevrules="${T}/60-vmware.rules"
-       cat > "${udevrules}" <<-EOF
-               KERNEL=="vmci",  GROUP="vmware", MODE="660"
-               KERNEL=="vmw_vmci",  GROUP="vmware", MODE="660"
-               KERNEL=="vmmon", GROUP="vmware", MODE="660"
-               KERNEL=="vsock", GROUP="vmware", MODE="660"
-       EOF
-       udev_dorules "${udevrules}"
-}

diff --git a/app-emulation/vmware-modules/vmware-modules-304.4-r1.ebuild 
b/app-emulation/vmware-modules/vmware-modules-304.4-r1.ebuild
index 8bf050e..424ca60 100644
--- a/app-emulation/vmware-modules/vmware-modules-304.4-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-304.4-r1.ebuild
@@ -109,8 +109,7 @@ src_prepare() {
        kernel_is ge 4 9 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.9-01-get_user_pages.patch"
        kernel_is ge 4 9 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.9-02-get_user_pages.patch"
        kernel_is ge 4 10 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.10-00-generic_readlink.patch"
-       kernel_is ge 4 11 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.11-00-missing-headers-p1.patch"
-       kernel_is ge 4 11 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.11-00-missing-headers-p2.patch"
+       kernel_is ge 4 11 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.11-00-missing-headers.patch"
        kernel_is ge 4 11 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.11-01-vsock-lockdep.patch"
        kernel_is ge 4 11 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.11-02-vmmon.patch"
 

diff --git a/app-emulation/vmware-modules/vmware-modules-304.4.ebuild 
b/app-emulation/vmware-modules/vmware-modules-304.4.ebuild
deleted file mode 100644
index a10a9f4..0000000
--- a/app-emulation/vmware-modules/vmware-modules-304.4.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod user versionator udev
-
-PV_MAJOR=$(get_major_version)
-PV_MINOR=$(get_version_component_range 2)
-
-DESCRIPTION="VMware kernel modules"
-HOMEPAGE="http://www.vmware.com/";
-
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="pax_kernel +vmci +vsock"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-       || ( =app-emulation/vmware-player-7.1.${PV_MINOR}*
-       =app-emulation/vmware-workstation-11.1.${PV_MINOR}* )"
-
-S=${WORKDIR}
-
-pkg_setup() {
-       CONFIG_CHECK="~HIGH_RES_TIMERS"
-       if kernel_is ge 2 6 37 && kernel_is lt 2 6 39; then
-               CONFIG_CHECK="${CONFIG_CHECK} BKL"
-       fi
-       if use vmci ; then
-               CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI"
-       else
-               CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI"
-       fi
-       if use vsock ; then
-               CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI_VSOCKETS"
-       else
-               CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI_VSOCKETS"
-       fi
-
-       linux-info_pkg_setup
-
-       linux-mod_pkg_setup
-
-       VMWARE_GROUP=${VMWARE_GROUP:-vmware}
-
-       VMWARE_MODULE_LIST_ALL="vmblock vmmon vmnet vmci vsock"
-       VMWARE_MODULE_LIST="vmblock vmmon vmnet"
-       use vmci && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} vmci"
-       use vsock && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} vsock"
-
-       VMWARE_MOD_DIR="${PN}-${PVR}"
-
-       BUILD_TARGETS="auto-build KERNEL_DIR=${KERNEL_DIR} 
KBUILD_OUTPUT=${KV_OUT_DIR}"
-
-       enewgroup "${VMWARE_GROUP}"
-       filter-flags -mfpmath=sse
-
-       for mod in ${VMWARE_MODULE_LIST}; do
-               MODULE_NAMES="${MODULE_NAMES} ${mod}(misc:${S}/${mod}-only)"
-       done
-}
-
-src_unpack() {
-       cd "${S}"
-       for mod in ${VMWARE_MODULE_LIST_ALL}; do
-               tar -xf /opt/vmware/lib/vmware/modules/source/${mod}.tar
-       done
-}
-
-src_prepare() {
-       epatch "${FILESDIR}/${PV_MAJOR}-makefile-kernel-dir.patch"
-       epatch "${FILESDIR}/${PV_MAJOR}-makefile-include.patch"
-       epatch "${FILESDIR}/${PV_MAJOR}-netdevice.patch"
-       use pax_kernel && epatch "${FILESDIR}/${PV_MAJOR}-hardened.patch"
-       epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
-
-       kernel_is ge 3 10 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.10-00-dentry.patch"
-       kernel_is ge 3 10 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.10-01-inode.patch"
-       kernel_is ge 3 10 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.10-02-control.patch"
-       kernel_is ge 3 11 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.10-03-inline.patch"
-       kernel_is ge 3 11 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.11-00-readdir.patch"
-       kernel_is ge 3 11 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.11-01-filldir.patch"
-       kernel_is ge 3 15 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.15-00-vsock.patch"
-       kernel_is ge 3 18 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.18-00-version-redefined.patch"
-       kernel_is ge 3 19 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.19-00-compat-namei.patch"
-       #kernel_is ge 3 19 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.19-01-dentry.patch"
-       kernel_is ge 3 19 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.19-02-vmblock-path.patch"
-       #kernel_is ge 3 19 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.19-03-iovec.patch"
-       kernel_is ge 3 19 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.19-04-iovec.patch"
-       kernel_is ge 3 19 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.19-05-vmci_qpair.patch"
-       kernel_is ge 3 19 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.19-06-vsock.patch"
-       kernel_is ge 3 19 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.19-07-vsock.patch"
-       kernel_is ge 4 2 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.2-00-inode_op.patch"
-       kernel_is ge 4 2 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.2-01-vmci_vmalloc.patch"
-       kernel_is ge 4 2 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.2-02-vsock.patch"
-       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"
-       kernel_is ge 4 8 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.8-00-nr_anon_mapped.patch"
-
-       # Allow user patches so they can support RC kernels and whatever else
-       epatch_user
-}
-
-src_install() {
-       linux-mod_src_install
-       local udevrules="${T}/60-vmware.rules"
-       cat > "${udevrules}" <<-EOF
-               KERNEL=="vmci",  GROUP="vmware", MODE="660"
-               KERNEL=="vmw_vmci",  GROUP="vmware", MODE="660"
-               KERNEL=="vmmon", GROUP="vmware", MODE="660"
-               KERNEL=="vsock", GROUP="vmware", MODE="660"
-       EOF
-       udev_dorules "${udevrules}"
-}

diff --git a/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild 
b/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild
deleted file mode 100644
index 86ee488..0000000
--- a/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod user versionator udev
-
-PV_MAJOR=$(get_major_version)
-PV_MINOR=$(get_version_component_range 2-3)
-
-DESCRIPTION="VMware kernel modules"
-HOMEPAGE="http://www.vmware.com/";
-
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="pax_kernel +vmci +vsock"
-REQUIRED_USE="!vsock? ( !vmci )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-       || ( =app-emulation/vmware-player-12.${PV_MINOR}*
-       =app-emulation/vmware-workstation-12.${PV_MINOR}* )"
-
-S=${WORKDIR}
-
-pkg_setup() {
-       CONFIG_CHECK="~HIGH_RES_TIMERS"
-       if kernel_is ge 2 6 37 && kernel_is lt 2 6 39; then
-               CONFIG_CHECK="${CONFIG_CHECK} BKL"
-       fi
-       if use vmci ; then
-               CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI"
-       else
-               CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI"
-       fi
-       if use vsock ; then
-               CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI_VSOCKETS"
-       else
-               CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI_VSOCKETS"
-       fi
-
-       linux-info_pkg_setup
-
-       linux-mod_pkg_setup
-
-       VMWARE_GROUP=${VMWARE_GROUP:-vmware}
-
-       VMWARE_MODULE_LIST_ALL="vmblock vmmon vmnet vmci vsock"
-       VMWARE_MODULE_LIST="vmblock vmmon vmnet"
-       use vmci && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} vmci"
-       use vsock && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} vsock"
-
-       VMWARE_MOD_DIR="${PN}-${PVR}"
-
-       BUILD_TARGETS="auto-build KERNEL_DIR=${KERNEL_DIR} 
KBUILD_OUTPUT=${KV_OUT_DIR}"
-
-       enewgroup "${VMWARE_GROUP}"
-
-       filter-flags -mfpmath=sse -mavx -mpclmul -maes
-       append-cflags -mno-sse  # Found a problem similar to bug #492964
-
-       for mod in ${VMWARE_MODULE_LIST}; do
-               MODULE_NAMES="${MODULE_NAMES} ${mod}(misc:${S}/${mod}-only)"
-       done
-}
-
-src_unpack() {
-       cd "${S}"
-       for mod in ${VMWARE_MODULE_LIST_ALL}; do
-               tar -xf /opt/vmware/lib/vmware/modules/source/${mod}.tar
-       done
-}
-
-src_prepare() {
-       epatch "${FILESDIR}/${PV_MAJOR}-makefile-kernel-dir.patch"
-       epatch "${FILESDIR}/${PV_MAJOR}-makefile-include.patch"
-       epatch "${FILESDIR}/${PV_MAJOR}-netdevice.patch"
-       use pax_kernel && epatch "${FILESDIR}/${PV_MAJOR}-hardened.patch"
-       epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
-
-       kernel_is ge 3 10 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.10-00-dentry.patch"
-       kernel_is ge 3 10 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.10-01-inode.patch"
-       kernel_is ge 3 10 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.10-02-control.patch"
-       kernel_is ge 3 10 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.10-03-inline.patch"
-       kernel_is ge 3 11 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.11-00-readdir.patch"
-       kernel_is ge 3 11 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.11-01-filldir.patch"
-       kernel_is ge 3 15 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.15-00-vsock.patch"
-       kernel_is ge 3 18 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.18-00-version-redefined.patch"
-       kernel_is ge 3 19 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.19-00-compat-namei.patch"
-       kernel_is ge 3 19 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.19-02-vmblock-path.patch"
-       kernel_is ge 3 19 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.19-04-iovec.patch"
-       kernel_is ge 3 19 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.19-05-vmci_qpair.patch"
-       kernel_is ge 3 19 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.19-06-vsock.patch"
-       kernel_is ge 3 19 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.19-07-vsock.patch"
-       kernel_is ge 4 1 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.01-00-vsock.patch"
-       kernel_is ge 4 2 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.02-00-nd_set_link.patch"
-       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-p1.patch"
-       kernel_is ge 4 6 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.06-00-user-pages-p2.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"
-       kernel_is ge 4 8 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.08-00-nr_anon_mapped.patch"
-       kernel_is ge 4 9 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.09-00-user-pages-p1.patch"
-       kernel_is ge 4 9 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.09-00-user-pages-p2.patch"
-       kernel_is ge 4 10 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.10-00-generic_readlink.patch"
-       kernel_is ge 4 11 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.11-00-missing-headers-p1.patch"
-       kernel_is ge 4 11 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.11-00-missing-headers-p2.patch"
-       kernel_is ge 4 11 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.11-01-vsock-lockdep.patch"
-       kernel_is ge 4 11 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.11-02-vmmon.patch"
-
-       # Allow user patches so they can support RC kernels and whatever else
-       epatch_user
-}
-
-src_install() {
-       linux-mod_src_install
-       local udevrules="${T}/60-vmware.rules"
-       cat > "${udevrules}" <<-EOF
-               KERNEL=="vmci",  GROUP="vmware", MODE="660"
-               KERNEL=="vmw_vmci",  GROUP="vmware", MODE="660"
-               KERNEL=="vmmon", GROUP="vmware", MODE="660"
-               KERNEL=="vsock", GROUP="vmware", MODE="660"
-       EOF
-       udev_dorules "${udevrules}"
-
-       if ! use vmci ; then
-               dodir /etc/modprobe.d/
-
-               cat > "${D}"/etc/modprobe.d/vmware.conf <<-EOF
-                       # Support for vmware vmci in kernel module
-                       alias vmci      vmw_vmci
-               EOF
-
-               export installed_modprobe_conf=1
-       fi
-       if ! use vsock ; then
-               dodir /etc/modprobe.d/
-               cat >> "${D}"/etc/modprobe.d/vmware.conf <<-EOF
-                       # Support for vmware vsock in kernel module
-                       alias vsock     vmw_vsock_vmci_transport
-               EOF
-
-               export installed_modprobe_conf=1
-       fi
-}
-
-pkg_postinst() {
-       linux-mod_pkg_postinst
-       if [ "${installed_modprobe_conf}"x == "x"  ] ; then
-               if [ -f "${ROOT}/etc/modprobe.d/vmware.conf" ] ; then
-                       ewarn "Please check the /etc/modprobe.d/vmware.conf 
file and"
-                       ewarn "possible conflicts when using vmci and/or vsock 
modules built"
-                       ewarn "out of kernel"
-               fi
-       fi
-}

diff --git a/app-emulation/vmware-modules/vmware-modules-308.5.7.ebuild 
b/app-emulation/vmware-modules/vmware-modules-308.5.7.ebuild
index 92fc364..f13740f 100644
--- a/app-emulation/vmware-modules/vmware-modules-308.5.7.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-308.5.7.ebuild
@@ -101,12 +101,12 @@ 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-p2.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-01-readlink_copy.patch"
        kernel_is ge 4 8 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.08-00-nr_anon_mapped.patch"
-       kernel_is ge 4 9 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.09-00-user-pages-p1.patch"
+       kernel_is ge 4 9 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.09-00-user-pages.patch"
        kernel_is ge 4 10 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.10-00-generic_readlink.patch"
-       kernel_is ge 4 11 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.11-00-missing-headers-p1.patch"
+       kernel_is ge 4 11 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.11-00-missing-headers.patch"
        kernel_is ge 4 11 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.11-01-vsock-lockdep.patch"
 
        # Allow user patches so they can support RC kernels and whatever else

diff --git a/app-emulation/vmware-player/files/list-bundle-components.xsl 
b/app-emulation/vmware-player/files/list-bundle-components.xsl
deleted file mode 100644
index db1a4e4..0000000
--- a/app-emulation/vmware-player/files/list-bundle-components.xsl
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
-
-       <xsl:output omit-xml-declaration="yes"/>
-
-       <xsl:template match="text()"/>
-
-       <xsl:template match="/bundle/components/component">
-               <xsl:value-of select="@offset"/>
-               <xsl:text> </xsl:text>
-               <xsl:value-of select="@size"/>
-               <xsl:text> </xsl:text>
-               <xsl:value-of select="@name"/>
-               <xsl:text>&#10;</xsl:text>
-       </xsl:template>
-
-</xsl:stylesheet>

diff --git a/app-emulation/vmware-player/files/list-component-files.xsl 
b/app-emulation/vmware-player/files/list-component-files.xsl
deleted file mode 100644
index 91c6152..0000000
--- a/app-emulation/vmware-player/files/list-component-files.xsl
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
-
-       <xsl:output omit-xml-declaration="yes"/>
-
-       <xsl:template match="text()"/>
-
-       <xsl:template match="/component/fileset/file">
-               <xsl:value-of select="@offset"/>
-               <xsl:text> </xsl:text>
-               <xsl:value-of select="@compressedSize"/>
-               <xsl:text> </xsl:text>
-               <xsl:value-of select="@uncompressedSize"/>
-               <xsl:text> </xsl:text>
-               <xsl:value-of select="@path"/>
-               <xsl:text>&#10;</xsl:text>
-       </xsl:template>
-
-</xsl:stylesheet>

diff --git a/app-emulation/vmware-player/files/vmware-12.1.rc 
b/app-emulation/vmware-player/files/vmware-12.1.rc
deleted file mode 100644
index 38524b2..0000000
--- a/app-emulation/vmware-player/files/vmware-12.1.rc
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
-       need localmount
-       use net
-}
-
-start() {
-       ebegin Starting VMware USB Arbitrator
-       #start-stop-daemon --start --exec @@BINDIR@@/vmware-usbarbitrator
-       @@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
-
-       # vmci or vsock were already loaded by the previous modprobe,
-       # no need to do it here
-       modprobe -av vmmon vmblock vmnet 
-       eend $?
-       @@BINDIR@@/vmware-networks --start
-       eend $?
-}
-
-stop() {
-       ebegin Stopping VMware USB Arbitrator
-       #start-stop-daemon --stop --exec @@BINDIR@@/vmware-usbarbitrator
-       killall --wait @@BINDIR@@/vmware-usbarbitrator 
-       eend $?
-       @@BINDIR@@/vmware-networks --stop 
-       eend $?
-       ebegin Stopping VMware services
-       modprobe -rv vmmon vmblock 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
-}

diff --git a/app-emulation/vmware-player/vmware-player-12.1.1.3770994.ebuild 
b/app-emulation/vmware-player/vmware-player-12.1.1.3770994.ebuild
deleted file mode 100644
index b5866c4..0000000
--- a/app-emulation/vmware-player/vmware-player-12.1.1.3770994.ebuild
+++ /dev/null
@@ -1,388 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils versionator readme.gentoo-r1 fdo-mime gnome2-utils pax-utils 
systemd vmware-bundle
-
-MY_PN="VMware-Player"
-MY_PV=$(get_version_component_range 1-3)
-PV_MODULES="308.$(get_version_component_range 2-3)"
-PV_BUILD=$(get_version_component_range 4)
-MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}"
-
-SYSTEMD_UNITS_TAG="gentoo-02"
-
-DESCRIPTION="Emulate a complete PC without the performance overhead of most 
emulators"
-HOMEPAGE="http://www.vmware.com/products/player/";
-BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/player/${MY_PV}/${PV_BUILD}/linux/core/";
-SRC_URI="
-       ${BASE_URI}${MY_P}.x86_64.bundle.tar
-       
https://github.com/akhuettel/systemd-vmware/archive/${SYSTEMD_UNITS_TAG}.tar.gz 
-> vmware-systemd-${SYSTEMD_UNITS_TAG}.tgz
-"
-
-LICENSE="vmware GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="bundled-libs cups doc ovftool +vmware-tools"
-RESTRICT="mirror strip"
-
-BUNDLED_LIBS_DIR=/opt/vmware/lib/vmware/lib
-
-BUNDLED_LIBS="
-       libXau.so.6
-       libXcomposite.so.1
-       libXcursor.so.1
-       libXdamage.so.1
-       libXdmcp.so.6
-       libXfixes.so.3
-       libXft.so.2
-       libXinerama.so.1
-       libXrandr.so.2
-       libXrender.so.1
-       libaio.so.1
-       libatk-1.0.so.0
-       libatkmm-1.6.so.1
-       libatspi.so.0
-       libcairo.so.2
-       libcairomm-1.0.so.1
-       libcrypto.so.1.0.1
-       libcurl.so.4
-       libdbus-1.so.3
-       libfontconfig.so.1
-       libfreetype.so.6
-       libfuse.so.2
-       libgailutil.so.18
-       libgcc_s.so.1
-       libgcrypt.so.11
-       libgdk-x11-2.0.so.0
-       libgdk_pixbuf-2.0.so.0
-       libgdkmm-2.4.so.1
-       libgio-2.0.so.0
-       libgiomm-2.4.so.1
-       libglib-2.0.so.0
-       libglibmm-2.4.so.1
-       libglibmm_generate_extra_defs-2.4.so.1
-       libgmodule-2.0.so.0
-       libgobject-2.0.so.0
-       libgpg-error.so.0
-       libgthread-2.0.so.0
-       libgtk-x11-2.0.so.0
-       libgtkmm-2.4.so.1
-       libpango-1.0.so.0
-       libpangocairo-1.0.so.0
-       libpangoft2-1.0.so.0
-       libpangomm-1.4.so.1
-       libpangox-1.0.so.0
-       libpangoxft-1.0.so.0
-       libpcsclite.so.1
-       libpixman-1.so.0
-       libpng12.so.0
-       librsvg-2.so.2
-       libsigc-2.0.so.0
-       libssl.so.1.0.1
-       libstdc++.so.6
-       libxml2.so.2
-       libz.so.1
-"
-
-BUNDLED_LIB_DEPENDS="
-       dev-cpp/atkmm
-       dev-cpp/cairomm
-       dev-cpp/glibmm:2
-       dev-cpp/gtkmm:2.4
-       dev-cpp/pangomm
-       dev-libs/atk
-       dev-libs/glib:2
-       dev-libs/libgcrypt:11/11
-       dev-libs/libgpg-error
-       dev-libs/libsigc++:2
-       dev-libs/libxml2
-       dev-libs/openssl:0
-       media-libs/fontconfig
-       media-libs/freetype
-       media-libs/libpng:1.2
-       net-misc/curl
-       sys-fs/fuse
-       sys-libs/zlib
-       x11-libs/cairo
-       x11-libs/gdk-pixbuf:2
-       x11-libs/gtk+:2
-       x11-libs/libXau
-       x11-libs/libXcomposite
-       x11-libs/libXdamage
-       x11-libs/libXfixes
-       x11-libs/libXrandr
-       x11-libs/libXrender
-       x11-libs/pango
-       x11-libs/pixman
-"
-
-# vmware should not use virtual/libc as this is a
-# precompiled binary package thats linked to glibc.
-RDEPEND="
-       media-libs/alsa-lib
-       net-print/cups
-       x11-libs/libX11
-       x11-libs/libXcursor
-       x11-libs/libXext
-       x11-libs/libXi
-       x11-libs/libXinerama
-       x11-libs/libXtst
-       x11-libs/startup-notification
-       x11-themes/hicolor-icon-theme
-       bundled-libs? (
-               media-libs/tiff:3
-               x11-libs/libICE
-               x11-libs/libSM
-               virtual/jpeg:62
-       )
-       !bundled-libs? ( ${BUNDLED_LIB_DEPENDS} )
-       !app-emulation/vmware-workstation
-"
-PDEPEND="~app-emulation/vmware-modules-${PV_MODULES}
-       vmware-tools? ( app-emulation/vmware-tools )"
-DEPEND=">=dev-util/patchelf-0.9"
-
-S=${WORKDIR}
-VM_INSTALL_DIR="/opt/vmware"
-
-QA_PREBUILT="/opt/*"
-
-QA_WX_LOAD="opt/vmware/lib/vmware/tools-upgraders/vmware-tools-upgrader-32 
opt/vmware/lib/vmware/bin/vmware-vmx-stats 
opt/vmware/lib/vmware/bin/vmware-vmx-debug opt/vmware/lib/vmware/bin/vmware-vmx"
-
-src_unpack() {
-       default
-       local bundle=${MY_P}.x86_64.bundle
-
-       local component; for component in \
-               vmware-player \
-               vmware-player-app \
-               vmware-player-setup \
-               vmware-vmx \
-               vmware-network-editor \
-               vmware-usbarbitrator
-       do
-               vmware-bundle_extract-bundle-component "${bundle}" 
"${component}" "${S}"
-       done
-
-       if use ovftool; then
-               vmware-bundle_extract-bundle-component "${bundle}" 
vmware-ovftool
-       fi
-}
-
-clean_bundled_libs() {
-       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() {
-       rm -f bin/vmware-modconfig
-       rm -rf lib/modules/binary
-       # Bug 459566
-       mv lib/libvmware-netcfg.so lib/lib/
-
-       clean_bundled_libs
-
-       DOC_CONTENTS="
-/etc/env.d is updated during ${PN} installation. Please run:\n
-env-update && source /etc/profile\n
-Before you can use ${PN}, you must configure a default network setup.
-You can do this by running 'emerge --config ${PN}'.\n
-To be able to run ${PN} your user must be in the vmware group.\n
-You MUST set USE=bundled-libs if you are running gcc-5, otherwise vmware will 
not start.
-"
-}
-
-src_install() {
-       local major_minor=$(get_version_component_range 1-2 "${PV}")
-
-       # revdep-rebuild entry
-       insinto /etc/revdep-rebuild
-       echo "SEARCH_DIRS_MASK=\"${VM_INSTALL_DIR}\"" >> ${T}/10${PN}
-       doins "${T}"/10${PN}
-
-       # install the binaries
-       into "${VM_INSTALL_DIR}"
-       dobin bin/*
-
-       # install the libraries
-       insinto "${VM_INSTALL_DIR}"/lib/vmware
-       doins -r lib/*
-
-       # workaround for hardcoded search paths needed during shared objects 
loading
-       if ! use bundled-libs ; then
-               dosym /usr/$(get_libdir)/libglib-2.0.so.0 \
-                       
"${VM_INSTALL_DIR}"/lib/vmware/lib/libglib-2.0.so.0/libglib-2.0.so.0
-               # Bug 432918
-               dosym /usr/$(get_libdir)/libcrypto.so.1.0.0 \
-                       
"${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.1.0.1/libcrypto.so.1.0.1
-               dosym /usr/$(get_libdir)/libssl.so.1.0.0 \
-                       
"${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.1.0.1/libssl.so.1.0.1
-       fi
-
-       # install the ancillaries
-       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
-
-       if use doc; then
-               dodoc doc/*
-       fi
-
-       exeinto "${VM_INSTALL_DIR}"/lib/vmware/setup
-       doexe vmware-config
-
-       # install ovftool
-       if use ovftool; then
-               cd "${S}"
-
-               insinto "${VM_INSTALL_DIR}"/lib/vmware-ovftool
-               doins -r vmware-ovftool/*
-
-               chmod 0755 
"${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/{ovftool,ovftool.bin}
-               dosym "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/ovftool 
"${VM_INSTALL_DIR}"/bin/ovftool
-       fi
-
-       # create symlinks for the various tools
-       local tool ; for tool in thnuclnt vmplayer{,-daemon} \
-                       vmware-{acetool,modconfig{,-console},gksu,fuseUI} ; do
-               dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}"
-       done
-       dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer 
"${VM_INSTALL_DIR}"/bin/vmplayer
-       dosym "${VM_INSTALL_DIR}"/lib/vmware/icu /etc/vmware/icu
-
-       # fix permissions
-       fperms 0755 
"${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks}
-       fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/wrapper-gtk24.sh
-       fperms 0755 
"${VM_INSTALL_DIR}"/lib/vmware/lib/libgksu2.so.0/gksu-run-helper
-       fperms 4711 
"${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats}
-
-       pax-mark -m "${D}${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx
-
-       # create the environment
-       local envd="${T}/90vmware"
-       cat > "${envd}" <<-EOF
-               PATH='${VM_INSTALL_DIR}/bin'
-               ROOTPATH='${VM_INSTALL_DIR}/bin'
-       EOF
-       use bundled-libs && echo 'VMWARE_USE_SHIPPED_LIBS=1' >> "${envd}"
-
-       doenvd "${envd}"
-
-       # create the configuration
-       dodir /etc/vmware
-
-       cat > "${D}"/etc/vmware/bootstrap <<-EOF
-               BINDIR='${VM_INSTALL_DIR}/bin'
-               LIBDIR='${VM_INSTALL_DIR}/lib'
-       EOF
-
-       cat > "${D}"/etc/vmware/config <<-EOF
-               bindir = "${VM_INSTALL_DIR}/bin"
-               libdir = "${VM_INSTALL_DIR}/lib/vmware"
-               initscriptdir = "/etc/init.d"
-               authd.fullpath = "${VM_INSTALL_DIR}/sbin/vmware-authd"
-               gksu.rootMethod = "su"
-               VMCI_CONFED = "yes"
-               VMBLOCK_CONFED = "yes"
-               VSOCK_CONFED = "yes"
-               NETWORKING = "yes"
-               player.product.version = "${MY_PV}"
-               product.buildNumber = "${PV_BUILD}"
-       EOF
-
-       # install the init.d script
-       local initscript="${T}/vmware.rc"
-       sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
-               "${FILESDIR}/vmware-${major_minor}.rc" > "${initscript}" || die
-       newinitd "${initscript}" vmware
-
-       # fill in variable placeholders
-       if use bundled-libs ; then
-               sed -e 
"s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g" \
-                       -i 
"${D}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}}
 || die
-       fi
-       sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \
-               -e "/^Encoding/d" \
-               -i "${D}/usr/share/applications/vmware-player.desktop" || die
-
-       # install systemd unit files
-       systemd_dounit 
"${WORKDIR}/systemd-vmware-${SYSTEMD_UNITS_TAG}/"*.{service,target}
-
-       readme.gentoo_create_doc
-}
-
-pkg_config() {
-       "${VM_INSTALL_DIR}"/bin/vmware-networks --postinstall ${PN},old,new
-}
-
-pkg_preinst() {
-       gnome2_icon_savelist
-}
-
-pkg_postinst() {
-       fdo-mime_desktop_database_update
-       gnome2_icon_cache_update
-       readme.gentoo_print_elog
-
-       ewarn "${P} is using an old version of libgcrypt library which"
-       ewarn "is going to be soon removed from portage due to security reasons"
-       ewarn "(see https://bugs.gentoo.org/show_bug.cgi?id=541564)."
-       ewarn "Until vmware is fixed upstream you're exposed to security 
issues!"
-}
-
-pkg_prerm() {
-       einfo "Stopping ${PN} for safe unmerge"
-       /etc/init.d/vmware stop
-}
-
-pkg_postrm() {
-       fdo-mime_desktop_database_update
-       gnome2_icon_cache_update
-}

diff --git a/app-emulation/vmware-workstation/files/list-bundle-components.xsl 
b/app-emulation/vmware-workstation/files/list-bundle-components.xsl
deleted file mode 100644
index db1a4e4..0000000
--- a/app-emulation/vmware-workstation/files/list-bundle-components.xsl
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
-
-       <xsl:output omit-xml-declaration="yes"/>
-
-       <xsl:template match="text()"/>
-
-       <xsl:template match="/bundle/components/component">
-               <xsl:value-of select="@offset"/>
-               <xsl:text> </xsl:text>
-               <xsl:value-of select="@size"/>
-               <xsl:text> </xsl:text>
-               <xsl:value-of select="@name"/>
-               <xsl:text>&#10;</xsl:text>
-       </xsl:template>
-
-</xsl:stylesheet>

diff --git a/app-emulation/vmware-workstation/files/list-component-files.xsl 
b/app-emulation/vmware-workstation/files/list-component-files.xsl
deleted file mode 100644
index 91c6152..0000000
--- a/app-emulation/vmware-workstation/files/list-component-files.xsl
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
-
-       <xsl:output omit-xml-declaration="yes"/>
-
-       <xsl:template match="text()"/>
-
-       <xsl:template match="/component/fileset/file">
-               <xsl:value-of select="@offset"/>
-               <xsl:text> </xsl:text>
-               <xsl:value-of select="@compressedSize"/>
-               <xsl:text> </xsl:text>
-               <xsl:value-of select="@uncompressedSize"/>
-               <xsl:text> </xsl:text>
-               <xsl:value-of select="@path"/>
-               <xsl:text>&#10;</xsl:text>
-       </xsl:template>
-
-</xsl:stylesheet>

diff --git a/app-emulation/vmware-workstation/files/vmware-11.0.rc 
b/app-emulation/vmware-workstation/files/vmware-11.0.rc
deleted file mode 100644
index 38524b2..0000000
--- a/app-emulation/vmware-workstation/files/vmware-11.0.rc
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
-       need localmount
-       use net
-}
-
-start() {
-       ebegin Starting VMware USB Arbitrator
-       #start-stop-daemon --start --exec @@BINDIR@@/vmware-usbarbitrator
-       @@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
-
-       # vmci or vsock were already loaded by the previous modprobe,
-       # no need to do it here
-       modprobe -av vmmon vmblock vmnet 
-       eend $?
-       @@BINDIR@@/vmware-networks --start
-       eend $?
-}
-
-stop() {
-       ebegin Stopping VMware USB Arbitrator
-       #start-stop-daemon --stop --exec @@BINDIR@@/vmware-usbarbitrator
-       killall --wait @@BINDIR@@/vmware-usbarbitrator 
-       eend $?
-       @@BINDIR@@/vmware-networks --stop 
-       eend $?
-       ebegin Stopping VMware services
-       modprobe -rv vmmon vmblock 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
-}

diff --git a/app-emulation/vmware-workstation/files/vmware-11.2.rc 
b/app-emulation/vmware-workstation/files/vmware-11.2.rc
deleted file mode 100644
index 38524b2..0000000
--- a/app-emulation/vmware-workstation/files/vmware-11.2.rc
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
-       need localmount
-       use net
-}
-
-start() {
-       ebegin Starting VMware USB Arbitrator
-       #start-stop-daemon --start --exec @@BINDIR@@/vmware-usbarbitrator
-       @@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
-
-       # vmci or vsock were already loaded by the previous modprobe,
-       # no need to do it here
-       modprobe -av vmmon vmblock vmnet 
-       eend $?
-       @@BINDIR@@/vmware-networks --start
-       eend $?
-}
-
-stop() {
-       ebegin Stopping VMware USB Arbitrator
-       #start-stop-daemon --stop --exec @@BINDIR@@/vmware-usbarbitrator
-       killall --wait @@BINDIR@@/vmware-usbarbitrator 
-       eend $?
-       @@BINDIR@@/vmware-networks --stop 
-       eend $?
-       ebegin Stopping VMware services
-       modprobe -rv vmmon vmblock 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
-}

diff --git a/app-emulation/vmware-workstation/files/vmware-12.1.rc 
b/app-emulation/vmware-workstation/files/vmware-12.1.rc
deleted file mode 100644
index 38524b2..0000000
--- a/app-emulation/vmware-workstation/files/vmware-12.1.rc
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
-       need localmount
-       use net
-}
-
-start() {
-       ebegin Starting VMware USB Arbitrator
-       #start-stop-daemon --start --exec @@BINDIR@@/vmware-usbarbitrator
-       @@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
-
-       # vmci or vsock were already loaded by the previous modprobe,
-       # no need to do it here
-       modprobe -av vmmon vmblock vmnet 
-       eend $?
-       @@BINDIR@@/vmware-networks --start
-       eend $?
-}
-
-stop() {
-       ebegin Stopping VMware USB Arbitrator
-       #start-stop-daemon --stop --exec @@BINDIR@@/vmware-usbarbitrator
-       killall --wait @@BINDIR@@/vmware-usbarbitrator 
-       eend $?
-       @@BINDIR@@/vmware-networks --stop 
-       eend $?
-       ebegin Stopping VMware services
-       modprobe -rv vmmon vmblock 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
-}

diff --git a/app-emulation/vmware-workstation/files/vmware-9.0.rc 
b/app-emulation/vmware-workstation/files/vmware-9.0.rc
deleted file mode 100644
index 38524b2..0000000
--- a/app-emulation/vmware-workstation/files/vmware-9.0.rc
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
-       need localmount
-       use net
-}
-
-start() {
-       ebegin Starting VMware USB Arbitrator
-       #start-stop-daemon --start --exec @@BINDIR@@/vmware-usbarbitrator
-       @@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
-
-       # vmci or vsock were already loaded by the previous modprobe,
-       # no need to do it here
-       modprobe -av vmmon vmblock vmnet 
-       eend $?
-       @@BINDIR@@/vmware-networks --start
-       eend $?
-}
-
-stop() {
-       ebegin Stopping VMware USB Arbitrator
-       #start-stop-daemon --stop --exec @@BINDIR@@/vmware-usbarbitrator
-       killall --wait @@BINDIR@@/vmware-usbarbitrator 
-       eend $?
-       @@BINDIR@@/vmware-networks --stop 
-       eend $?
-       ebegin Stopping VMware services
-       modprobe -rv vmmon vmblock 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
-}

diff --git a/app-emulation/vmware-workstation/files/vmware-server-11.0.rc 
b/app-emulation/vmware-workstation/files/vmware-server-11.0.rc
deleted file mode 100644
index 439949f..0000000
--- a/app-emulation/vmware-workstation/files/vmware-server-11.0.rc
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
-       need localmount vmware
-       use net
-}
-
-checkconfig() {
-       # 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
-               mkdir -p @@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
-               chmod -R 600 @@ETCDIR@@/ssl
-       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 \
-         --exec @@BINDIR@@/vmware-hostd 
-       eend $?
-       ebegin Stopping VMware Authentication Daemon
-       #start-stop-daemon --stop \
-       #  --exec @@PREFIX@@/sbin/vmware-authdlauncher
-       killall @@PREFIX@@/sbin/vmware-authdlauncher
-       eend $?
-}

diff --git a/app-emulation/vmware-workstation/files/vmware-server-11.2.rc 
b/app-emulation/vmware-workstation/files/vmware-server-11.2.rc
deleted file mode 100644
index 439949f..0000000
--- a/app-emulation/vmware-workstation/files/vmware-server-11.2.rc
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
-       need localmount vmware
-       use net
-}
-
-checkconfig() {
-       # 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
-               mkdir -p @@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
-               chmod -R 600 @@ETCDIR@@/ssl
-       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 \
-         --exec @@BINDIR@@/vmware-hostd 
-       eend $?
-       ebegin Stopping VMware Authentication Daemon
-       #start-stop-daemon --stop \
-       #  --exec @@PREFIX@@/sbin/vmware-authdlauncher
-       killall @@PREFIX@@/sbin/vmware-authdlauncher
-       eend $?
-}

diff --git a/app-emulation/vmware-workstation/files/vmware-server-12.1.rc 
b/app-emulation/vmware-workstation/files/vmware-server-12.1.rc
deleted file mode 100644
index 439949f..0000000
--- a/app-emulation/vmware-workstation/files/vmware-server-12.1.rc
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
-       need localmount vmware
-       use net
-}
-
-checkconfig() {
-       # 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
-               mkdir -p @@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
-               chmod -R 600 @@ETCDIR@@/ssl
-       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 \
-         --exec @@BINDIR@@/vmware-hostd 
-       eend $?
-       ebegin Stopping VMware Authentication Daemon
-       #start-stop-daemon --stop \
-       #  --exec @@PREFIX@@/sbin/vmware-authdlauncher
-       killall @@PREFIX@@/sbin/vmware-authdlauncher
-       eend $?
-}

diff --git a/app-emulation/vmware-workstation/files/vmware-server-9.0.rc 
b/app-emulation/vmware-workstation/files/vmware-server-9.0.rc
deleted file mode 100644
index 3a943f4..0000000
--- a/app-emulation/vmware-workstation/files/vmware-server-9.0.rc
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
-       need localmount vmware
-       use net
-}
-
-checkconfig() {
-       # 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
-               mkdir -p @@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
-               chmod -R 600 @@ETCDIR@@/ssl
-       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 \
-         --exec @@BINDIR@@/vmware-hostd 
-       eend $?
-       ebegin Stopping VMware Authentication Daemon
-       #start-stop-daemon --stop \
-       #  --exec @@PREFIX@@/sbin/vmware-authdlauncher
-       killall @@PREFIX@@/sbin/vmware-authdlauncher
-       eend $?
-}

diff --git 
a/app-emulation/vmware-workstation/vmware-workstation-11.1.3.3206955-r3.ebuild 
b/app-emulation/vmware-workstation/vmware-workstation-11.1.3.3206955-r3.ebuild
deleted file mode 100644
index 5ef6f10..0000000
--- 
a/app-emulation/vmware-workstation/vmware-workstation-11.1.3.3206955-r3.ebuild
+++ /dev/null
@@ -1,549 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils versionator readme.gentoo fdo-mime systemd gnome2-utils pam 
vmware-bundle
-
-MY_PN="VMware-Workstation"
-MY_PV=$(get_version_component_range 1-3)
-PV_MINOR=$(get_version_component_range 3)
-PV_BUILD=$(get_version_component_range 4)
-MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}"
-
-SYSTEMD_UNITS_TAG="gentoo-01"
-
-DESCRIPTION="Emulate a complete PC without the performance overhead of most 
emulators"
-HOMEPAGE="http://www.vmware.com/products/workstation/";
-BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/ws/${MY_PV}/${PV_BUILD}/linux/core/";
-SRC_URI="
-       amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar )
-       
https://github.com/akhuettel/systemd-vmware/archive/${SYSTEMD_UNITS_TAG}.tar.gz 
-> vmware-systemd-${SYSTEMD_UNITS_TAG}.tgz
-       "
-LICENSE="vmware GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="cups bundled-libs doc ovftool server vix vmware-tools"
-RESTRICT="mirror strip"
-
-BUNDLED_LIBS_DIR=/opt/vmware/lib/vmware/lib
-
-BUNDLED_LIBS="
-       libXau.so.6
-       libXcomposite.so.1
-       libXcursor.so.1
-       libXdamage.so.1
-       libXdmcp.so.6
-       libXfixes.so.3
-       libXft.so.2
-       libXinerama.so.1
-       libXrandr.so.2
-       libXrender.so.1
-       libaio.so.1
-       libatk-1.0.so.0
-       libatkmm-1.6.so.1
-       libatspi.so.0
-       libcairo.so.2
-       libcairomm-1.0.so.1
-       libcurl.so.4
-       libdbus-1.so.3
-       libfontconfig.so.1
-       libfreetype.so.6
-       libfuse.so.2
-       libgailutil.so.18
-       libgdk-x11-2.0.so.0
-       libgcrypt.so.11
-       libgdk_pixbuf-2.0.so.0
-       libgdkmm-2.4.so.1
-       libgio-2.0.so.0
-       libgiomm-2.4.so.1
-"
-
-BUNDLED_LIB_DEPENDS="
-       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
-       dev-libs/libaio
-       dev-libs/atk
-       dev-cpp/atkmm
-       app-accessibility/at-spi2-core
-       x11-libs/cairo
-       dev-cpp/cairomm
-       net-misc/curl
-       media-libs/fontconfig
-       media-libs/freetype
-       sys-fs/fuse
-       x11-libs/gtk+:2
-       || ( dev-libs/libgcrypt:0/11 dev-libs/libgcrypt:11/11 )
-       x11-libs/gdk-pixbuf:2
-       dev-cpp/gtkmm:2.4
-       dev-libs/glib:2
-       dev-cpp/glibmm:2
-"
-
-# vmware-workstation should not use virtual/libc as this is a
-# precompiled binary package thats linked to glibc.
-RDEPEND="
-       dev-cpp/libgnomecanvasmm
-       dev-cpp/pangomm
-       dev-libs/icu
-       dev-libs/expat
-       dev-libs/libsigc++:2
-       dev-libs/libxml2
-       dev-libs/openssl:0.9.8
-       dev-libs/xmlrpc-c
-       gnome-base/libgnomecanvas
-       gnome-base/libgtop:2
-       gnome-base/librsvg:2
-       gnome-base/orbit
-       media-libs/libart_lgpl
-       media-libs/libpng:1.2
-       media-libs/libpng
-       media-libs/tiff:3
-       cups? ( net-print/cups )
-       sys-devel/gcc
-       sys-libs/glibc
-       sys-libs/zlib
-       x11-libs/libgksu
-       x11-libs/libICE
-       x11-libs/libSM
-       x11-libs/libX11
-       x11-libs/libxcb
-       x11-libs/libXext
-       x11-libs/libXi
-       x11-libs/libXtst
-       x11-libs/pango
-       x11-libs/pangox-compat
-       x11-libs/startup-notification
-       x11-themes/hicolor-icon-theme
-       !app-emulation/vmware-player
-       !bundled-libs? ( ${BUNDLED_LIB_DEPENDS} )
-       sys-apps/dbus
-"
-PDEPEND="~app-emulation/vmware-modules-304.${PV_MINOR}
-       vmware-tools? ( app-emulation/vmware-tools )"
-
-S=${WORKDIR}
-VM_INSTALL_DIR="/opt/vmware"
-VM_DATA_STORE_DIR="/var/lib/vmware/Shared VMs"
-VM_HOSTD_USER="root"
-
-QA_PREBUILT="/opt/*"
-
-QA_WX_LOAD="/opt/vmware/lib/vmware/tools-upgraders/vmware-tools-upgrader-32 
/opt/vmware/lib/vmware/bin/vmware-vmx-stats 
/opt/vmware/lib/vmware/bin/vmware-vmx-debug 
/opt/vmware/lib/vmware/bin/vmware-vmx"
-
-src_unpack() {
-       default
-       local bundle
-       use amd64 && bundle=${MY_P}.x86_64.bundle
-       local component; for component in \
-               vmware-vmx \
-               vmware-player-app \
-               vmware-player-setup \
-               vmware-workstation \
-               vmware-network-editor \
-               vmware-network-editor-ui \
-               vmware-usbarbitrator \
-               vmware-vprobe
-       do
-               vmware-bundle_extract-bundle-component "${bundle}" 
"${component}" "${S}"
-       done
-
-       if use server; then
-               vmware-bundle_extract-bundle-component "${bundle}" 
vmware-workstation-server #"${S}"
-       fi
-
-       if use vix; then
-               vmware-bundle_extract-bundle-component "${bundle}" 
vmware-vix-core vmware-vix
-               vmware-bundle_extract-bundle-component "${bundle}" 
vmware-vix-lib-Workstation1100andvSphere600 vmware-vix
-       fi
-       if use ovftool; then
-               vmware-bundle_extract-bundle-component "${bundle}" 
vmware-ovftool
-       fi
-}
-
-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
-}
-
-src_prepare() {
-       rm -f  bin/vmware-modconfig
-       rm -rf lib/modules/binary
-       # Bug 459566
-       mv lib/libvmware-netcfg.so lib/lib/
-
-       if use server; then
-               rm -f vmware-workstation-server/bin/{openssl,configure-hostd.sh}
-       fi
-
-       find "${S}" -name '*.a' -delete
-
-       if ! use bundled-libs ; then
-               clean_bundled_libs
-       fi
-
-       DOC_CONTENTS="
-/etc/env.d is updated during ${PN} installation. Please run:\n
-env-update && source /etc/profile\n
-Before you can use vmware workstation, you must configure a default network 
setup.
-You can do this by running 'emerge --config ${PN}'.\n
-To be able to run ${PN} your user must be in the vmware group.\n
-You MUST set USE=bundled-libs if you are running gcc-5, otherwise vmware will 
not start.
-"
-}
-
-src_install() {
-       local major_minor=$(get_version_component_range 1-2 "${PV}")
-       local major_minor_revision=$(get_version_component_range 1-3 "${PV}")
-       local build=$(get_version_component_range 4 "${PV}")
-
-       # revdep-rebuild entry
-       insinto /etc/revdep-rebuild
-       echo "SEARCH_DIRS_MASK=\"${VM_INSTALL_DIR}\"" >> ${T}/10${PN}
-       doins "${T}"/10${PN}
-
-       # install the binaries
-       into "${VM_INSTALL_DIR}"
-       dobin bin/*
-
-       # install the libraries
-       insinto "${VM_INSTALL_DIR}"/lib/vmware
-       doins -r lib/*
-
-       # Bug 432918
-       dosym 
"${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.0.9.8/libcrypto.so.0.9.8 \
-               
"${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libcrypto.so.0.9.8
-       dosym 
"${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.0.9.8/libssl.so.0.9.8 \
-               
"${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libssl.so.0.9.8
-
-       # install the ancillaries
-       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
-
-       insinto /etc/xdg
-       doins -r etc/xdg/*
-
-       # install documentation
-       doman man/man1/vmware.1.gz
-
-       if use doc; then
-               dodoc doc/*
-       fi
-
-       insinto "${VM_INSTALL_DIR}"/lib/vmware/setup
-       doins vmware-config
-
-       # install vmware workstation server
-       if use server; then
-               dosbin sbin/*
-
-               cd "${S}"/vmware-workstation-server
-
-               # install binaries
-               into "${VM_INSTALL_DIR}"/lib/vmware
-               dobin bin/*
-
-               dobin "${FILESDIR}"/configure-hostd.sh
-
-               dobin "${FILESDIR}"/configure-hostd.sh
-
-               # install the libraries
-               insinto "${VM_INSTALL_DIR}"/lib/vmware/lib
-               doins -r lib/*
-
-               into "${VM_INSTALL_DIR}"
-               for tool in  vmware-{hostd,wssc-adminTool} ; do
-                       cat > "${T}/${tool}" <<-EOF
-                               #!/usr/bin/env bash
-                               set -e
-
-                               . /etc/vmware/bootstrap
-
-                               exec 
"${VM_INSTALL_DIR}/lib/vmware/lib/wrapper-gtk24.sh" \\
-                                       "${VM_INSTALL_DIR}/lib/vmware/lib" \\
-                                       
"${VM_INSTALL_DIR}/lib/vmware/bin/${tool}" \\
-                                       "${VM_INSTALL_DIR}/lib/vmware/libconf" 
"\$@"
-                       EOF
-                       dobin "${T}/${tool}"
-               done
-
-               insinto "${VM_INSTALL_DIR}"/lib/vmware
-               doins -r hostd
-
-               # create the configuration
-               insinto /etc/vmware/hostd
-               doins -r config/etc/vmware/hostd/*
-               doins -r etc/vmware/hostd/*
-
-               insinto /etc/vmware/ssl
-               doins etc/vmware/ssl/*
-
-               # pam
-               pamd_mimic_system vmware-authd auth account
-
-               # create directory for shared virtual machines.
-               keepdir "${VM_DATA_STORE_DIR}"
-               keepdir /var/log/vmware
-       fi
-
-       # install vmware-vix
-       if use vix; then
-               cd "${S}"/vmware-vix
-
-               # install the binary
-               into "${VM_INSTALL_DIR}"
-               dobin bin/*
-
-               # install the libraries
-               insinto "${VM_INSTALL_DIR}"/lib/vmware-vix
-               doins -r lib/*
-
-               dosym vmware-vix/libvixAllProducts.so 
"${VM_INSTALL_DIR}"/lib/libbvixAllProducts.so
-
-               # install headers
-               insinto /usr/include/vmware-vix
-               doins include/*
-
-               if use doc; then
-                       dohtml -r doc/*
-               fi
-       fi
-
-       # install ovftool
-       if use ovftool; then
-               cd "${S}"
-
-               insinto "${VM_INSTALL_DIR}"/lib/vmware-ovftool
-               doins -r vmware-ovftool/*
-
-               chmod 0755 
"${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/{ovftool,ovftool.bin}
-               dosym "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/ovftool 
"${VM_INSTALL_DIR}"/bin/ovftool
-       fi
-
-       # create symlinks for the various tools
-       local tool ; for tool in thnuclnt vmware vmplayer{,-daemon} licenseTool 
vmamqpd \
-                       
vmware-{acetool,enter-serial,gksu,fuseUI,modconfig{,-console},netcfg,tray,unity-helper,zenity}
 ; do
-               dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}"
-       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/icu /etc/vmware/icu
-
-       # fix permissions
-       fperms 0755 
"${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks}
-       fperms 0755 
"${VM_INSTALL_DIR}"/lib/vmware/lib/{wrapper-gtk24.sh,libgksu2.so.0/gksu-run-helper}
-       fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/setup/vmware-config
-       fperms 4711 "${VM_INSTALL_DIR}"/bin/vmware-mount
-       fperms 4711 
"${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats}
-       if use server; then
-               fperms 0755 
"${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-{hostd,wssc-adminTool}
-               fperms 4711 "${VM_INSTALL_DIR}"/sbin/vmware-authd
-               fperms 1777 "${VM_DATA_STORE_DIR}"
-       fi
-       if use vix; then
-               fperms 0755 
"${VM_INSTALL_DIR}"/lib/vmware-vix/setup/vmware-config
-       fi
-
-       # create the environment
-       local envd="${T}/90vmware"
-       cat > "${envd}" <<-EOF
-               PATH='${VM_INSTALL_DIR}/bin'
-               ROOTPATH='${VM_INSTALL_DIR}/bin'
-       EOF
-
-       use bundled-libs && echo 'VMWARE_USE_SHIPPED_LIBS=1' >> "${envd}"
-
-       doenvd "${envd}"
-
-       # create the configuration
-       dodir /etc/vmware
-
-       cat > "${D}"/etc/vmware/bootstrap <<-EOF
-               BINDIR='${VM_INSTALL_DIR}/bin'
-               LIBDIR='${VM_INSTALL_DIR}/lib'
-       EOF
-
-       cat > "${D}"/etc/vmware/config <<-EOF
-               bindir = "${VM_INSTALL_DIR}/bin"
-               libdir = "${VM_INSTALL_DIR}/lib/vmware"
-               initscriptdir = "/etc/init.d"
-               authd.fullpath = "${VM_INSTALL_DIR}/sbin/vmware-authd"
-               gksu.rootMethod = "su"
-               VMCI_CONFED = "yes"
-               VMBLOCK_CONFED = "yes"
-               VSOCK_CONFED = "yes"
-               NETWORKING = "yes"
-               player.product.version = "${major_minor_revision}"
-               product.version = "${major_minor_revision}"
-               product.buildNumber = "${build}"
-               product.name = "VMware Workstation"
-               workstation.product.version = "${major_minor_revision}"
-       EOF
-
-       if use vix; then
-               cat >> "${D}"/etc/vmware/config <<-EOF
-                       vmware.fullpath = "${VM_INSTALL_DIR}/bin/vmware"
-                       vix.libdir = "${VM_INSTALL_DIR}/lib/vmware-vix"
-                       vix.config.version = "1"
-               EOF
-       fi
-
-       if use server; then
-               cat >> "${D}"/etc/vmware/config <<-EOF
-                       authd.client.port = "902"
-                       authd.proxy.nfc = "vmware-hostd:ha-nfc"
-                       authd.soapserver = "TRUE"
-               EOF
-       fi
-
-       # install the init.d script
-       local initscript="${T}/vmware.rc"
-       sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
-               "${FILESDIR}/vmware-${major_minor}.rc" > ${initscript}
-       newinitd "${initscript}" vmware
-
-       if use server; then
-               # install the init.d script
-               local initscript="${T}/vmware-workstation-server.rc"
-               sed -e "s:@@ETCDIR@@:/etc/vmware:g" \
-                       -e "s:@@PREFIX@@:${VM_INSTALL_DIR}:g" \
-                       -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
-                       -e "s:@@LIBDIR@@:${VM_INSTALL_DIR}/lib/vmware:g" \
-                       "${FILESDIR}/vmware-server-${major_minor}.rc" > 
${initscript}
-               newinitd "${initscript}" vmware-workstation-server
-       fi
-
-       # fill in variable placeholders
-       sed -e "s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g" \
-               -i 
"${D}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}}
-       sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware:g" \
-               -e "/^Encoding/d" \
-               -i "${D}/usr/share/applications/${PN}.desktop"
-       sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \
-               -e "/^Encoding/d" \
-               -i "${D}/usr/share/applications/vmware-player.desktop"
-       sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware-netcfg:g" \
-               -e "/^Encoding/d" \
-               -i "${D}/usr/share/applications/vmware-netcfg.desktop"
-
-       if use server; then
-       # Configuration for vmware-workstation-server
-               local hostdUser="${VM_HOSTD_USER:-root}"
-               sed -e "/ACEDataUser/s:root:${hostdUser}:g" \
-                       -i "${D}/etc/vmware/hostd/authorization.xml" || die
-
-               # Shared VMs Path: [standard].
-               sed -e "s:##{DS_NAME}##:standard:g" \
-                       -e "s:##{DS_PATH}##:${VM_DATA_STORE_DIR}:g" \
-                       -i "${D}/etc/vmware/hostd/datastores.xml" || die
-
-               sed -e "s:##{HTTP_PORT}##:-1:g" \
-                       -e "s:##{HTTPS_PORT}##:443:g" \
-                       -e "s:##{PIPE_PREFIX}##:/var/run/vmware/:g" \
-                       -i "${D}/etc/vmware/hostd/proxy.xml" || die
-
-               # See vmware-workstation-server.py for more details.
-               sed -e "s:##{BUILD_CFGDIR}##:/etc/vmware/hostd/:g" \
-                       -e "s:##{CFGALTDIR}##:/etc/vmware/hostd/:g" \
-                       -e "s:##{CFGDIR}##:/etc/vmware/:g" \
-                       -e "s:##{ENABLE_AUTH}##:true:g" \
-                       -e "s:##{HOSTDMODE}##:ws:g" \
-                       -e "s:##{HOSTD_CFGDIR}##:/etc/vmware/hostd/:g" \
-                       -e "s:##{HOSTD_MOCKUP}##:false:g" \
-                       -e "s:##{LIBDIR}##:${VM_INSTALL_DIR}/lib/vmware:g" \
-                       -e 
"s:##{LIBDIR_INSTALLED}##:${VM_INSTALL_DIR}/lib/vmware/:g" \
-                       -e "s:##{LOGDIR}##:/var/log/vmware/:g" \
-                       -e "s:##{LOGLEVEL}##:verbose:g" \
-                       -e "s:##{MOCKUP}##:mockup-host-config.xml:g" \
-                       -e "s:##{PLUGINDIR}##:./:g" \
-                       -e "s:##{SHLIB_PREFIX}##:lib:g" \
-                       -e "s:##{SHLIB_SUFFIX}##:.so:g" \
-                       -e "s:##{USE_BLKLISTSVC}##:false:g" \
-                       -e "s:##{USE_CBRCSVC}##:false:g" \
-                       -e "s:##{USE_CIMSVC}##:false:g" \
-                       -e "s:##{USE_DIRECTORYSVC}##:false:g" \
-                       -e "s:##{USE_DIRECTORYSVC_MOCKUP}##:false:g" \
-                       -e "s:##{USE_DYNAMIC_PLUGIN_LOADING}##:false:g" \
-                       -e "s:##{USE_DYNAMO}##:false:g" \
-                       -e "s:##{USE_DYNSVC}##:false:g" \
-                       -e "s:##{USE_GUESTSVC}##:false:g" \
-                       -e "s:##{USE_HBRSVC}##:false:g" \
-                       -e "s:##{USE_HBRSVC_MOCKUP}##:false:g" \
-                       -e "s:##{USE_HOSTSVC_MOCKUP}##:false:g" \
-                       -e "s:##{USE_HTTPNFCSVC}##:false:g" \
-                       -e "s:##{USE_HTTPNFCSVC_MOCKUP}##:false:g" \
-                       -e "s:##{USE_LICENSESVC_MOCKUP}##:false:g" \
-                       -e "s:##{USE_NFCSVC}##:true:g" \
-                       -e "s:##{USE_NFCSVC_MOCKUP}##:false:g" \
-                       -e "s:##{USE_OVFMGRSVC}##:true:g" \
-                       -e "s:##{USE_PARTITIONSVC}##:false:g" \
-                       -e "s:##{USE_SECURESOAP}##:false:g" \
-                       -e "s:##{USE_SNMPSVC}##:false:g" \
-                       -e "s:##{USE_SOLO_MOCKUP}##:false:g" \
-                       -e "s:##{USE_STATSSVC_MOCKUP}##:false:g" \
-                       -e "s:##{USE_VCSVC_MOCKUP}##:false:g" \
-                       -e "s:##{USE_VDISKSVC}##:false:g" \
-                       -e "s:##{USE_VDISKSVC_MOCKUP}##:false:g" \
-                       -e "s:##{USE_VMSVC_MOCKUP}##:false:g" \
-                       -e "s:##{VM_INVENTORY}##:vmInventory.xml:g" \
-                       -e "s:##{VM_RESOURCES}##:vmResources.xml:g" \
-                       -e "s:##{WEBSERVER_PORT_ENTRY}##::g" \
-                       -e "s:##{WORKINGDIR}##:./:g" \
-                       -i "${D}/etc/vmware/hostd/config.xml" || die
-
-               sed -e "s:##{ENV_LOCATION}##:/etc/vmware/hostd/env/:g" \
-                       -i "${D}/etc/vmware/hostd/environments.xml" || die
-
-               # @@VICLIENT_URL@@=XXX
-               sed -e "s:@@AUTHD_PORT@@:902:g" \
-                       -i 
"${D}${VM_INSTALL_DIR}/lib/vmware/hostd/docroot/client/clients.xml" || die
-       fi
-
-       # install systemd unit files
-       systemd_dounit 
"${WORKDIR}/systemd-vmware-${SYSTEMD_UNITS_TAG}/"*.{service,target}
-
-       readme.gentoo_create_doc
-}
-
-pkg_config() {
-       "${VM_INSTALL_DIR}"/bin/vmware-networks --postinstall ${PN},old,new
-}
-
-pkg_preinst() {
-       gnome2_icon_savelist
-}
-
-pkg_postinst() {
-       fdo-mime_desktop_database_update
-       gnome2_icon_cache_update
-       readme.gentoo_pkg_postinst
-}
-
-pkg_prerm() {
-       einfo "Stopping ${PN} for safe unmerge"
-       /etc/init.d/vmware stop
-}
-
-pkg_postrm() {
-       fdo-mime_desktop_database_update
-       gnome2_icon_cache_update
-}

diff --git 
a/app-emulation/vmware-workstation/vmware-workstation-11.1.3.3206955-r4.ebuild 
b/app-emulation/vmware-workstation/vmware-workstation-11.1.3.3206955-r4.ebuild
deleted file mode 100644
index 4f488fd..0000000
--- 
a/app-emulation/vmware-workstation/vmware-workstation-11.1.3.3206955-r4.ebuild
+++ /dev/null
@@ -1,549 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils versionator readme.gentoo fdo-mime systemd gnome2-utils pam 
vmware-bundle
-
-MY_PN="VMware-Workstation"
-MY_PV=$(get_version_component_range 1-3)
-PV_MINOR=$(get_version_component_range 3)
-PV_BUILD=$(get_version_component_range 4)
-MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}"
-
-SYSTEMD_UNITS_TAG="gentoo-01"
-
-DESCRIPTION="Emulate a complete PC without the performance overhead of most 
emulators"
-HOMEPAGE="http://www.vmware.com/products/workstation/";
-BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/ws/${MY_PV}/${PV_BUILD}/linux/core/";
-SRC_URI="
-       amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar )
-       
https://github.com/akhuettel/systemd-vmware/archive/${SYSTEMD_UNITS_TAG}.tar.gz 
-> vmware-systemd-${SYSTEMD_UNITS_TAG}.tgz
-       "
-LICENSE="vmware GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="cups bundled-libs doc ovftool server vix vmware-tools"
-RESTRICT="mirror strip"
-
-BUNDLED_LIBS_DIR=/opt/vmware/lib/vmware/lib
-
-BUNDLED_LIBS="
-       libXau.so.6
-       libXcomposite.so.1
-       libXcursor.so.1
-       libXdamage.so.1
-       libXdmcp.so.6
-       libXfixes.so.3
-       libXft.so.2
-       libXinerama.so.1
-       libXrandr.so.2
-       libXrender.so.1
-       libaio.so.1
-       libatk-1.0.so.0
-       libatkmm-1.6.so.1
-       libatspi.so.0
-       libcairo.so.2
-       libcairomm-1.0.so.1
-       libcurl.so.4
-       libdbus-1.so.3
-       libfontconfig.so.1
-       libfreetype.so.6
-       libfuse.so.2
-       libgailutil.so.18
-       libgdk-x11-2.0.so.0
-       libgcrypt.so.11
-       libgdk_pixbuf-2.0.so.0
-       libgdkmm-2.4.so.1
-       libgio-2.0.so.0
-       libgiomm-2.4.so.1
-"
-
-BUNDLED_LIB_DEPENDS="
-       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
-       dev-libs/libaio
-       dev-libs/atk
-       dev-cpp/atkmm
-       app-accessibility/at-spi2-core
-       x11-libs/cairo
-       dev-cpp/cairomm
-       net-misc/curl
-       media-libs/fontconfig
-       media-libs/freetype
-       sys-fs/fuse
-       x11-libs/gtk+:2
-       || ( dev-libs/libgcrypt:0/11 dev-libs/libgcrypt:11/11 )
-       x11-libs/gdk-pixbuf:2
-       dev-cpp/gtkmm:2.4
-       dev-libs/glib:2
-       dev-cpp/glibmm:2
-"
-
-# vmware-workstation should not use virtual/libc as this is a
-# precompiled binary package thats linked to glibc.
-RDEPEND="
-       dev-cpp/libgnomecanvasmm
-       dev-cpp/pangomm
-       dev-libs/icu
-       dev-libs/expat
-       dev-libs/libsigc++:2
-       dev-libs/libxml2
-       dev-libs/openssl:0
-       dev-libs/xmlrpc-c
-       gnome-base/libgnomecanvas
-       gnome-base/libgtop:2
-       gnome-base/librsvg:2
-       gnome-base/orbit
-       media-libs/libart_lgpl
-       media-libs/libpng:1.2
-       media-libs/libpng
-       media-libs/tiff:3
-       cups? ( net-print/cups )
-       sys-devel/gcc
-       sys-libs/glibc
-       sys-libs/zlib
-       x11-libs/libgksu
-       x11-libs/libICE
-       x11-libs/libSM
-       x11-libs/libX11
-       x11-libs/libxcb
-       x11-libs/libXext
-       x11-libs/libXi
-       x11-libs/libXtst
-       x11-libs/pango
-       x11-libs/pangox-compat
-       x11-libs/startup-notification
-       x11-themes/hicolor-icon-theme
-       !app-emulation/vmware-player
-       !bundled-libs? ( ${BUNDLED_LIB_DEPENDS} )
-       sys-apps/dbus
-"
-PDEPEND="~app-emulation/vmware-modules-304.${PV_MINOR}
-       vmware-tools? ( app-emulation/vmware-tools )"
-
-S=${WORKDIR}
-VM_INSTALL_DIR="/opt/vmware"
-VM_DATA_STORE_DIR="/var/lib/vmware/Shared VMs"
-VM_HOSTD_USER="root"
-
-QA_PREBUILT="/opt/*"
-
-QA_WX_LOAD="/opt/vmware/lib/vmware/tools-upgraders/vmware-tools-upgrader-32 
/opt/vmware/lib/vmware/bin/vmware-vmx-stats 
/opt/vmware/lib/vmware/bin/vmware-vmx-debug 
/opt/vmware/lib/vmware/bin/vmware-vmx"
-
-src_unpack() {
-       default
-       local bundle
-       use amd64 && bundle=${MY_P}.x86_64.bundle
-       local component; for component in \
-               vmware-vmx \
-               vmware-player-app \
-               vmware-player-setup \
-               vmware-workstation \
-               vmware-network-editor \
-               vmware-network-editor-ui \
-               vmware-usbarbitrator \
-               vmware-vprobe
-       do
-               vmware-bundle_extract-bundle-component "${bundle}" 
"${component}" "${S}"
-       done
-
-       if use server; then
-               vmware-bundle_extract-bundle-component "${bundle}" 
vmware-workstation-server #"${S}"
-       fi
-
-       if use vix; then
-               vmware-bundle_extract-bundle-component "${bundle}" 
vmware-vix-core vmware-vix
-               vmware-bundle_extract-bundle-component "${bundle}" 
vmware-vix-lib-Workstation1100andvSphere600 vmware-vix
-       fi
-       if use ovftool; then
-               vmware-bundle_extract-bundle-component "${bundle}" 
vmware-ovftool
-       fi
-}
-
-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
-}
-
-src_prepare() {
-       rm -f  bin/vmware-modconfig
-       rm -rf lib/modules/binary
-       # Bug 459566
-       mv lib/libvmware-netcfg.so lib/lib/
-
-       if use server; then
-               rm -f vmware-workstation-server/bin/{openssl,configure-hostd.sh}
-       fi
-
-       find "${S}" -name '*.a' -delete
-
-       if ! use bundled-libs ; then
-               clean_bundled_libs
-       fi
-
-       DOC_CONTENTS="
-/etc/env.d is updated during ${PN} installation. Please run:\n
-env-update && source /etc/profile\n
-Before you can use vmware workstation, you must configure a default network 
setup.
-You can do this by running 'emerge --config ${PN}'.\n
-To be able to run ${PN} your user must be in the vmware group.\n
-You MUST set USE=bundled-libs if you are running gcc-5, otherwise vmware will 
not start.
-"
-}
-
-src_install() {
-       local major_minor=$(get_version_component_range 1-2 "${PV}")
-       local major_minor_revision=$(get_version_component_range 1-3 "${PV}")
-       local build=$(get_version_component_range 4 "${PV}")
-
-       # revdep-rebuild entry
-       insinto /etc/revdep-rebuild
-       echo "SEARCH_DIRS_MASK=\"${VM_INSTALL_DIR}\"" >> ${T}/10${PN}
-       doins "${T}"/10${PN}
-
-       # install the binaries
-       into "${VM_INSTALL_DIR}"
-       dobin bin/*
-
-       # install the libraries
-       insinto "${VM_INSTALL_DIR}"/lib/vmware
-       doins -r lib/*
-
-       # Bug 432918
-       dosym 
"${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.1.0.1/libcrypto.so.1.0.1 \
-               
"${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libcrypto.so.1.0.1
-       dosym 
"${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.1.0.1/libssl.so.1.0.1 \
-               
"${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libssl.so.1.0.1
-
-       # install the ancillaries
-       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
-
-       insinto /etc/xdg
-       doins -r etc/xdg/*
-
-       # install documentation
-       doman man/man1/vmware.1.gz
-
-       if use doc; then
-               dodoc doc/*
-       fi
-
-       insinto "${VM_INSTALL_DIR}"/lib/vmware/setup
-       doins vmware-config
-
-       # install vmware workstation server
-       if use server; then
-               dosbin sbin/*
-
-               cd "${S}"/vmware-workstation-server
-
-               # install binaries
-               into "${VM_INSTALL_DIR}"/lib/vmware
-               dobin bin/*
-
-               dobin "${FILESDIR}"/configure-hostd.sh
-
-               dobin "${FILESDIR}"/configure-hostd.sh
-
-               # install the libraries
-               insinto "${VM_INSTALL_DIR}"/lib/vmware/lib
-               doins -r lib/*
-
-               into "${VM_INSTALL_DIR}"
-               for tool in  vmware-{hostd,wssc-adminTool} ; do
-                       cat > "${T}/${tool}" <<-EOF
-                               #!/usr/bin/env bash
-                               set -e
-
-                               . /etc/vmware/bootstrap
-
-                               exec 
"${VM_INSTALL_DIR}/lib/vmware/lib/wrapper-gtk24.sh" \\
-                                       "${VM_INSTALL_DIR}/lib/vmware/lib" \\
-                                       
"${VM_INSTALL_DIR}/lib/vmware/bin/${tool}" \\
-                                       "${VM_INSTALL_DIR}/lib/vmware/libconf" 
"\$@"
-                       EOF
-                       dobin "${T}/${tool}"
-               done
-
-               insinto "${VM_INSTALL_DIR}"/lib/vmware
-               doins -r hostd
-
-               # create the configuration
-               insinto /etc/vmware/hostd
-               doins -r config/etc/vmware/hostd/*
-               doins -r etc/vmware/hostd/*
-
-               insinto /etc/vmware/ssl
-               doins etc/vmware/ssl/*
-
-               # pam
-               pamd_mimic_system vmware-authd auth account
-
-               # create directory for shared virtual machines.
-               keepdir "${VM_DATA_STORE_DIR}"
-               keepdir /var/log/vmware
-       fi
-
-       # install vmware-vix
-       if use vix; then
-               cd "${S}"/vmware-vix
-
-               # install the binary
-               into "${VM_INSTALL_DIR}"
-               dobin bin/*
-
-               # install the libraries
-               insinto "${VM_INSTALL_DIR}"/lib/vmware-vix
-               doins -r lib/*
-
-               dosym vmware-vix/libvixAllProducts.so 
"${VM_INSTALL_DIR}"/lib/libbvixAllProducts.so
-
-               # install headers
-               insinto /usr/include/vmware-vix
-               doins include/*
-
-               if use doc; then
-                       dohtml -r doc/*
-               fi
-       fi
-
-       # install ovftool
-       if use ovftool; then
-               cd "${S}"
-
-               insinto "${VM_INSTALL_DIR}"/lib/vmware-ovftool
-               doins -r vmware-ovftool/*
-
-               chmod 0755 
"${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/{ovftool,ovftool.bin}
-               dosym "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/ovftool 
"${VM_INSTALL_DIR}"/bin/ovftool
-       fi
-
-       # create symlinks for the various tools
-       local tool ; for tool in thnuclnt vmware vmplayer{,-daemon} licenseTool 
vmamqpd \
-                       
vmware-{acetool,enter-serial,gksu,fuseUI,modconfig{,-console},netcfg,tray,unity-helper,zenity}
 ; do
-               dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}"
-       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/icu /etc/vmware/icu
-
-       # fix permissions
-       fperms 0755 
"${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks}
-       fperms 0755 
"${VM_INSTALL_DIR}"/lib/vmware/lib/{wrapper-gtk24.sh,libgksu2.so.0/gksu-run-helper}
-       fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/setup/vmware-config
-       fperms 4711 "${VM_INSTALL_DIR}"/bin/vmware-mount
-       fperms 4711 
"${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats}
-       if use server; then
-               fperms 0755 
"${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-{hostd,wssc-adminTool}
-               fperms 4711 "${VM_INSTALL_DIR}"/sbin/vmware-authd
-               fperms 1777 "${VM_DATA_STORE_DIR}"
-       fi
-       if use vix; then
-               fperms 0755 
"${VM_INSTALL_DIR}"/lib/vmware-vix/setup/vmware-config
-       fi
-
-       # create the environment
-       local envd="${T}/90vmware"
-       cat > "${envd}" <<-EOF
-               PATH='${VM_INSTALL_DIR}/bin'
-               ROOTPATH='${VM_INSTALL_DIR}/bin'
-       EOF
-
-       use bundled-libs && echo 'VMWARE_USE_SHIPPED_LIBS=1' >> "${envd}"
-
-       doenvd "${envd}"
-
-       # create the configuration
-       dodir /etc/vmware
-
-       cat > "${D}"/etc/vmware/bootstrap <<-EOF
-               BINDIR='${VM_INSTALL_DIR}/bin'
-               LIBDIR='${VM_INSTALL_DIR}/lib'
-       EOF
-
-       cat > "${D}"/etc/vmware/config <<-EOF
-               bindir = "${VM_INSTALL_DIR}/bin"
-               libdir = "${VM_INSTALL_DIR}/lib/vmware"
-               initscriptdir = "/etc/init.d"
-               authd.fullpath = "${VM_INSTALL_DIR}/sbin/vmware-authd"
-               gksu.rootMethod = "su"
-               VMCI_CONFED = "yes"
-               VMBLOCK_CONFED = "yes"
-               VSOCK_CONFED = "yes"
-               NETWORKING = "yes"
-               player.product.version = "${major_minor_revision}"
-               product.version = "${major_minor_revision}"
-               product.buildNumber = "${build}"
-               product.name = "VMware Workstation"
-               workstation.product.version = "${major_minor_revision}"
-       EOF
-
-       if use vix; then
-               cat >> "${D}"/etc/vmware/config <<-EOF
-                       vmware.fullpath = "${VM_INSTALL_DIR}/bin/vmware"
-                       vix.libdir = "${VM_INSTALL_DIR}/lib/vmware-vix"
-                       vix.config.version = "1"
-               EOF
-       fi
-
-       if use server; then
-               cat >> "${D}"/etc/vmware/config <<-EOF
-                       authd.client.port = "902"
-                       authd.proxy.nfc = "vmware-hostd:ha-nfc"
-                       authd.soapserver = "TRUE"
-               EOF
-       fi
-
-       # install the init.d script
-       local initscript="${T}/vmware.rc"
-       sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
-               "${FILESDIR}/vmware-${major_minor}.rc" > ${initscript}
-       newinitd "${initscript}" vmware
-
-       if use server; then
-               # install the init.d script
-               local initscript="${T}/vmware-workstation-server.rc"
-               sed -e "s:@@ETCDIR@@:/etc/vmware:g" \
-                       -e "s:@@PREFIX@@:${VM_INSTALL_DIR}:g" \
-                       -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
-                       -e "s:@@LIBDIR@@:${VM_INSTALL_DIR}/lib/vmware:g" \
-                       "${FILESDIR}/vmware-server-${major_minor}.rc" > 
${initscript}
-               newinitd "${initscript}" vmware-workstation-server
-       fi
-
-       # fill in variable placeholders
-       sed -e "s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g" \
-               -i 
"${D}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}}
-       sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware:g" \
-               -e "/^Encoding/d" \
-               -i "${D}/usr/share/applications/${PN}.desktop"
-       sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \
-               -e "/^Encoding/d" \
-               -i "${D}/usr/share/applications/vmware-player.desktop"
-       sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware-netcfg:g" \
-               -e "/^Encoding/d" \
-               -i "${D}/usr/share/applications/vmware-netcfg.desktop"
-
-       if use server; then
-       # Configuration for vmware-workstation-server
-               local hostdUser="${VM_HOSTD_USER:-root}"
-               sed -e "/ACEDataUser/s:root:${hostdUser}:g" \
-                       -i "${D}/etc/vmware/hostd/authorization.xml" || die
-
-               # Shared VMs Path: [standard].
-               sed -e "s:##{DS_NAME}##:standard:g" \
-                       -e "s:##{DS_PATH}##:${VM_DATA_STORE_DIR}:g" \
-                       -i "${D}/etc/vmware/hostd/datastores.xml" || die
-
-               sed -e "s:##{HTTP_PORT}##:-1:g" \
-                       -e "s:##{HTTPS_PORT}##:443:g" \
-                       -e "s:##{PIPE_PREFIX}##:/var/run/vmware/:g" \
-                       -i "${D}/etc/vmware/hostd/proxy.xml" || die
-
-               # See vmware-workstation-server.py for more details.
-               sed -e "s:##{BUILD_CFGDIR}##:/etc/vmware/hostd/:g" \
-                       -e "s:##{CFGALTDIR}##:/etc/vmware/hostd/:g" \
-                       -e "s:##{CFGDIR}##:/etc/vmware/:g" \
-                       -e "s:##{ENABLE_AUTH}##:true:g" \
-                       -e "s:##{HOSTDMODE}##:ws:g" \
-                       -e "s:##{HOSTD_CFGDIR}##:/etc/vmware/hostd/:g" \
-                       -e "s:##{HOSTD_MOCKUP}##:false:g" \
-                       -e "s:##{LIBDIR}##:${VM_INSTALL_DIR}/lib/vmware:g" \
-                       -e 
"s:##{LIBDIR_INSTALLED}##:${VM_INSTALL_DIR}/lib/vmware/:g" \
-                       -e "s:##{LOGDIR}##:/var/log/vmware/:g" \
-                       -e "s:##{LOGLEVEL}##:verbose:g" \
-                       -e "s:##{MOCKUP}##:mockup-host-config.xml:g" \
-                       -e "s:##{PLUGINDIR}##:./:g" \
-                       -e "s:##{SHLIB_PREFIX}##:lib:g" \
-                       -e "s:##{SHLIB_SUFFIX}##:.so:g" \
-                       -e "s:##{USE_BLKLISTSVC}##:false:g" \
-                       -e "s:##{USE_CBRCSVC}##:false:g" \
-                       -e "s:##{USE_CIMSVC}##:false:g" \
-                       -e "s:##{USE_DIRECTORYSVC}##:false:g" \
-                       -e "s:##{USE_DIRECTORYSVC_MOCKUP}##:false:g" \
-                       -e "s:##{USE_DYNAMIC_PLUGIN_LOADING}##:false:g" \
-                       -e "s:##{USE_DYNAMO}##:false:g" \
-                       -e "s:##{USE_DYNSVC}##:false:g" \
-                       -e "s:##{USE_GUESTSVC}##:false:g" \
-                       -e "s:##{USE_HBRSVC}##:false:g" \
-                       -e "s:##{USE_HBRSVC_MOCKUP}##:false:g" \
-                       -e "s:##{USE_HOSTSVC_MOCKUP}##:false:g" \
-                       -e "s:##{USE_HTTPNFCSVC}##:false:g" \
-                       -e "s:##{USE_HTTPNFCSVC_MOCKUP}##:false:g" \
-                       -e "s:##{USE_LICENSESVC_MOCKUP}##:false:g" \
-                       -e "s:##{USE_NFCSVC}##:true:g" \
-                       -e "s:##{USE_NFCSVC_MOCKUP}##:false:g" \
-                       -e "s:##{USE_OVFMGRSVC}##:true:g" \
-                       -e "s:##{USE_PARTITIONSVC}##:false:g" \
-                       -e "s:##{USE_SECURESOAP}##:false:g" \
-                       -e "s:##{USE_SNMPSVC}##:false:g" \
-                       -e "s:##{USE_SOLO_MOCKUP}##:false:g" \
-                       -e "s:##{USE_STATSSVC_MOCKUP}##:false:g" \
-                       -e "s:##{USE_VCSVC_MOCKUP}##:false:g" \
-                       -e "s:##{USE_VDISKSVC}##:false:g" \
-                       -e "s:##{USE_VDISKSVC_MOCKUP}##:false:g" \
-                       -e "s:##{USE_VMSVC_MOCKUP}##:false:g" \
-                       -e "s:##{VM_INVENTORY}##:vmInventory.xml:g" \
-                       -e "s:##{VM_RESOURCES}##:vmResources.xml:g" \
-                       -e "s:##{WEBSERVER_PORT_ENTRY}##::g" \
-                       -e "s:##{WORKINGDIR}##:./:g" \
-                       -i "${D}/etc/vmware/hostd/config.xml" || die
-
-               sed -e "s:##{ENV_LOCATION}##:/etc/vmware/hostd/env/:g" \
-                       -i "${D}/etc/vmware/hostd/environments.xml" || die
-
-               # @@VICLIENT_URL@@=XXX
-               sed -e "s:@@AUTHD_PORT@@:902:g" \
-                       -i 
"${D}${VM_INSTALL_DIR}/lib/vmware/hostd/docroot/client/clients.xml" || die
-       fi
-
-       # install systemd unit files
-       systemd_dounit 
"${WORKDIR}/systemd-vmware-${SYSTEMD_UNITS_TAG}/"*.{service,target}
-
-       readme.gentoo_create_doc
-}
-
-pkg_config() {
-       "${VM_INSTALL_DIR}"/bin/vmware-networks --postinstall ${PN},old,new
-}
-
-pkg_preinst() {
-       gnome2_icon_savelist
-}
-
-pkg_postinst() {
-       fdo-mime_desktop_database_update
-       gnome2_icon_cache_update
-       readme.gentoo_pkg_postinst
-}
-
-pkg_prerm() {
-       einfo "Stopping ${PN} for safe unmerge"
-       /etc/init.d/vmware stop
-}
-
-pkg_postrm() {
-       fdo-mime_desktop_database_update
-       gnome2_icon_cache_update
-}

diff --git 
a/app-emulation/vmware-workstation/vmware-workstation-12.1.1.3770994.ebuild 
b/app-emulation/vmware-workstation/vmware-workstation-12.1.1.3770994.ebuild
deleted file mode 100644
index fa77191..0000000
--- a/app-emulation/vmware-workstation/vmware-workstation-12.1.1.3770994.ebuild
+++ /dev/null
@@ -1,599 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils versionator readme.gentoo-r1 fdo-mime gnome2-utils pam systemd 
vmware-bundle
-
-MY_PN="VMware-Workstation"
-MY_PV=$(get_version_component_range 1-3)
-PV_MODULES="308.$(get_version_component_range 2-3)"
-PV_BUILD=$(get_version_component_range 4)
-MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}"
-
-SYSTEMD_UNITS_TAG="gentoo-02"
-
-DESCRIPTION="Emulate a complete PC without the performance overhead of most 
emulators"
-HOMEPAGE="http://www.vmware.com/products/workstation/";
-BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/ws/${MY_PV}/${PV_BUILD}/linux/core/";
-SRC_URI="
-       amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar )
-       
https://github.com/akhuettel/systemd-vmware/archive/${SYSTEMD_UNITS_TAG}.tar.gz 
-> vmware-systemd-${SYSTEMD_UNITS_TAG}.tgz
-       "
-
-LICENSE="vmware GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="bundled-libs cups doc ovftool server vix +vmware-tools"
-RESTRICT="mirror strip"
-
-BUNDLED_LIBS_DIR=/opt/vmware/lib/vmware/lib
-
-BUNDLED_LIBS="
-       libXau.so.6
-       libXcomposite.so.1
-       libXcursor.so.1
-       libXdamage.so.1
-       libXdmcp.so.6
-       libXfixes.so.3
-       libXft.so.2
-       libXinerama.so.1
-       libXrandr.so.2
-       libXrender.so.1
-       libaio.so.1
-       libatk-1.0.so.0
-       libatkmm-1.6.so.1
-       libatspi.so.0
-       libcairo.so.2
-       libcairomm-1.0.so.1
-       libcrypto.so.1.0.1
-       libcurl.so.4
-       libdbus-1.so.3
-       libfontconfig.so.1
-       libfreetype.so.6
-       libfuse.so.2
-       libgailutil.so.18
-       libgcc_s.so.1
-       libgcrypt.so.11
-       libgdk-x11-2.0.so.0
-       libgdk_pixbuf-2.0.so.0
-       libgdkmm-2.4.so.1
-       libgio-2.0.so.0
-       libgiomm-2.4.so.1
-       libglib-2.0.so.0
-       libglibmm-2.4.so.1
-       libglibmm_generate_extra_defs-2.4.so.1
-       libgmodule-2.0.so.0
-       libgobject-2.0.so.0
-       libgpg-error.so.0
-       libgthread-2.0.so.0
-       libgtk-x11-2.0.so.0
-       libgtkmm-2.4.so.1
-       libpango-1.0.so.0
-       libpangocairo-1.0.so.0
-       libpangoft2-1.0.so.0
-       libpangomm-1.4.so.1
-       libpangox-1.0.so.0
-       libpangoxft-1.0.so.0
-       libpcsclite.so.1
-       libpixman-1.so.0
-       libpng12.so.0
-       librsvg-2.so.2
-       libsigc-2.0.so.0
-       libssl.so.1.0.1
-       libstdc++.so.6
-       libxml2.so.2
-       libz.so.1
-"
-
-BUNDLED_LIB_DEPENDS="
-       dev-cpp/atkmm
-       dev-cpp/cairomm
-       dev-cpp/glibmm:2
-       dev-cpp/gtkmm:2.4
-       dev-cpp/pangomm
-       dev-libs/atk
-       dev-libs/glib:2
-       dev-libs/libgcrypt:11/11
-       dev-libs/libgpg-error
-       dev-libs/libsigc++:2
-       dev-libs/libxml2
-       dev-libs/openssl:0
-       media-libs/fontconfig
-       media-libs/freetype
-       media-libs/libpng:1.2
-       net-misc/curl
-       sys-fs/fuse
-       sys-libs/zlib
-       x11-libs/cairo
-       x11-libs/gdk-pixbuf:2
-       x11-libs/gtk+:2
-       x11-libs/libXau
-       x11-libs/libXcomposite
-       x11-libs/libXdamage
-       x11-libs/libXfixes
-       x11-libs/libXrandr
-       x11-libs/libXrender
-       x11-libs/pango
-       x11-libs/pixman
-"
-
-# vmware should not use virtual/libc as this is a
-# precompiled binary package thats linked to glibc.
-RDEPEND="
-       media-libs/alsa-lib
-       net-print/cups
-       x11-libs/libX11
-       x11-libs/libXcursor
-       x11-libs/libXext
-       x11-libs/libXi
-       x11-libs/libXinerama
-       x11-libs/libXtst
-       x11-libs/startup-notification
-       x11-themes/hicolor-icon-theme
-       bundled-libs? (
-               media-libs/tiff:3
-               x11-libs/libICE
-               x11-libs/libSM
-               virtual/jpeg:62
-       )
-       !bundled-libs? ( ${BUNDLED_LIB_DEPENDS} )
-       !app-emulation/vmware-player
-"
-PDEPEND="~app-emulation/vmware-modules-${PV_MODULES}
-       vmware-tools? ( app-emulation/vmware-tools )"
-DEPEND=">=dev-util/patchelf-0.9"
-
-S=${WORKDIR}
-VM_INSTALL_DIR="/opt/vmware"
-VM_DATA_STORE_DIR="/var/lib/vmware/Shared VMs"
-VM_HOSTD_USER="root"
-
-QA_PREBUILT="/opt/*"
-
-QA_WX_LOAD="opt/vmware/lib/vmware/tools-upgraders/vmware-tools-upgrader-32 
opt/vmware/lib/vmware/bin/vmware-vmx-stats 
opt/vmware/lib/vmware/bin/vmware-vmx-debug opt/vmware/lib/vmware/bin/vmware-vmx"
-
-src_unpack() {
-       default
-       local bundle=${MY_P}.x86_64.bundle
-
-       local component; for component in \
-               vmware-workstation \
-               vmware-player-app \
-               vmware-player-setup \
-               vmware-vmx \
-               vmware-network-editor \
-               vmware-network-editor-ui \
-               vmware-usbarbitrator \
-               vmware-vprobe
-       do
-               vmware-bundle_extract-bundle-component "${bundle}" 
"${component}" "${S}"
-       done
-
-       if use ovftool; then
-               vmware-bundle_extract-bundle-component "${bundle}" 
vmware-ovftool
-       fi
-
-       if use server; then
-               vmware-bundle_extract-bundle-component "${bundle}" 
vmware-workstation-server #"${S}"
-       fi
-
-       if use vix; then
-               vmware-bundle_extract-bundle-component "${bundle}" 
vmware-vix-core vmware-vix
-               vmware-bundle_extract-bundle-component "${bundle}" 
vmware-vix-lib-Workstation1200 vmware-vix
-       fi
-}
-
-clean_bundled_libs() {
-       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
-       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() {
-       rm -f bin/vmware-modconfig
-       rm -rf lib/modules/binary
-       # Bug 459566
-       mv lib/libvmware-netcfg.so lib/lib/
-
-       if use server; then
-               rm -f vmware-workstation-server/bin/{openssl,configure-hostd.sh}
-       fi
-
-       clean_bundled_libs
-
-       DOC_CONTENTS="
-/etc/env.d is updated during ${PN} installation. Please run:\n
-env-update && source /etc/profile\n
-Before you can use ${PN}, you must configure a default network setup.
-You can do this by running 'emerge --config ${PN}'.\n
-To be able to run ${PN} your user must be in the vmware group.\n
-You MUST set USE=bundled-libs if you are running gcc-5, otherwise vmware will 
not start.
-"
-}
-
-src_install() {
-       local major_minor=$(get_version_component_range 1-2 "${PV}")
-
-       # revdep-rebuild entry
-       insinto /etc/revdep-rebuild
-       echo "SEARCH_DIRS_MASK=\"${VM_INSTALL_DIR}\"" >> ${T}/10${PN}
-       doins "${T}"/10${PN}
-
-       # install the binaries
-       into "${VM_INSTALL_DIR}"
-       dobin bin/*
-
-       # install the libraries
-       insinto "${VM_INSTALL_DIR}"/lib/vmware
-       doins -r lib/*
-
-       # workaround for hardcoded search paths needed during shared objects 
loading
-       if ! use bundled-libs ; then
-               dosym /usr/$(get_libdir)/libglib-2.0.so.0 \
-                       
"${VM_INSTALL_DIR}"/lib/vmware/lib/libglib-2.0.so.0/libglib-2.0.so.0
-               # Bug 432918
-               dosym /usr/$(get_libdir)/libcrypto.so.1.0.0 \
-                       
"${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.1.0.1/libcrypto.so.1.0.1
-               dosym /usr/$(get_libdir)/libssl.so.1.0.0 \
-                       
"${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.1.0.1/libssl.so.1.0.1
-       fi
-
-       # install the ancillaries
-       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
-
-       if use doc; then
-               dodoc doc/*
-       fi
-
-       exeinto "${VM_INSTALL_DIR}"/lib/vmware/setup
-       doexe vmware-config
-
-       # install vmware workstation server
-       if use server; then
-               dosbin sbin/*
-
-               cd "${S}"/vmware-workstation-server
-
-               # install binaries
-               into "${VM_INSTALL_DIR}"/lib/vmware
-               dobin bin/*
-
-               dobin "${FILESDIR}"/configure-hostd.sh
-
-               dobin "${FILESDIR}"/configure-hostd.sh
-
-               # install the libraries
-               insinto "${VM_INSTALL_DIR}"/lib/vmware/lib
-               doins -r lib/*
-
-               into "${VM_INSTALL_DIR}"
-               for tool in vmware-hostd wssc-adminTool ; do
-                       cat > "${T}/${tool}" <<-EOF
-                               #!/usr/bin/env bash
-                               set -e
-
-                               . /etc/vmware/bootstrap
-
-                               exec 
"${VM_INSTALL_DIR}/lib/vmware/lib/wrapper-gtk24.sh" \\
-                                       "${VM_INSTALL_DIR}/lib/vmware/lib" \\
-                                       
"${VM_INSTALL_DIR}/lib/vmware/bin/${tool}" \\
-                                       "${VM_INSTALL_DIR}/lib/vmware/libconf" 
"\$@"
-                       EOF
-                       dobin "${T}/${tool}"
-               done
-
-               insinto "${VM_INSTALL_DIR}"/lib/vmware
-               doins -r hostd
-
-               # create the configuration
-               insinto /etc/vmware/hostd
-               doins -r config/etc/vmware/hostd/*
-               doins -r etc/vmware/hostd/*
-
-               insinto /etc/vmware/ssl
-               doins etc/vmware/ssl/*
-
-               # pam
-               pamd_mimic_system vmware-authd auth account
-
-               # create directory for shared virtual machines.
-               keepdir "${VM_DATA_STORE_DIR}"
-               keepdir /var/log/vmware
-       fi
-
-       # install vmware-vix
-       if use vix; then
-               cd "${S}"/vmware-vix
-
-               # install the binary
-               into "${VM_INSTALL_DIR}"
-               dobin bin/*
-
-               # install the libraries
-               insinto "${VM_INSTALL_DIR}"/lib/vmware-vix
-               doins -r lib/*
-
-               dosym vmware-vix/libvixAllProducts.so 
"${VM_INSTALL_DIR}"/lib/libbvixAllProducts.so
-
-               # install headers
-               insinto /usr/include/vmware-vix
-               doins include/*
-
-               if use doc; then
-                       dohtml -r doc/*
-               fi
-       fi
-
-       # install ovftool
-       if use ovftool; then
-               cd "${S}"
-
-               insinto "${VM_INSTALL_DIR}"/lib/vmware-ovftool
-               doins -r vmware-ovftool/*
-
-               chmod 0755 
"${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/{ovftool,ovftool.bin}
-               dosym "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/ovftool 
"${VM_INSTALL_DIR}"/bin/ovftool
-       fi
-
-       # create symlinks for the various tools
-       local tool ; for tool in thnuclnt vmware vmplayer{,-daemon} licenseTool 
vmamqpd \
-                       
vmware-{acetool,enter-serial,gksu,fuseUI,modconfig{,-console},netcfg,tray,zenity}
 ; do
-               dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}"
-       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/icu /etc/vmware/icu
-
-       # fix permissions
-       fperms 0755 
"${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks}
-       fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/wrapper-gtk24.sh
-       fperms 0755 
"${VM_INSTALL_DIR}"/lib/vmware/lib/libgksu2.so.0/gksu-run-helper
-       fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/setup/vmware-config
-       fperms 4711 "${VM_INSTALL_DIR}"/bin/vmware-mount
-       fperms 4711 
"${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats}
-       if use server; then
-               fperms 0755 
"${VM_INSTALL_DIR}"/lib/vmware/bin/{vmware-hostd,wssc-adminTool}
-               fperms 4711 "${VM_INSTALL_DIR}"/sbin/vmware-authd
-               fperms 1777 "${VM_DATA_STORE_DIR}"
-       fi
-       if use vix; then
-               fperms 0755 
"${VM_INSTALL_DIR}"/lib/vmware-vix/setup/vmware-config
-       fi
-
-       # create the environment
-       local envd="${T}/90vmware"
-       cat > "${envd}" <<-EOF
-               PATH='${VM_INSTALL_DIR}/bin'
-               ROOTPATH='${VM_INSTALL_DIR}/bin'
-       EOF
-       use bundled-libs && echo 'VMWARE_USE_SHIPPED_LIBS=1' >> "${envd}"
-
-       doenvd "${envd}"
-
-       # create the configuration
-       dodir /etc/vmware
-
-       cat > "${D}"/etc/vmware/bootstrap <<-EOF
-               BINDIR='${VM_INSTALL_DIR}/bin'
-               LIBDIR='${VM_INSTALL_DIR}/lib'
-       EOF
-
-       cat > "${D}"/etc/vmware/config <<-EOF
-               bindir = "${VM_INSTALL_DIR}/bin"
-               libdir = "${VM_INSTALL_DIR}/lib/vmware"
-               initscriptdir = "/etc/init.d"
-               authd.fullpath = "${VM_INSTALL_DIR}/sbin/vmware-authd"
-               gksu.rootMethod = "su"
-               VMCI_CONFED = "yes"
-               VMBLOCK_CONFED = "yes"
-               VSOCK_CONFED = "yes"
-               NETWORKING = "yes"
-               player.product.version = "${MY_PV}"
-               product.buildNumber = "${PV_BUILD}"
-               product.version = "${MY_PV}"
-               product.name = "VMware Workstation"
-               workstation.product.version = "${MY_PV}"
-       EOF
-
-       if use vix; then
-               cat >> "${D}"/etc/vmware/config <<-EOF
-                       vmware.fullpath = "${VM_INSTALL_DIR}/bin/vmware"
-                       vix.libdir = "${VM_INSTALL_DIR}/lib/vmware-vix"
-                       vix.config.version = "1"
-               EOF
-       fi
-
-       if use server; then
-               cat >> "${D}"/etc/vmware/config <<-EOF
-                       authd.client.port = "902"
-                       authd.proxy.nfc = "vmware-hostd:ha-nfc"
-                       authd.soapserver = "TRUE"
-               EOF
-       fi
-
-       # install the init.d script
-       local initscript="${T}/vmware.rc"
-       sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
-               "${FILESDIR}/vmware-${major_minor}.rc" > "${initscript}" || die
-       newinitd "${initscript}" vmware
-
-       if use server; then
-               # install the init.d script
-               local initscript="${T}/vmware-workstation-server.rc"
-               sed -e "s:@@ETCDIR@@:/etc/vmware:g" \
-                       -e "s:@@PREFIX@@:${VM_INSTALL_DIR}:g" \
-                       -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
-                       -e "s:@@LIBDIR@@:${VM_INSTALL_DIR}/lib/vmware:g" \
-                       "${FILESDIR}/vmware-server-${major_minor}.rc" > 
${initscript} || die
-               newinitd "${initscript}" vmware-workstation-server
-       fi
-
-       # fill in variable placeholders
-       if use bundled-libs ; then
-               sed -e 
"s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g" \
-                       -i 
"${D}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}}
 || die
-       fi
-       sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \
-               -e "/^Encoding/d" \
-               -i "${D}/usr/share/applications/vmware-player.desktop" || die
-       sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware:g" \
-               -e "/^Encoding/d" \
-               -i "${D}/usr/share/applications/vmware-workstation.desktop" || 
die
-       sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware-netcfg:g" \
-               -e "/^Encoding/d" \
-               -i "${D}/usr/share/applications/vmware-netcfg.desktop" || die
-
-       if use server; then
-       # Configuration for vmware-workstation-server
-               local hostdUser="${VM_HOSTD_USER:-root}"
-               sed -e "/ACEDataUser/s:root:${hostdUser}:g" \
-                       -i "${D}/etc/vmware/hostd/authorization.xml" || die
-
-               # Shared VMs Path: [standard].
-               sed -e "s:##{DS_NAME}##:standard:g" \
-                       -e "s:##{DS_PATH}##:${VM_DATA_STORE_DIR}:g" \
-                       -i "${D}/etc/vmware/hostd/datastores.xml" || die
-
-               sed -e "s:##{HTTP_PORT}##:-1:g" \
-                       -e "s:##{HTTPS_PORT}##:443:g" \
-                       -e "s:##{PIPE_PREFIX}##:/var/run/vmware/:g" \
-                       -i "${D}/etc/vmware/hostd/proxy.xml" || die
-
-               # See vmware-workstation-server.py for more details.
-               sed -e "s:##{BUILD_CFGDIR}##:/etc/vmware/hostd/:g" \
-                       -e "s:##{CFGALTDIR}##:/etc/vmware/hostd/:g" \
-                       -e "s:##{CFGDIR}##:/etc/vmware/:g" \
-                       -e "s:##{ENABLE_AUTH}##:true:g" \
-                       -e "s:##{HOSTDMODE}##:ws:g" \
-                       -e "s:##{HOSTD_CFGDIR}##:/etc/vmware/hostd/:g" \
-                       -e "s:##{HOSTD_MOCKUP}##:false:g" \
-                       -e "s:##{LIBDIR}##:${VM_INSTALL_DIR}/lib/vmware:g" \
-                       -e 
"s:##{LIBDIR_INSTALLED}##:${VM_INSTALL_DIR}/lib/vmware/:g" \
-                       -e "s:##{LOGDIR}##:/var/log/vmware/:g" \
-                       -e "s:##{LOGLEVEL}##:verbose:g" \
-                       -e "s:##{MOCKUP}##:mockup-host-config.xml:g" \
-                       -e "s:##{PLUGINDIR}##:./:g" \
-                       -e "s:##{SHLIB_PREFIX}##:lib:g" \
-                       -e "s:##{SHLIB_SUFFIX}##:.so:g" \
-                       -e "s:##{USE_BLKLISTSVC}##:false:g" \
-                       -e "s:##{USE_CBRCSVC}##:false:g" \
-                       -e "s:##{USE_CIMSVC}##:false:g" \
-                       -e "s:##{USE_DIRECTORYSVC}##:false:g" \
-                       -e "s:##{USE_DIRECTORYSVC_MOCKUP}##:false:g" \
-                       -e "s:##{USE_DYNAMIC_PLUGIN_LOADING}##:false:g" \
-                       -e "s:##{USE_DYNAMO}##:false:g" \
-                       -e "s:##{USE_DYNSVC}##:false:g" \
-                       -e "s:##{USE_GUESTSVC}##:false:g" \
-                       -e "s:##{USE_HBRSVC}##:false:g" \
-                       -e "s:##{USE_HBRSVC_MOCKUP}##:false:g" \
-                       -e "s:##{USE_HOSTSVC_MOCKUP}##:false:g" \
-                       -e "s:##{USE_HTTPNFCSVC}##:false:g" \
-                       -e "s:##{USE_HTTPNFCSVC_MOCKUP}##:false:g" \
-                       -e "s:##{USE_LICENSESVC_MOCKUP}##:false:g" \
-                       -e "s:##{USE_NFCSVC}##:true:g" \
-                       -e "s:##{USE_NFCSVC_MOCKUP}##:false:g" \
-                       -e "s:##{USE_OVFMGRSVC}##:true:g" \
-                       -e "s:##{USE_PARTITIONSVC}##:false:g" \
-                       -e "s:##{USE_SECURESOAP}##:false:g" \
-                       -e "s:##{USE_SNMPSVC}##:false:g" \
-                       -e "s:##{USE_SOLO_MOCKUP}##:false:g" \
-                       -e "s:##{USE_STATSSVC_MOCKUP}##:false:g" \
-                       -e "s:##{USE_VCSVC_MOCKUP}##:false:g" \
-                       -e "s:##{USE_VDISKSVC}##:false:g" \
-                       -e "s:##{USE_VDISKSVC_MOCKUP}##:false:g" \
-                       -e "s:##{USE_VMSVC_MOCKUP}##:false:g" \
-                       -e "s:##{VM_INVENTORY}##:vmInventory.xml:g" \
-                       -e "s:##{VM_RESOURCES}##:vmResources.xml:g" \
-                       -e "s:##{WEBSERVER_PORT_ENTRY}##::g" \
-                       -e "s:##{WORKINGDIR}##:./:g" \
-                       -i "${D}/etc/vmware/hostd/config.xml" || die
-
-               sed -e "s:##{ENV_LOCATION}##:/etc/vmware/hostd/env/:g" \
-                       -i "${D}/etc/vmware/hostd/environments.xml" || die
-
-               # @@VICLIENT_URL@@=XXX
-               sed -e "s:@@AUTHD_PORT@@:902:g" \
-                       -i 
"${D}${VM_INSTALL_DIR}/lib/vmware/hostd/docroot/client/clients.xml" || die
-       fi
-
-       # install systemd unit files
-       systemd_dounit 
"${WORKDIR}/systemd-vmware-${SYSTEMD_UNITS_TAG}/"*.{service,target}
-
-       readme.gentoo_create_doc
-}
-
-pkg_config() {
-       "${VM_INSTALL_DIR}"/bin/vmware-networks --postinstall ${PN},old,new
-}
-
-pkg_preinst() {
-       gnome2_icon_savelist
-}
-
-pkg_postinst() {
-       fdo-mime_desktop_database_update
-       gnome2_icon_cache_update
-       readme.gentoo_print_elog
-
-       ewarn "${P} is using an old version of libgcrypt library which"
-       ewarn "is going to be soon removed from portage due to security reasons"
-       ewarn "(see https://bugs.gentoo.org/show_bug.cgi?id=541564)."
-       ewarn "Until vmware is fixed upstream you're exposed to security 
issues!"
-}
-
-pkg_prerm() {
-       einfo "Stopping ${PN} for safe unmerge"
-       /etc/init.d/vmware stop
-}
-
-pkg_postrm() {
-       fdo-mime_desktop_database_update
-       gnome2_icon_cache_update
-}

Reply via email to