[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-player/, app-emulation/vmware-workstation/, ...

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-player/, app-emulation/vmware-workstation/, ...
@ 2012-05-04 14:16 Vadim Kuznetsov
  0 siblings, 0 replies; 4+ messages in thread
From: Vadim Kuznetsov @ 2012-05-04 14:16 UTC (permalink / raw
  To: gentoo-commits

commit:     569f99518c8e6cc9dd673827f8588687d95cc667
Author:     Vadim Kuznetsov <vadimk <AT> gentoo <DOT> org>
AuthorDate: Fri May  4 14:15:13 2012 +0000
Commit:     Vadim Kuznetsov <vadimk <AT> gentoo <DOT> org>
CommitDate: Fri May  4 14:15:13 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=569f9951

VMware desktop build 703057
	modified:   app-emulation/vmware-modules/files/264-3.2.0.patch
	deleted:    app-emulation/vmware-modules/files/264.2-3.2.0.patch
	modified:   app-emulation/vmware-modules/metadata.xml
	renamed:    app-emulation/vmware-modules/vmware-modules-264.2-r2.ebuild -> app-emulation/vmware-modules/vmware-modules-264.3.ebuild
	modified:   app-emulation/vmware-player/Manifest
	renamed:    app-emulation/vmware-player/vmware-player-4.0.2.591240-r1.ebuild -> app-emulation/vmware-player/vmware-player-4.0.3.703057.ebuild
	modified:   app-emulation/vmware-workstation/Manifest
	renamed:    app-emulation/vmware-workstation/vmware-workstation-8.0.2.591240.ebuild -> app-emulation/vmware-workstation/vmware-workstation-8.0.3.703057.ebuild

---
 app-emulation/vmware-modules/files/264-3.2.0.patch |   17 ----
 .../vmware-modules/files/264.2-3.2.0.patch         |   86 --------------------
 app-emulation/vmware-modules/metadata.xml          |    3 +
 ...264.2-r2.ebuild => vmware-modules-264.3.ebuild} |    2 +-
 app-emulation/vmware-player/Manifest               |    4 +-
 ...r1.ebuild => vmware-player-4.0.3.703057.ebuild} |    3 +-
 app-emulation/vmware-workstation/Manifest          |   16 +---
 ...uild => vmware-workstation-8.0.3.703057.ebuild} |    3 +-
 8 files changed, 14 insertions(+), 120 deletions(-)

