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

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