VMware desktop build 703057

Package-Manager: portage-2.1.10.57/cvs/Linux x86_64

11 files changed, 50 insertions, 119 deletions

diff --git a/app-emulation/vmware-modules/ChangeLog b/app-emulation/vmware-modules/ChangeLog
index 00f305727aba..5a331430a89e 100644
--- a/app-emulation/vmware-modules/ChangeLog
+++ b/app-emulation/vmware-modules/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/vmware-modules
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.91 2012/03/26 16:14:40 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.92 2012/05/05 14:51:31 vadimk Exp $
+
+*vmware-modules-264.3 (05 May 2012)
+
+  05 May 2012; Vadim Kuznetsov vadimk@gentoo.org +vmware-modules-264.3.ebuild,
+  -files/264.2-3.2.0.patch, -vmware-modules-264.2-r1.ebuild,
+  files/264-3.2.0.patch, metadata.xml:
+  VMware desktop build 703057
 
 *vmware-modules-264.2-r1 (26 Mar 2012)
 *vmware-modules-238.5-r1 (26 Mar 2012)
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 5baa61df9e9d..87f89147e2b4 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 87f89147e2b4..000000000000
--- 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 9deb3119be16..2efced2927d2 100644
--- a/app-emulation/vmware-modules/metadata.xml
+++ b/app-emulation/vmware-modules/metadata.xml
@@ -8,4 +8,7 @@
 	<longdescription>
 		VMware kernel modules.
 	</longdescription>
+	<use>
+    	<flag name="pax_kernel">Apply patch needed for pax enabled kernels</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-emulation/vmware-modules/vmware-modules-264.2-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-264.3.ebuild
index 520cb4188816..45cbd8c95e49 100644
--- a/app-emulation/vmware-modules/vmware-modules-264.2-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-264.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-264.2-r1.ebuild,v 1.1 2012/03/26 16:14:40 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-264.3.ebuild,v 1.1 2012/05/05 14:51:31 vadimk Exp $
 
-EAPI="2"
+EAPI="4"
 
 inherit eutils flag-o-matic linux-info linux-mod versionator
 
@@ -17,7 +17,7 @@ SRC_URI=""
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="hardened"
+IUSE="pax_kernel"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
@@ -63,8 +63,9 @@ 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"
-	use hardened && epatch "${FILESDIR}/hardened.patch"
+	epatch "${FILESDIR}/${PV_MAJOR}-3.2.0.patch"
+	use pax_kernel && epatch "${FILESDIR}/hardened.patch"
+	epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
 }
 
 src_install() {
diff --git a/app-emulation/vmware-player/ChangeLog b/app-emulation/vmware-player/ChangeLog
index 375ddb0f488e..2014d0a351b6 100644
--- a/app-emulation/vmware-player/ChangeLog
+++ b/app-emulation/vmware-player/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/vmware-player
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/ChangeLog,v 1.104 2012/03/24 12:40:58 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/ChangeLog,v 1.105 2012/05/05 14:50:49 vadimk Exp $
+
+*vmware-player-4.0.3.703057 (05 May 2012)
+
+  05 May 2012; Vadim Kuznetsov vadimk@gentoo.org
+  +vmware-player-4.0.3.703057.ebuild, -vmware-player-4.0.2.591240.ebuild:
+  VMware desktop build 703057
 
   24 Mar 2012; Vadim Kuznetsov <vadimk@gentoo.org>
   -vmware-player-4.0.1.528992-r2.ebuild:
diff --git a/app-emulation/vmware-player/vmware-player-4.0.2.591240.ebuild b/app-emulation/vmware-player/vmware-player-4.0.3.703057.ebuild
index b30be1213f33..656e98d76c3f 100644
--- a/app-emulation/vmware-player/vmware-player-4.0.2.591240.ebuild
+++ b/app-emulation/vmware-player/vmware-player-4.0.3.703057.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/vmware-player-4.0.2.591240.ebuild,v 1.1 2012/03/10 14:19:47 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/vmware-player-4.0.3.703057.ebuild,v 1.1 2012/05/05 14:50:49 vadimk Exp $
 
 EAPI="4"
 
-inherit eutils versionator fdo-mime gnome2-utils vmware-bundle
+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}
@@ -173,6 +174,8 @@ src_install() {
 	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/{wrapper-gtk24.sh,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
diff --git a/app-emulation/vmware-tools/ChangeLog b/app-emulation/vmware-tools/ChangeLog
index c9aa6c76fd0d..7a702ab6a6c5 100644
--- a/app-emulation/vmware-tools/ChangeLog
+++ b/app-emulation/vmware-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/vmware-tools
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-tools/ChangeLog,v 1.9 2012/03/24 12:42:17 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-tools/ChangeLog,v 1.10 2012/05/05 14:49:10 vadimk Exp $
+
+*vmware-tools-8.8.2.703057 (05 May 2012)
+
+  05 May 2012; Vadim Kuznetsov vadimk@gentoo.org
+  +vmware-tools-8.8.2.703057.ebuild, -vmware-tools-8.8.2.591240.ebuild:
+  VMware desktop build 703057
 
   24 Mar 2012; Vadim Kuznetsov <vadimk@gentoo.org>
   -vmware-tools-8.8.1.528992.ebuild:
diff --git a/app-emulation/vmware-tools/vmware-tools-8.8.2.591240.ebuild b/app-emulation/vmware-tools/vmware-tools-8.8.2.703057.ebuild
index be69ee165cec..03343727c6ea 100644
--- a/app-emulation/vmware-tools/vmware-tools-8.8.2.591240.ebuild
+++ b/app-emulation/vmware-tools/vmware-tools-8.8.2.703057.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-tools/vmware-tools-8.8.2.591240.ebuild,v 1.1 2012/03/10 14:19:04 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-tools/vmware-tools-8.8.2.703057.ebuild,v 1.1 2012/05/05 14:49:10 vadimk Exp $
 
 inherit versionator vmware-bundle
 
 MY_PV="$(replace_version_separator 3 - $PV)"
-BASE_URI="http://softwareupdate.vmware.com/cds/vmw-desktop/player/4.0.$(get_version_component_range 3)/$(get_version_component_range 4)/linux/packages/"
+BASE_URI="http://softwareupdate.vmware.com/cds/vmw-desktop/player/4.0.3/$(get_version_component_range 4)/linux/packages/"
 
 DESCRIPTION="VMware Tools for guest operating systems"
 HOMEPAGE="http://www.vmware.com/products/player/"
diff --git a/app-emulation/vmware-workstation/ChangeLog b/app-emulation/vmware-workstation/ChangeLog
index 022095be0f74..7869929dde05 100644
--- a/app-emulation/vmware-workstation/ChangeLog
+++ b/app-emulation/vmware-workstation/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/vmware-workstation
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.235 2012/03/24 13:50:09 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.236 2012/05/05 14:52:20 vadimk Exp $
+
+*vmware-workstation-8.0.3.703057 (05 May 2012)
+
+  05 May 2012; Vadim Kuznetsov vadimk@gentoo.org
+  +vmware-workstation-8.0.3.703057.ebuild,
+  -vmware-workstation-8.0.2.591240.ebuild:
+  VMware desktop build 703057
 
   24 Mar 2012; Vadim Kuznetsov <vadimk@gentoo.org>
   vmware-workstation-7.1.5.491717.ebuild:
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 909b3c4be464..5cd1271eafb1 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
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-8.0.2.591240.ebuild,v 1.1 2012/03/10 14:20:59 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-8.0.3.703057.ebuild,v 1.1 2012/05/05 14:52:20 vadimk Exp $
 
 EAPI="4"
 
@@ -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}