diff --git a/app-emulation/vmware-modules/files/264-3.2.0.patch b/app-emulation/vmware-modules/files/264-3.2.0.patch
index 5baa61d..87f8914 100644
--- a/app-emulation/vmware-modules/files/264-3.2.0.patch
+++ b/app-emulation/vmware-modules/files/264-3.2.0.patch
@@ -1,20 +1,3 @@
-diff --git a/vmmon-only/linux/iommu.c b/vmmon-only/linux/iommu.c
-index c692c2d..501d602 100644
---- a/vmmon-only/linux/iommu.c
-+++ b/vmmon-only/linux/iommu.c
-@@ -42,6 +42,12 @@
- #define PCI_BDF_SLOTFUNC(bdf) PCI_DEVFN(PCI_SLOT(bdf), PCI_FUNC(bdf))
- #define PCI_BDF_BUS(bdf)      (((bdf) >> 8) & 0xff)
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
-+#include <linux/pci.h>
-+#define iommu_found() iommu_present(&pci_bus_type)
-+#define iommu_domain_alloc() iommu_domain_alloc(&pci_bus_type)
-+#endif
-+
- typedef struct PassthruDevice {
-    uint32 bdf;
-    struct pci_dev *pdev;
 diff --git a/vmnet-only/filter.c b/vmnet-only/filter.c
 index 491add5..74f7a3b 100644
 --- a/vmnet-only/filter.c

diff --git a/app-emulation/vmware-modules/files/264.2-3.2.0.patch b/app-emulation/vmware-modules/files/264.2-3.2.0.patch
deleted file mode 100644
index 87f8914..0000000
--- a/app-emulation/vmware-modules/files/264.2-3.2.0.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff --git a/vmnet-only/filter.c b/vmnet-only/filter.c
-index 491add5..74f7a3b 100644
---- a/vmnet-only/filter.c
-+++ b/vmnet-only/filter.c
-@@ -40,6 +40,10 @@
- #include "vnetInt.h"
- #include "vmnetInt.h"
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
-+#include <linux/export.h>
-+#endif
-+
- // VNet_FilterLogPacket.action for dropped packets
- #define VNET_FILTER_ACTION_DRP         (1)
- #define VNET_FILTER_ACTION_DRP_SHORT   (2)
-diff --git a/vmnet-only/netif.c b/vmnet-only/netif.c
-index 4bdb643..5b71339 100644
---- a/vmnet-only/netif.c
-+++ b/vmnet-only/netif.c
-@@ -62,7 +62,9 @@ static int  VNetNetifClose(struct net_device *dev);
- static int  VNetNetifStartXmit(struct sk_buff *skb, struct net_device *dev);
- static struct net_device_stats *VNetNetifGetStats(struct net_device *dev);
- static int  VNetNetifSetMAC(struct net_device *dev, void *addr);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)
- static void VNetNetifSetMulticast(struct net_device *dev);
-+#endif
- #if 0
- static void VNetNetifTxTimeout(struct net_device *dev);
- #endif
-@@ -131,7 +133,9 @@ VNetNetIfSetup(struct net_device *dev)  // IN:
-       .ndo_stop = VNetNetifClose,
-       .ndo_get_stats = VNetNetifGetStats,
-       .ndo_set_mac_address = VNetNetifSetMAC,
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)
-       .ndo_set_multicast_list = VNetNetifSetMulticast,
-+#endif
-       /*
-        * We cannot stuck... If someone will report problems under
-        * low memory conditions or some such, we should enable it.
-@@ -152,7 +156,9 @@ VNetNetIfSetup(struct net_device *dev)  // IN:
-    dev->stop = VNetNetifClose;
-    dev->get_stats = VNetNetifGetStats;
-    dev->set_mac_address = VNetNetifSetMAC;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)
-    dev->set_multicast_list = VNetNetifSetMulticast;
-+#endif
-    /*
-     * We cannot stuck... If someone will report problems under
-     * low memory conditions or some such, we should enable it.
-@@ -612,11 +618,12 @@ VNetNetifSetMAC(struct net_device *dev, // IN:
-  *----------------------------------------------------------------------
-  */
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)
- void
- VNetNetifSetMulticast(struct net_device *dev) // IN: unused
- {
- }
--
-+#endif
- 
- /*
-  *----------------------------------------------------------------------
-diff --git a/vmnet-only/userif.c b/vmnet-only/userif.c
-index 541187b..77e0089 100644
---- a/vmnet-only/userif.c
-+++ b/vmnet-only/userif.c
-@@ -517,10 +517,18 @@ VNetCsumCopyDatagram(const struct sk_buff *skb,	// IN: skb to copy
- 	 unsigned int tmpCsum;
- 	 const void *vaddr;
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
-+	 vaddr = kmap(skb_frag_page(frag));
-+#else
- 	 vaddr = kmap(frag->page);
-+#endif
- 	 tmpCsum = csum_and_copy_to_user(vaddr + frag->page_offset,
- 					 curr, frag->size, 0, &err);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
-+	 kunmap(skb_frag_page(frag));
-+#else
- 	 kunmap(frag->page);
-+#endif
- 	 if (err) {
- 	    return err;
- 	 }

diff --git a/app-emulation/vmware-modules/metadata.xml b/app-emulation/vmware-modules/metadata.xml
index 3260ec5..e579266 100644
--- a/app-emulation/vmware-modules/metadata.xml
+++ b/app-emulation/vmware-modules/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>vmware</herd>
+    <use>
+        <flag name="pax_kernel"></flag>
+    </use>
 </pkgmetadata>

diff --git a/app-emulation/vmware-modules/vmware-modules-264.2-r2.ebuild b/app-emulation/vmware-modules/vmware-modules-264.3.ebuild
similarity index 97%
rename from app-emulation/vmware-modules/vmware-modules-264.2-r2.ebuild
rename to app-emulation/vmware-modules/vmware-modules-264.3.ebuild
index ac3794c..afef047 100644
--- a/app-emulation/vmware-modules/vmware-modules-264.2-r2.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-264.3.ebuild
@@ -63,7 +63,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PV_MAJOR}-makefile-include.patch"
 	epatch "${FILESDIR}/${PV_MAJOR}-jobserver.patch"
 	epatch "${FILESDIR}/${PV_MAJOR}-netdevice.patch"
-	epatch "${FILESDIR}/${PV}-3.2.0.patch"
+	epatch "${FILESDIR}/${PV_MAJOR}-3.2.0.patch"
 	use pax_kernel && epatch "${FILESDIR}/hardened.patch"
 	epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
 }

diff --git a/app-emulation/vmware-player/Manifest b/app-emulation/vmware-player/Manifest
index 1b06141..987c082 100644
--- a/app-emulation/vmware-player/Manifest
+++ b/app-emulation/vmware-player/Manifest
@@ -1,4 +1,4 @@
 DIST VMware-Player-3.1.5-491717.i386.bundle 107094686 SHA256 8a614bb32b680ef5fe75f65de7e842ecd32caaab434ef94bc89565df03706b01 SHA512 ce3f207db75a1cec02f4b370b95d341993059dfec2ded9991ca05c27aed8d41eb49b62789967e27a1710a7276841ba288d9072b5bddc7f3bbbbedb6c18f8cf0f WHIRLPOOL 9f8fe2bd9e5dde521edca31ecfe81a5e1379b505cba7869762e1e719cff937301eb11afcb333476f1240f51e0f3f1dfca181e77e423d82db4769b1ea50fc190e
 DIST VMware-Player-3.1.5-491717.x86_64.bundle 103019114 SHA256 5aa1f01d09a1c39da06f3a314d3e47e75e80b4a345ef76dabe14e538fe3bc511 SHA512 1fd387df17c5bf321534b0b557031c2140b12e0c0e1e6557239aba8ecb5bcc5d887f16feb020155d0cce7018bdf62c9a60acc5341f2eef8b6c9d53a34881bd9f WHIRLPOOL 4e5432e8df2c4367f52b618a83d008011d3a6c00d1635008414a72a182e66107c4eb106f7849d90326e5a03a95977e7a5b628975ec860553f73be6739a803da4
-DIST VMware-Player-4.0.2-591240.i386.bundle 131962526 SHA256 774bc82e6079b723d57029f6511c8f10ebba5f41d1ba862151a41040e172052a SHA512 672344e7f079726a09e3f3d88e43cda15a42a20729cf4a9a98f013dfd2b6cd2db6854e2fbfeb76ec6594d5598c4af50f628ffebdcb997853ed9037694f8b7902 WHIRLPOOL 8e5c885c0baecbb009975541e53365672d2583c2f9db00b2cf18a987104be4f7bef3d10b9ea65f3dadaee91207a05ba96a1a330e720c5b7c7a8c7f07e82a1259
-DIST VMware-Player-4.0.2-591240.x86_64.bundle 129693508 SHA256 4aa09bed05c7fffa2e96b788f24626abcbe7d59749da544f37aedd15e1f459a8 SHA512 cdd92451c5d5f3ade3d7e4abff46ec8535c697789b82a6ef3a11502317519ad591d2072951a75317200aeffbd30d6fc7b361b499d61332442788d90ff140b5a7 WHIRLPOOL 86ac32bc30d3e1634c125a108cedb4d391132d10cd36475a676c4f3fbdcd025efcf5e53db56a00955c1cf2223696611185d6117d6142345fc2d9e3883f88501b
+DIST VMware-Player-4.0.3-703057.i386.bundle 131948181 SHA256 1a79eb7578b9752740a86246ec70785846b8ceab3c76a15c86daad5b7a45e216 SHA512 aaf3da8ba49839bf4ec4e365955c4c931ed86507999c7fb8d50db7c98b5f9aa0d6fe0ad43a5210aa5679e7357ff22755fb96d5e690fd98283c6f6ae0286660f3 WHIRLPOOL cc875632fbccc44892ac78b9a3838f7ad178ef1123d1d29f1e3af1467fb52a9e49f5b3c0f3167f4a5674103c58c601f018db62aa3c59d4015731e2ab03397c6a
+DIST VMware-Player-4.0.3-703057.x86_64.bundle 129687987 SHA256 1b97b0c98f2f0c7194a979cad982cf38735943fdbc833529128504e1edd1022a SHA512 16399beaf60e3da992ba0e233a5f4e020a81c7a85a2a2e5627a8d48e51c017d68972f1df1cd903ba4ad70cfb82ed175e924c2c1b28cd5a5404d9e0f767053625 WHIRLPOOL f36dc44ba8566357db612f4b774fa0cdf13fae9f26ea250d6a749cf4b1348004f123e4945a3911dbdd8c240724c74f09ffee0db433823f49c029ef4eb8da08a0

diff --git a/app-emulation/vmware-player/vmware-player-4.0.2.591240-r1.ebuild b/app-emulation/vmware-player/vmware-player-4.0.3.703057.ebuild
similarity index 98%
rename from app-emulation/vmware-player/vmware-player-4.0.2.591240-r1.ebuild
rename to app-emulation/vmware-player/vmware-player-4.0.3.703057.ebuild
index 6de5562..a2207b2 100644
--- a/app-emulation/vmware-player/vmware-player-4.0.2.591240-r1.ebuild
+++ b/app-emulation/vmware-player/vmware-player-4.0.3.703057.ebuild
@@ -9,6 +9,7 @@ inherit eutils versionator fdo-mime gnome2-utils pax-utils vmware-bundle
 MY_PN="VMware-Player"
 MY_PV="$(replace_version_separator 3 - $PV)"
 MY_P="${MY_PN}-${MY_PV}"
+PV_MINOR=$(get_version_component_range 3)
 
 DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
 HOMEPAGE="http://www.vmware.com/products/player/"
@@ -76,7 +77,7 @@ RDEPEND="dev-cpp/cairomm
 	x11-libs/pango
 	x11-libs/startup-notification
 	!app-emulation/vmware-workstation"
-PDEPEND="~app-emulation/vmware-modules-264.2
+PDEPEND="~app-emulation/vmware-modules-264.${PV_MINOR}
 	vmware-tools? ( app-emulation/vmware-tools )"
 
 S=${WORKDIR}

diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
index 81b199e..0bb2702 100644
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@@ -1,12 +1,4 @@
-AUX list-bundle-components.xsl 470 RMD160 c45fe9d1690eac831c79bc63ef68de45d1265891 SHA1 d35982cfe4f3052fff013059d1df495c672ddd0e SHA256 4fe6b25ecbb99b3a4f15cbb8de41be466ff545f8e9fa1110d62ca0cf24e72395
-AUX list-component-files.xsl 545 RMD160 46747c300daf5c6b2c143f02840a94a409f381c4 SHA1 40b6e4cd0bb189ec9997e8b6009c9508082ed51a SHA256 6682c07630ef4586016776e065018f8695a790c5297408597b1ae24692fab629
-AUX vmware-7.0.rc 778 RMD160 ed0dd6d11680d7ced8724970ee1be77efd48e970 SHA1 84d9aae6bbc8a33806842fd00699a2b81a7bb18c SHA256 50aab1855926e6ae808ed85ddc8b7d83d7441f7d7c4b3726cc1e8bebd4da8e63
-AUX vmware-8.0.rc 778 RMD160 ed0dd6d11680d7ced8724970ee1be77efd48e970 SHA1 84d9aae6bbc8a33806842fd00699a2b81a7bb18c SHA256 50aab1855926e6ae808ed85ddc8b7d83d7441f7d7c4b3726cc1e8bebd4da8e63
-AUX vmware-server-8.0.rc 1565 RMD160 e11b805ec016afac18778dc1a4af8db963ea2840 SHA1 62ffb7217b6d50a096a535e4c7016862f9cf6eaa SHA256 d33c1afd281502c7ceb6e1d5b981395b055fca6fd927b6aa98c449efd20e018e
-DIST VMware-Workstation-7.1.5-491717.i386.bundle 130351656 RMD160 110bc8a4486bdf24cf9b293a4376fb89e0aff56d SHA1 f112d0e5ad00d285982d998c36a554dad4c43700 SHA256 a0f05693cf82ce2fe49b5009bbd2dfb531606b55f8b6656e7e4b06b051c2655c
-DIST VMware-Workstation-7.1.5-491717.x86_64.bundle 137361206 RMD160 b5f302400a0c33b2bc4a2b68ccc070f9329af047 SHA1 0cca1399008630ed76374d794806d60a93dc3e97 SHA256 857a71e4022a357a49aadc0516dae8909b34abf7a3681fbba5e76d92ee3be90b
-DIST VMware-Workstation-Full-8.0.2-591240.i386.bundle 339158324 RMD160 59806d3a85620fa19d32797d7eb434a5525e0647 SHA1 94c4d04b7b24ae03ead29f17445d576173d40bb4 SHA256 0605d68622887b916cb1c774bb4c26481bd97de4f13bfd13b950f10809d119e7
-DIST VMware-Workstation-Full-8.0.2-591240.x86_64.bundle 338890534 RMD160 a00f0d203aa0a03aaf00bbe678c38b2c1b30012d SHA1 6ad52e8f0768e279639cd41abeda4f9358b40d0f SHA256 804590c103d0ee09fbcfe5adcfa3bd99d2dc9e4a98dc61d4d4067e550ba7f6ec
-EBUILD vmware-workstation-7.1.5.491717.ebuild 8264 RMD160 a90d1e633561f0d47aa252b63812e6c5e331ee94 SHA1 2a73547f67b10dda1d97d8d1c78f0231ebfdfc9f SHA256 b30027da9c1e27f88eb6edf69a53d38cc1f21e8e6d4b92164f5efea8e7111d2f
-EBUILD vmware-workstation-8.0.2.591240.ebuild 13644 RMD160 555105807858cd7553be7d47d81769354dc462c0 SHA1 73be6afc1de0a22c1371956276d29132691c6867 SHA256 e0f0a0d256d1a6d21d7e3cf9c07365511891bb9f73e52b3523d8b02c663b4178
-MISC metadata.xml 821 RMD160 3fe06e26c1f6550712d29d27dbbe1bde8eeb3d29 SHA1 4cacecf9b113a8c46e921e1738d5c191bf693872 SHA256 b5634de5978f816c03495e72d4ee1cb72b372209ee7b8a8e88cec8963aa38647
+DIST VMware-Workstation-7.1.5-491717.i386.bundle 130351656 SHA256 a0f05693cf82ce2fe49b5009bbd2dfb531606b55f8b6656e7e4b06b051c2655c SHA512 eb646abd199864d8468b80a38f8c921896ae6586d01e9af387cb45157199a5cd8c1301e35ec342e50d30e268ef4bcbf94c6ff25ce3106f54e10407ebd0c04e18 WHIRLPOOL 5c124831d5afaf79892bb925d21f27f3aef892a5095023621f6c6cc006817d0975592f3b77612d67ad7656f252f469b5abb59c5ae6068e6fe4030db2570434d6
+DIST VMware-Workstation-7.1.5-491717.x86_64.bundle 137361206 SHA256 857a71e4022a357a49aadc0516dae8909b34abf7a3681fbba5e76d92ee3be90b SHA512 53e5594180532c9d457fdd6de945af6ad2b5b3e6209211380ca658d7b6f1d5003f5efb62e2f6f1b81b4a2395d088ccc1c0b464d38a1f7f05759041747f8a5fc3 WHIRLPOOL 5facb570de736bff14cde121916c2a988fb141a38fa406a749a279c66344741c49a5f519e37cb0e2dcca0f9c695b5115648a8041fdc4643302f1e7152599d852
+DIST VMware-Workstation-Full-8.0.3-703057.i386.bundle 339143008 SHA256 a7c6287af03c99d4db9eba2c2cac3c899c4096be7a093be5df7223e5ec4e7caf SHA512 577409f891c0b43f74cf45c90d1e7b17ac8c9938eb68179254fc4b6378b208d8bff23bf00647a950f3af3ee55e1cac01ac598313dcef8495f79528a08f9bdb9a WHIRLPOOL 19c8356a453edb8235bc0fa4d35a8c08395079086e6ea6bb675b1b8ce131d772625ed482c59e58d0c6c3d888fbc46a615e2fcc657cce393bd67c1138042538cf
+DIST VMware-Workstation-Full-8.0.3-703057.x86_64.bundle 338884931 SHA256 9cdf5f9ed85c1d6c6fbae0ba32a7c0b5097599c4b4660c2391303e8928f46fda SHA512 cf510ebc9324a2645d32a75ead23901fb45ab399d5a5594b3717052dc51af725da3c07fbbd6d4cb1f32347fca1fbada244c6d4b775a8ddfbd7f2e63c42aba8dc WHIRLPOOL 6516b22bd3d2ed86b445066c02ab6cfb78121c86fe777c054d47b538460ade56b6fc6209548eccceaa4f459f43217b926f6258da245acd51033e89cf804a5964

diff --git a/app-emulation/vmware-workstation/vmware-workstation-8.0.2.591240.ebuild b/app-emulation/vmware-workstation/vmware-workstation-8.0.3.703057.ebuild
similarity index 99%
rename from app-emulation/vmware-workstation/vmware-workstation-8.0.2.591240.ebuild
rename to app-emulation/vmware-workstation/vmware-workstation-8.0.3.703057.ebuild
index 909b3c4..3bd4064 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-8.0.2.591240.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-8.0.3.703057.ebuild
@@ -9,6 +9,7 @@ inherit eutils versionator fdo-mime gnome2-utils pam vmware-bundle
 MY_PN="VMware-Workstation"
 MY_PV="$(replace_version_separator 3 - $PV)"
 MY_P="${MY_PN}-Full-${MY_PV}"
+PV_MINOR=$(get_version_component_range 3)
 
 DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
 HOMEPAGE="http://www.vmware.com/products/workstation/"
@@ -82,7 +83,7 @@ RDEPEND="dev-cpp/cairomm
 	x11-libs/startup-notification
 	x11-themes/hicolor-icon-theme
 	!app-emulation/vmware-player"
-PDEPEND="~app-emulation/vmware-modules-264.2
+PDEPEND="~app-emulation/vmware-modules-264.${PV_MINOR}
 	vmware-tools? ( app-emulation/vmware-tools )"
 
 S=${WORKDIR}



^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-player/, app-emulation/vmware-workstation/, ...
@ 2017-06-25 15:58 Fabio Rossi
  0 siblings, 0 replies; 4+ messages in thread
From: Fabio Rossi @ 2017-06-25 15:58 UTC (permalink / raw
  To: gentoo-commits

commit:     5450ce12fe0971340365efab8252cbf5a1076a4f
Author:     Fabio Rossi <rossi.f <AT> inwind <DOT> it>
AuthorDate: Sun Jun 25 09:27:45 2017 +0000
Commit:     Fabio Rossi <rossi.f <AT> inwind <DOT> net>
CommitDate: Sun Jun 25 09:27:45 2017 +0000
URL:        https://gitweb.gentoo.org/proj/vmware.git/commit/?id=5450ce12

Added latest version 12.5.7.5813279

Excluded right now the associated version of vmware-tools because it has
the same name of previous 12.5.6. Is it changed anything?

 .../{vmware-modules-308.5.6.ebuild => vmware-modules-308.5.7.ebuild}    | 0
 app-emulation/vmware-player/Manifest                                    | 2 +-
 ...player-12.5.6.5528349.ebuild => vmware-player-12.5.7.5813279.ebuild} | 0
 app-emulation/vmware-workstation/Manifest                               | 2 +-
 ...n-12.5.6.5528349.ebuild => vmware-workstation-12.5.7.5813279.ebuild} | 0
 5 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/vmware-modules/vmware-modules-308.5.6.ebuild b/app-emulation/vmware-modules/vmware-modules-308.5.7.ebuild
similarity index 100%
rename from app-emulation/vmware-modules/vmware-modules-308.5.6.ebuild
rename to app-emulation/vmware-modules/vmware-modules-308.5.7.ebuild

diff --git a/app-emulation/vmware-player/Manifest b/app-emulation/vmware-player/Manifest
index 1d48a34..591b225 100644
--- a/app-emulation/vmware-player/Manifest
+++ b/app-emulation/vmware-player/Manifest
@@ -1,4 +1,4 @@
 DIST VMware-Player-12.1.1-3770994.x86_64.bundle.tar 140697600 SHA256 4b2d6c8026f7948cbbc084ccfedaa899a897047152b86c8a2be1bf80fb935a8e SHA512 f00609a1e41355146c5a77732f2eb8f01d30c0ab7822840a29b9b84c01218d129b8e08349e2e6bbf0c900b826d3aba3b4026a61c6705564539ffff17652511ce WHIRLPOOL ee628665689ae03c70a11e3d34bb5ccf1b640ab14eaaed8f93dc4bd50329f9144e44163e83811ea5380fa8749c7196d64139c4809435094c173b39ec2c93b4fb
-DIST VMware-Player-12.5.6-5528349.x86_64.bundle.tar 134215680 SHA256 da910af4aea8ac2c4d4162a68635b4f3eda23d7b07423cd7de26ee71049d4509 SHA512 684acda2c65b21c2b09da29f20a021f2af4a9949cefeba6cd0dc2f2fc46cbc16c3aa10ad077298903feea8b1f5b769a29fdac8eca2a7709856697c1b73f6549f WHIRLPOOL b2061e062025692a3dff63de4d35bd56a4112199789506760fc3944bf4eb684e9cea63efc15c0b0b86f154a0f2291f9a04685de9b5ff733bea6c4a4fe41add1c
+DIST VMware-Player-12.5.7-5813279.x86_64.bundle.tar 134236160 SHA256 45d8b69ee757b26e88ae611cf21f9a3e593f066c87c97dbc4171e20d46f07150 SHA512 d8dda7b7e1e3e3f3131b0c15b9816ecbbd074c3cfa7eb5623991b090e3617cdc55bbdb694c9a49e14b817da34a1aec6d3e07cec1df1a2a0de1a4ae4550c46aa4 WHIRLPOOL 57ecf7f01a24812d0a4250bb68cdfda971b6b2c6a32dba98cca2680e3836efebfaedeef3c6d1a51dc16387231af7bae25b18cd6024e0f8c20b93f4046d39ab62
 DIST VMware-Player-7.1.2-2780323.x86_64.bundle.tar 211128320 SHA256 baa60996b3bed5ba89db1a0fd9a2cc263ea07ac1cf2d6f3aab68c728cc960efc SHA512 c4465a4cbf97b9fe3aa2d6a1c690047251a37929867e0b3cbddf6643b59ef8e618809973543150e6cd9a3bdba0c9c04fb55171616c2179a0ff80ee7302e07fc2 WHIRLPOOL f0bc539647a5f3838a486d62506881f752e426e2e7299b20f2828c285cb041c777f93f3d29627ff4187edfd92e43e37e70647828ce537adb67db0fe3e99fccb0
 DIST vmware-systemd-gentoo-02.tgz 14064 SHA256 7ab23cb41bb8fbeca43bfd3baee35928731177620ae374ebb3b19b827d1a3210 SHA512 3a382bfd5f1eb2b218d8012588ea55c1f22786dba35a1fc0fdfdb4e40b05e0e735ed09c6961684f6442e863c3ed72024ce01f19113bbd9ca47c32e3f43c55f42 WHIRLPOOL dd7ac934584894f4a0ae86a9122080c49a4d09924011bc12dc1530ac6b5ee11fac6d55d6e5b306bb24d749a509236d3e39870b4d6b2ff5de37f6e54707ff8bb6

diff --git a/app-emulation/vmware-player/vmware-player-12.5.6.5528349.ebuild b/app-emulation/vmware-player/vmware-player-12.5.7.5813279.ebuild
similarity index 100%
rename from app-emulation/vmware-player/vmware-player-12.5.6.5528349.ebuild
rename to app-emulation/vmware-player/vmware-player-12.5.7.5813279.ebuild

diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
index ed99615..1d94f9d 100644
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@@ -1,6 +1,6 @@
 DIST VMware-Workstation-11.1.3-3206955.x86_64.bundle.tar 259594240 SHA256 a8d333d6f6677eb1d70b3572e5bf8f34ebb6cb77bdee4b94d6ea8033f579ed5d SHA512 8cb4781dc388bcaeb82f19d18e0bf2608d393f18c4e255a1c89c9090954bbee5e78ebde5cec6df06d9c037ed4f0595a7a801d76b3a8e2b960f6822bbf1094d1b WHIRLPOOL 5ba631502ff4dbf0e480e932e9a21cbb06d25d68b9ac412beb41680d3d0e678c630ba692e7e52cda2399574b28698ca5deb6a6c54b4614ab752159b6036a0094
 DIST VMware-Workstation-11.1.4-3848939.x86_64.bundle.tar 259563520 SHA256 3f48c42154a1b4687eb448abf7f9e15a7771977858388127df4ef78935658f3b SHA512 57aa62d53b4eae08c281959b559635e28877e7f8c5b6c0909dcec16129ae4ea130175410e698724b6164cbfb9d08f6bbf8a48f2d78471d6232868ff4bed23cca WHIRLPOOL d663a7901f153f0e6e1432b7047077b4b6bf8542926ccf0ac4ad4eeae42359096050cfe04e811fc044b45e85153eb91fddf704a43ea3de8a2cdc113cca0a6ba5
 DIST VMware-Workstation-12.1.1-3770994.x86_64.bundle.tar 176445440 SHA256 a2c1888e6360245cf65fd19e86b7f74c63788e652145dc9a786aebbda0dd9e15 SHA512 55880e7aa6f7c968d82c88f36c1f406f587cccc9e25bdb9d1de1ffcfccb609811c525967bb2fefcf6375ce59f0f78d4dcc258c006b4a0db642dc3233e8fc9556 WHIRLPOOL 833eceedc1e9b7f3a0b73a039d1647faa9a5966a8a34e26c4955348092ebd9983f2f0ba2b8acb37805b339f492278916d06d68db7bb52a219126d7e78b02c469
-DIST VMware-Workstation-12.5.6-5528349.x86_64.bundle.tar 165724160 SHA256 c7d5ecb72cb62f8d8538f581cff4513f7ede261671a1f6c50a54afa5d05fec39 SHA512 cce68510e01245aa8bf66dbb108121f1d94c69ba7fcc33b7fe9c16a40910a553fb4a43cbf5b5c5f0445bda90686568af56f28e16a3b321b760da3c084554359b WHIRLPOOL 06dc3de1665c8cd6ad54ad4c1678003e153e4f1dc14c831e5ee7350042c1ec80478565291ea099da1568878333c737b829d9124545322e7988ebc2c19accfd4d
+DIST VMware-Workstation-12.5.7-5813279.x86_64.bundle.tar 165744640 SHA256 94b58915678057b24ff338ecd6fb50e7f7c93ed62dbab1885a7993d80fd61a09 SHA512 195299d6ef907bb972fc828f35a782ed521b64fe6d3d2d1ae8033aeffeabc60e9af94e02ee7aa1e37c0092086c30fe8e287ffc7717a5acf6fcaf31490ffbefd1 WHIRLPOOL 48473c3e887bdb931864e3963b38686832ca7e26c1cb798618b2d23a280118bcc063c3208b021bedff32b51f635d1a8923c513dae38c24453363746e00e0169f
 DIST vmware-systemd-gentoo-01.tgz 1884 SHA256 e92c694865f1b29f4d7a39efa1dd87bc71dc5f922573f00a3d31ee8e27a8c335 SHA512 454ab93997781bd0a9accddb2ac7bb446f07ea7cddef5640369025c30e03592e14869e0f0f7b4457db2f1ada31c98051426016c86201afa8bc8e3aa4ccc2f875 WHIRLPOOL 9202583b617532ab2612b384da307218e7c93c2962f0d233e28bea066b07163c9bc51c0a599309f9d703c5575ebeb292d787716225624dc1c2fdff3c44fa3513
 DIST vmware-systemd-gentoo-02.tgz 14064 SHA256 7ab23cb41bb8fbeca43bfd3baee35928731177620ae374ebb3b19b827d1a3210 SHA512 3a382bfd5f1eb2b218d8012588ea55c1f22786dba35a1fc0fdfdb4e40b05e0e735ed09c6961684f6442e863c3ed72024ce01f19113bbd9ca47c32e3f43c55f42 WHIRLPOOL dd7ac934584894f4a0ae86a9122080c49a4d09924011bc12dc1530ac6b5ee11fac6d55d6e5b306bb24d749a509236d3e39870b4d6b2ff5de37f6e54707ff8bb6

diff --git a/app-emulation/vmware-workstation/vmware-workstation-12.5.6.5528349.ebuild b/app-emulation/vmware-workstation/vmware-workstation-12.5.7.5813279.ebuild
similarity index 100%
rename from app-emulation/vmware-workstation/vmware-workstation-12.5.6.5528349.ebuild
rename to app-emulation/vmware-workstation/vmware-workstation-12.5.7.5813279.ebuild


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-player/, app-emulation/vmware-workstation/, ...
@ 2017-06-25 15:58 Fabio Rossi
  0 siblings, 0 replies; 4+ messages in thread
From: Fabio Rossi @ 2017-06-25 15:58 UTC (permalink / raw
  To: gentoo-commits

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
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-player/, app-emulation/vmware-workstation/, ...
@ 2017-11-17 21:52 Fabio Rossi
  0 siblings, 0 replies; 4+ messages in thread
From: Fabio Rossi @ 2017-11-17 21:52 UTC (permalink / raw
  To: gentoo-commits

commit:     d6a56e2e13ccccece7cf7c054e7c3050d1309129
Author:     Fabio Rossi <rossi.f <AT> inwind <DOT> it>
AuthorDate: Fri Nov 17 21:49:12 2017 +0000
Commit:     Fabio Rossi <rossi.f <AT> inwind <DOT> net>
CommitDate: Fri Nov 17 21:49:12 2017 +0000
URL:        https://gitweb.gentoo.org/proj/vmware.git/commit/?id=d6a56e2e

Added latest version 12.5.8.7098237

 .../{vmware-modules-308.5.7.ebuild => vmware-modules-308.5.8.ebuild}    | 0
 app-emulation/vmware-player/Manifest                                    | 2 +-
 ...player-12.5.7.5813279.ebuild => vmware-player-12.5.8.7098237.ebuild} | 0
 app-emulation/vmware-workstation/Manifest                               | 2 +-
 ...n-12.5.7.5813279.ebuild => vmware-workstation-12.5.8.7098237.ebuild} | 0
 5 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/vmware-modules/vmware-modules-308.5.7.ebuild b/app-emulation/vmware-modules/vmware-modules-308.5.8.ebuild
similarity index 100%
rename from app-emulation/vmware-modules/vmware-modules-308.5.7.ebuild
rename to app-emulation/vmware-modules/vmware-modules-308.5.8.ebuild

diff --git a/app-emulation/vmware-player/Manifest b/app-emulation/vmware-player/Manifest
index 4f970f9..4c7b831 100644
--- a/app-emulation/vmware-player/Manifest
+++ b/app-emulation/vmware-player/Manifest
@@ -1,3 +1,3 @@
-DIST VMware-Player-12.5.7-5813279.x86_64.bundle.tar 134236160 SHA256 45d8b69ee757b26e88ae611cf21f9a3e593f066c87c97dbc4171e20d46f07150 SHA512 d8dda7b7e1e3e3f3131b0c15b9816ecbbd074c3cfa7eb5623991b090e3617cdc55bbdb694c9a49e14b817da34a1aec6d3e07cec1df1a2a0de1a4ae4550c46aa4 WHIRLPOOL 57ecf7f01a24812d0a4250bb68cdfda971b6b2c6a32dba98cca2680e3836efebfaedeef3c6d1a51dc16387231af7bae25b18cd6024e0f8c20b93f4046d39ab62
+DIST VMware-Player-12.5.8-7098237.x86_64.bundle.tar 134686720 SHA256 78c7f28d6705a52f77d491081abc3e8629186ca667f098657e3afb7af3235a93 SHA512 6064e752e17189cbe9c6499376719c57d2774b6bda8cb8975a1a4f6e2ece3d64ff215c81f2662417f835998ea74fdbc84195437062d4eaa5c7a725c09de8494e WHIRLPOOL b34419f44425c91d50ff9d13f37354420a2cfaa26f9f2053f589bb3014f498afab7ec87d3099f4528467413a9b1caddf1c2f018462867b49e2084174aad63656
 DIST VMware-Player-7.1.4-3848939.x86_64.bundle.tar 211374080 SHA256 11cbff16f4f6d48bf182d2155e0b3f261acd6bd1a2472dc9a25f86546885e059 SHA512 332f0f667d0b95cbf1de5ff2cc95b9302f88d3a9c7e69e13abb58dd7131d6997b2307bc8588111e3fb35717fcf59ed9cd3052873c72bd968c3f6eb68b31dabc0 WHIRLPOOL b70e1d9e2d07661fefe1f1f841b29111b73ded1c6d103efc0f9e61ac05b947ce04b73e14221b081dc311c498ffd68c2f931bf82bc312191631576aab3036d36a
 DIST vmware-systemd-gentoo-02.tgz 14064 SHA256 7ab23cb41bb8fbeca43bfd3baee35928731177620ae374ebb3b19b827d1a3210 SHA512 3a382bfd5f1eb2b218d8012588ea55c1f22786dba35a1fc0fdfdb4e40b05e0e735ed09c6961684f6442e863c3ed72024ce01f19113bbd9ca47c32e3f43c55f42 WHIRLPOOL dd7ac934584894f4a0ae86a9122080c49a4d09924011bc12dc1530ac6b5ee11fac6d55d6e5b306bb24d749a509236d3e39870b4d6b2ff5de37f6e54707ff8bb6

diff --git a/app-emulation/vmware-player/vmware-player-12.5.7.5813279.ebuild b/app-emulation/vmware-player/vmware-player-12.5.8.7098237.ebuild
similarity index 100%
rename from app-emulation/vmware-player/vmware-player-12.5.7.5813279.ebuild
rename to app-emulation/vmware-player/vmware-player-12.5.8.7098237.ebuild

diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
index 5d2f828..b241701 100644
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@@ -1,3 +1,3 @@
 DIST VMware-Workstation-11.1.4-3848939.x86_64.bundle.tar 259563520 SHA256 3f48c42154a1b4687eb448abf7f9e15a7771977858388127df4ef78935658f3b SHA512 57aa62d53b4eae08c281959b559635e28877e7f8c5b6c0909dcec16129ae4ea130175410e698724b6164cbfb9d08f6bbf8a48f2d78471d6232868ff4bed23cca WHIRLPOOL d663a7901f153f0e6e1432b7047077b4b6bf8542926ccf0ac4ad4eeae42359096050cfe04e811fc044b45e85153eb91fddf704a43ea3de8a2cdc113cca0a6ba5
-DIST VMware-Workstation-12.5.7-5813279.x86_64.bundle.tar 165744640 SHA256 94b58915678057b24ff338ecd6fb50e7f7c93ed62dbab1885a7993d80fd61a09 SHA512 195299d6ef907bb972fc828f35a782ed521b64fe6d3d2d1ae8033aeffeabc60e9af94e02ee7aa1e37c0092086c30fe8e287ffc7717a5acf6fcaf31490ffbefd1 WHIRLPOOL 48473c3e887bdb931864e3963b38686832ca7e26c1cb798618b2d23a280118bcc063c3208b021bedff32b51f635d1a8923c513dae38c24453363746e00e0169f
+DIST VMware-Workstation-12.5.8-7098237.x86_64.bundle.tar 166492160 SHA256 d955db3cc9ee0b2b10b3809c0f070f4beead0666fc7da62848fa2d604ac4d77f SHA512 b8acb5e746585d2b83194ce4a232bc01e01503e7a0e44430589a80ceb77a84077b8f2c41c14eab60ffb4ad4af573d1e46a451440673f97020b37deddce25384b WHIRLPOOL 447eb014d9b5f50566423e0a5f62f259bde09954d4bba5956d9c302f0d87059ad4af5634c095c834564a18195c52d89d5695299611df7bd6b3dcd3774bf9589d
 DIST vmware-systemd-gentoo-02.tgz 14064 SHA256 7ab23cb41bb8fbeca43bfd3baee35928731177620ae374ebb3b19b827d1a3210 SHA512 3a382bfd5f1eb2b218d8012588ea55c1f22786dba35a1fc0fdfdb4e40b05e0e735ed09c6961684f6442e863c3ed72024ce01f19113bbd9ca47c32e3f43c55f42 WHIRLPOOL dd7ac934584894f4a0ae86a9122080c49a4d09924011bc12dc1530ac6b5ee11fac6d55d6e5b306bb24d749a509236d3e39870b4d6b2ff5de37f6e54707ff8bb6

diff --git a/app-emulation/vmware-workstation/vmware-workstation-12.5.7.5813279.ebuild b/app-emulation/vmware-workstation/vmware-workstation-12.5.8.7098237.ebuild
similarity index 100%
rename from app-emulation/vmware-workstation/vmware-workstation-12.5.7.5813279.ebuild
rename to app-emulation/vmware-workstation/vmware-workstation-12.5.8.7098237.ebuild


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2017-11-17 21:52 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-06-25 15:58 [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-player/, app-emulation/vmware-workstation/, Fabio Rossi
  -- strict thread matches above, loose matches on Subject: below --
2017-11-17 21:52 Fabio Rossi
2017-06-25 15:58 Fabio Rossi
2012-05-04 14:16 Vadim Kuznetsov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox