From: Vadim Kuznetsov <vadimk@gentoo.org>
Date: Sat, 3 Dec 2011 18:34:42 +0000 (+0000)
Subject: version bump and cleanup
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=2db992e8470e15e7563cdfcdb394985797c3d9de;p=gentoo.git

version bump and cleanup

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

diff --git a/app-emulation/open-vm-tools-kmod/ChangeLog b/app-emulation/open-vm-tools-kmod/ChangeLog
index 8447a2d7ed91..245aece935e9 100644
--- a/app-emulation/open-vm-tools-kmod/ChangeLog
+++ b/app-emulation/open-vm-tools-kmod/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for app-emulation/open-vm-tools-kmod
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools-kmod/ChangeLog,v 1.20 2011/11/15 15:20:29 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools-kmod/ChangeLog,v 1.21 2011/12/03 18:33:48 vadimk Exp $
+
+*open-vm-tools-kmod-2011.11.20.535097 (03 Dec 2011)
+*open-vm-tools-kmod-8.8.1.528969 (03 Dec 2011)
+
+  03 Dec 2011; Vadim Kuznetsov <vadimk@gentoo.org>
+  -open-vm-tools-kmod-0.0.20110124.354108.ebuild,
+  -open-vm-tools-kmod-0.0.20110223.368700-r1.ebuild,
+  -open-vm-tools-kmod-0.0.20110328.387002.ebuild,
+  -open-vm-tools-kmod-0.0.20110627.437995.ebuild,
+  -open-vm-tools-kmod-0.0.20110821.471295.ebuild,
+  -open-vm-tools-kmod-0.0.20110923.491607.ebuild,
+  +open-vm-tools-kmod-8.8.1.528969.ebuild,
+  +open-vm-tools-kmod-2011.11.20.535097.ebuild:
+  version bump and cleanup
 
   15 Nov 2011; Vadim Kuznetsov <vadimk@gentoo.org>
   -open-vm-tools-kmod-0.0.20100616.268169.ebuild,
diff --git a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-0.0.20110124.354108.ebuild b/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-0.0.20110124.354108.ebuild
deleted file mode 100644
index 85b0cab880d0..000000000000
--- a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-0.0.20110124.354108.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-0.0.20110124.354108.ebuild,v 1.1 2011/02/06 13:48:54 vadimk Exp $
-
-EAPI="2"
-
-inherit linux-mod versionator
-
-MY_DATE="$(get_version_component_range 3)"
-MY_BUILD="$(get_version_component_range 4)"
-MY_PN="${PN/-kmod}"
-MY_PV="${MY_DATE:0:4}.${MY_DATE:4:2}.${MY_DATE:6:2}-${MY_BUILD}"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="Opensourced tools for VMware guests"
-HOMEPAGE="http://open-vm-tools.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	virtual/linux-sources
-	"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	VMWARE_MOD_DIR="modules/linux"
-	VMWARE_MODULE_LIST="vmblock vmci vmhgfs vmsync vmxnet vsock"
-
-	MODULE_NAMES=""
-	BUILD_TARGETS="auto-build HEADER_DIR=${KERNEL_DIR}/include BUILD_DIR=${KV_OUT_DIR} OVT_SOURCE_DIR=${S}"
-
-	for mod in ${VMWARE_MODULE_LIST};
-	do
-		if [ "${mod}" == "vmxnet" ];
-		then
-			MODTARGET="net"
-		else
-			MODTARGET="openvmtools"
-		fi
-		MODULE_NAMES="${MODULE_NAMES} ${mod}(${MODTARGET}:${S}/${VMWARE_MOD_DIR}/${mod})"
-	done
-}
-
-src_prepare() {
-	sed -i.bak -e '/\smake\s/s/make/$(MAKE)/g' modules/linux/{vmblock,vmci,vmhgfs,vmsync,vmxnet,vsock}/Makefile\
-		|| die "Sed failed."
-}
-
-src_configure() {
-	:				# do nothing at all
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	elog "vmxnet3 for Linux is now upstream (as of Linux 2.6.32)"
-	elog "pvscsi for Linux is now upstream (as of Linux 2.6.33)"
-	elog "vmmemctl for Linux is now upstream (as of Linux 2.6.34)"
-}
diff --git a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-0.0.20110223.368700-r1.ebuild b/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-0.0.20110223.368700-r1.ebuild
deleted file mode 100644
index 6beab71bf25d..000000000000
--- a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-0.0.20110223.368700-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-0.0.20110223.368700-r1.ebuild,v 1.1 2011/03/11 16:14:18 vadimk Exp $
-
-EAPI="2"
-
-inherit linux-mod versionator
-
-MY_DATE="$(get_version_component_range 3)"
-MY_BUILD="$(get_version_component_range 4)"
-MY_PN="${PN/-kmod}"
-MY_PV="${MY_DATE:0:4}.${MY_DATE:4:2}.${MY_DATE:6:2}-${MY_BUILD}"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="Opensourced tools for VMware guests"
-HOMEPAGE="http://open-vm-tools.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	virtual/linux-sources
-	"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	VMWARE_MOD_DIR="modules/linux"
-	VMWARE_MODULE_LIST="vmblock vmci vmhgfs vmsync vmxnet vsock"
-
-	MODULE_NAMES=""
-	BUILD_TARGETS="auto-build HEADER_DIR=${KERNEL_DIR}/include BUILD_DIR=${KV_OUT_DIR} OVT_SOURCE_DIR=${S}"
-
-	for mod in ${VMWARE_MODULE_LIST};
-	do
-		if [ "${mod}" == "vmxnet" ];
-		then
-			MODTARGET="net"
-		else
-			MODTARGET="openvmtools"
-		fi
-		MODULE_NAMES="${MODULE_NAMES} ${mod}(${MODTARGET}:${S}/${VMWARE_MOD_DIR}/${mod})"
-	done
-}
-
-src_prepare() {
-	sed -i.bak -e '/\smake\s/s/make/$(MAKE)/g' modules/linux/{vmblock,vmci,vmhgfs,vmsync,vmxnet,vsock}/Makefile\
-		|| die "Sed failed."
-}
-
-src_configure() {
-	:				# do nothing at all
-}
-
-src_install() {
-	linux-mod_src_install
-
-	local udevrules="${T}/60-vmware.rules"
-	cat > "${udevrules}" <<-EOF
-		KERNEL=="vsock", GROUP="vmware", MODE=660
-	EOF
-	insinto /etc/udev/rules.d/
-	doins "${udevrules}"
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	elog "vmxnet3 for Linux is now upstream (as of Linux 2.6.32)"
-	elog "pvscsi for Linux is now upstream (vmw_pvscsi) (as of Linux 2.6.33)"
-	elog "vmmemctl for Linux is now upstream (vmw_balloon) (as of Linux 2.6.34)"
-}
diff --git a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-0.0.20110328.387002.ebuild b/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-0.0.20110328.387002.ebuild
deleted file mode 100644
index c28b4b943287..000000000000
--- a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-0.0.20110328.387002.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-0.0.20110328.387002.ebuild,v 1.1 2011/04/19 15:28:32 vadimk Exp $
-
-EAPI="2"
-
-inherit linux-mod versionator
-
-MY_DATE="$(get_version_component_range 3)"
-MY_BUILD="$(get_version_component_range 4)"
-MY_PN="${PN/-kmod}"
-MY_PV="${MY_DATE:0:4}.${MY_DATE:4:2}.${MY_DATE:6:2}-${MY_BUILD}"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="Opensourced tools for VMware guests"
-HOMEPAGE="http://open-vm-tools.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	virtual/linux-sources
-	"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	VMWARE_MOD_DIR="modules/linux"
-	VMWARE_MODULE_LIST="vmblock vmci vmhgfs vmsync vmxnet vsock"
-
-	MODULE_NAMES=""
-	BUILD_TARGETS="auto-build HEADER_DIR=${KERNEL_DIR}/include BUILD_DIR=${KV_OUT_DIR} OVT_SOURCE_DIR=${S}"
-
-	for mod in ${VMWARE_MODULE_LIST};
-	do
-		if [ "${mod}" == "vmxnet" ];
-		then
-			MODTARGET="net"
-		else
-			MODTARGET="openvmtools"
-		fi
-		MODULE_NAMES="${MODULE_NAMES} ${mod}(${MODTARGET}:${S}/${VMWARE_MOD_DIR}/${mod})"
-	done
-}
-
-src_prepare() {
-	sed -i.bak -e '/\smake\s/s/make/$(MAKE)/g' modules/linux/{vmblock,vmci,vmhgfs,vmsync,vmxnet,vsock}/Makefile\
-		|| die "Sed failed."
-}
-
-src_configure() {
-	:				# do nothing at all
-}
-
-src_install() {
-	linux-mod_src_install
-
-	local udevrules="${T}/60-vmware.rules"
-	cat > "${udevrules}" <<-EOF
-		KERNEL=="vsock", GROUP="vmware", MODE=660
-	EOF
-	insinto /etc/udev/rules.d/
-	doins "${udevrules}"
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	elog "vmxnet3 for Linux is now upstream (as of Linux 2.6.32)"
-	elog "pvscsi for Linux is now upstream (vmw_pvscsi) (as of Linux 2.6.33)"
-	elog "vmmemctl for Linux is now upstream (vmw_balloon) (as of Linux 2.6.34)"
-}
diff --git a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-0.0.20110627.437995.ebuild b/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-0.0.20110627.437995.ebuild
deleted file mode 100644
index d6f4d497f7ee..000000000000
--- a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-0.0.20110627.437995.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-0.0.20110627.437995.ebuild,v 1.1 2011/07/16 12:56:56 vadimk Exp $
-
-EAPI="2"
-
-inherit linux-mod versionator
-
-MY_DATE="$(get_version_component_range 3)"
-MY_BUILD="$(get_version_component_range 4)"
-MY_PN="${PN/-kmod}"
-MY_PV="${MY_DATE:0:4}.${MY_DATE:4:2}.${MY_DATE:6:2}-${MY_BUILD}"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="Opensourced tools for VMware guests"
-HOMEPAGE="http://open-vm-tools.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	virtual/linux-sources
-	"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	VMWARE_MOD_DIR="modules/linux"
-	VMWARE_MODULE_LIST="vmblock vmci vmhgfs vmsync vmxnet vsock"
-
-	MODULE_NAMES=""
-	BUILD_TARGETS="auto-build HEADER_DIR=${KERNEL_DIR}/include BUILD_DIR=${KV_OUT_DIR} OVT_SOURCE_DIR=${S}"
-
-	for mod in ${VMWARE_MODULE_LIST};
-	do
-		if [ "${mod}" == "vmxnet" ];
-		then
-			MODTARGET="net"
-		else
-			MODTARGET="openvmtools"
-		fi
-		MODULE_NAMES="${MODULE_NAMES} ${mod}(${MODTARGET}:${S}/${VMWARE_MOD_DIR}/${mod})"
-	done
-}
-
-src_prepare() {
-	sed -i.bak -e '/\smake\s/s/make/$(MAKE)/g' modules/linux/{vmblock,vmci,vmhgfs,vmsync,vmxnet,vsock}/Makefile\
-		|| die "Sed failed."
-}
-
-src_configure() {
-	:				# do nothing at all
-}
-
-src_install() {
-	linux-mod_src_install
-
-	local udevrules="${T}/60-vmware.rules"
-	cat > "${udevrules}" <<-EOF
-		KERNEL=="vsock", GROUP="vmware", MODE=660
-	EOF
-	insinto /etc/udev/rules.d/
-	doins "${udevrules}"
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	elog "vmxnet3 for Linux is now upstream (as of Linux 2.6.32)"
-	elog "pvscsi for Linux is now upstream (vmw_pvscsi) (as of Linux 2.6.33)"
-	elog "vmmemctl for Linux is now upstream (vmw_balloon) (as of Linux 2.6.34)"
-}
diff --git a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-0.0.20110821.471295.ebuild b/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2011.11.20.535097.ebuild
similarity index 87%
rename from app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-0.0.20110821.471295.ebuild
rename to app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2011.11.20.535097.ebuild
index fa4a171c621a..bf6b93ddd1eb 100644
--- a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-0.0.20110821.471295.ebuild
+++ b/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2011.11.20.535097.ebuild
@@ -1,15 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-0.0.20110821.471295.ebuild,v 1.1 2011/09/04 17:42:32 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2011.11.20.535097.ebuild,v 1.1 2011/12/03 18:33:48 vadimk Exp $
 
-EAPI="2"
+EAPI="4"
 
 inherit linux-mod versionator
 
-MY_DATE="$(get_version_component_range 3)"
-MY_BUILD="$(get_version_component_range 4)"
 MY_PN="${PN/-kmod}"
-MY_PV="${MY_DATE:0:4}.${MY_DATE:4:2}.${MY_DATE:6:2}-${MY_BUILD}"
+MY_PV="$(replace_version_separator 3 '-')"
 MY_P="${MY_PN}-${MY_PV}"
 
 DESCRIPTION="Opensourced tools for VMware guests"
diff --git a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-0.0.20110923.491607.ebuild b/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-8.8.1.528969.ebuild
similarity index 87%
rename from app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-0.0.20110923.491607.ebuild
rename to app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-8.8.1.528969.ebuild
index ae13cfd9cd9b..214fa645a686 100644
--- a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-0.0.20110923.491607.ebuild
+++ b/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-8.8.1.528969.ebuild
@@ -1,15 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-0.0.20110923.491607.ebuild,v 1.1 2011/10/17 19:35:13 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-8.8.1.528969.ebuild,v 1.1 2011/12/03 18:33:48 vadimk Exp $
 
-EAPI="2"
+EAPI="4"
 
 inherit linux-mod versionator
 
-MY_DATE="$(get_version_component_range 3)"
-MY_BUILD="$(get_version_component_range 4)"
 MY_PN="${PN/-kmod}"
-MY_PV="${MY_DATE:0:4}.${MY_DATE:4:2}.${MY_DATE:6:2}-${MY_BUILD}"
+MY_PV="$(replace_version_separator 3 '-')"
 MY_P="${MY_PN}-${MY_PV}"
 
 DESCRIPTION="Opensourced tools for VMware guests"
diff --git a/app-emulation/open-vm-tools/ChangeLog b/app-emulation/open-vm-tools/ChangeLog
index 723d0ff961d0..7ec687abb1ac 100644
--- a/app-emulation/open-vm-tools/ChangeLog
+++ b/app-emulation/open-vm-tools/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for app-emulation/open-vm-tools
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/ChangeLog,v 1.57 2011/11/15 15:19:41 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/ChangeLog,v 1.58 2011/12/03 18:34:42 vadimk Exp $
+
+*open-vm-tools-2011.11.20.535097 (03 Dec 2011)
+*open-vm-tools-8.8.1.528969 (03 Dec 2011)
+
+  03 Dec 2011; Vadim Kuznetsov <vadimk@gentoo.org>
+  -open-vm-tools-0.0.20110124.354108.ebuild,
+  -open-vm-tools-0.0.20110223.368700.ebuild,
+  -open-vm-tools-0.0.20110328.387002-r2.ebuild,
+  -open-vm-tools-0.0.20110627.437995.ebuild,
+  -open-vm-tools-0.0.20110821.471295.ebuild,
+  -open-vm-tools-0.0.20110923.491607.ebuild,
+  open-vm-tools-0.0.20111026.514583.ebuild, +open-vm-tools-8.8.1.528969.ebuild,
+  +open-vm-tools-2011.11.20.535097.ebuild, +files/open-vm-tools.confd,
+  -files/checkvm-pie-safety.patch, -files/default-scripts.patch,
+  -files/open-vm.confd, -files/vmguestlib-pkg-config.patch:
+  version bump and cleanup.
+  8.8.1 is matching the Workstation 8.0.1 release
 
   15 Nov 2011; Vadim Kuznetsov <vadimk@gentoo.org>
   -open-vm-tools-0.0.20100616.268169-r1.ebuild,
diff --git a/app-emulation/open-vm-tools/files/checkvm-pie-safety.patch b/app-emulation/open-vm-tools/files/checkvm-pie-safety.patch
deleted file mode 100644
index 5a879c94b786..000000000000
--- a/app-emulation/open-vm-tools/files/checkvm-pie-safety.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From: Gordon Malm <gengor@gentoo.org>
-
-Make inline asm PIC-safe (do not clobber ebx).
-
-Thanks and credit to Anthony Basile for all his help and testing.
-
-Reference: http://bugs.gentoo.org/200376
-
---- a/checkvm/checkvm.c
-+++ b/checkvm/checkvm.c
-@@ -79,8 +79,16 @@
- {
-    uint32 eax, ebx, ecx, edx;
-    
--   __asm__ volatile("inl (%%dx)" :
--   	            "=a"(eax), "=c"(ecx), "=d"(edx), "=b"(ebx) :
-+   __asm__ volatile(
-+#if defined __PIC__ && !vm_x86_64 // %ebx is reserved by the compiler.
-+		    "movl %%ebx, %3    \n\t"
-+		    "inl (%%dx)        \n\t"
-+		    "xchgl %%ebx, %3   \n\t" :
-+		    "=a"(eax), "=c"(ecx), "=d"(edx), "=r"(ebx) :
-+#else
-+		    "inl (%%dx)" :
-+		    "=a"(eax), "=c"(ecx), "=d"(edx), "=b"(ebx) :
-+#endif
- 		    "0"(BDOOR_MAGIC), "1"(BDOOR_CMD_GETVERSION),
- 		    "2"(BDOOR_PORT) : "memory");
-    version[0] = eax;
-@@ -96,8 +104,16 @@
- {
-    uint32 eax, ebx, ecx, edx;
-    
--   __asm__ volatile("inl (%%dx)" :
--   	            "=a"(eax), "=c"(ecx), "=d"(edx), "=b"(ebx) :
-+   __asm__ volatile(
-+#if defined __PIC__ && !vm_x86_64 // %ebx is reserved by the compiler.
-+		    "movl %%ebx, %3    \n\t"
-+		    "inl (%%dx)        \n\t"
-+		    "xchgl %%ebx, %3   \n\t" :
-+		    "=a"(eax), "=c"(ecx), "=d"(edx), "=r"(ebx) :
-+#else
-+		    "inl (%%dx)" :
-+		    "=a"(eax), "=c"(ecx), "=d"(edx), "=b"(ebx) :
-+#endif
- 		    "0"(BDOOR_MAGIC), "1"(BDOOR_CMD_GETHWVERSION),
- 		    "2"(BDOOR_PORT) : "memory");
-    *hwVersion = eax;
-@@ -112,8 +128,16 @@
- {
-    uint32 eax, ebx, ecx, edx;
-    
--   __asm__ volatile("inl (%%dx)" :
--   		    "=a"(eax), "=c"(ecx), "=d"(edx), "=b"(ebx) :
-+   __asm__ volatile(
-+#if defined __PIC__ && !vm_x86_64 // %ebx is reserved by the compiler.
-+		    "movl %%ebx, %3    \n\t"
-+		    "inl (%%dx)        \n\t"
-+		    "xchgl %%ebx, %3   \n\t" :
-+		    "=a"(eax), "=c"(ecx), "=d"(edx), "=r"(ebx) :
-+#else
-+		    "inl (%%dx)" :
-+		    "=a"(eax), "=c"(ecx), "=d"(edx), "=b"(ebx) :
-+#endif
- 		    "0"(BDOOR_MAGIC), "1"(BDOOR_CMD_GETSCREENSIZE),
- 		    "2"(BDOOR_PORT) : "memory");
-    *screensize = eax;
diff --git a/app-emulation/open-vm-tools/files/default-scripts.patch b/app-emulation/open-vm-tools/files/default-scripts.patch
deleted file mode 100644
index ed57fcfaa1da..000000000000
--- a/app-emulation/open-vm-tools/files/default-scripts.patch
+++ /dev/null
@@ -1,225 +0,0 @@
---- scripts/linux/network.orig	2010-07-06 14:54:01.000000000 -0400
-+++ scripts/linux/network	2010-07-07 13:05:21.000000000 -0400
-@@ -34,164 +34,6 @@
- 
- 
- #
--# find_networking_script --
--#
--#    Searches common Linux distro init/rc paths to find a singular network
--#    services script.
--#
--# Result:
--#    Returns a valid networking script path on success or "error" on failure.
--#
--# Side effects:
--#    None.
--#
--
--find_networking_script() {
--    local script="error"
--    for dir in "/etc/init.d" "/sbin/init.d" "/etc" "/etc/rc.d" ; do
--        if [ -d "$dir/rc0.d" ] &&
--	    [ -d "$dir/rc1.d" ] &&
--	    [ -d "$dir/rc2.d" ] &&
--	    [ -d "$dir/rc3.d" ] &&
--	    [ -d "$dir/rc4.d" ] &&
--	    [ -d "$dir/rc5.d" ] &&
--	    [ -d "$dir/rc6.d" ]; then
--
--	    # Now find the appropriate networking script.
--	    if [ -d "$dir/init.d" ]; then
--		if [ -x "$dir/init.d/network" ]; then
--		    script="$dir/init.d/network"
--		elif [ -x "$dir/init.d/networking" ]; then
--		    script="$dir/init.d/networking"
--		fi
--	    else
--		if [ -x "$dir/network" ]; then
--		    script="$dir/network"
--		elif [ -x "$dir/networking" ]; then
--		    script="$dir/networking"
--		fi
--	    fi
--        fi
--    done
--
--    echo "$script"
--}
--
--
--#
--# save_active_NIC_list --
--#
--#    Records a list of every active NIC to /var/run/vmware-active-nics.
--#
--#    XXX What's the story on aliases?  Should they still be included, or will
--#    they be recreated automatically upon resume?
--#
--# Results:
--#    $activeList has, one per line, a list of all active NICs.
--#
--# Side effects:
--#    None.
--#
--
--save_active_NIC_list() {
--   >$activeList
--
--   for nic in `ifconfig | awk '/^eth/ { print $1 }'`; do
--      ifconfig $nic | egrep -q '\bUP\b' && echo $nic >> $activeList
--      exitCode=`expr $exitCode \| $?`
--   done
--}
--
--
--#
--# rescue_NIC --
--#
--#    For each NIC recorded in $activeList that is not currently "up", run
--#    "ifup $nic".
--#
--# Results:
--#    All downed NICs should be active.
--#
--
--rescue_NIC() {
--   if [ -f "$activeList" ]; then
--      while read nic; do
--         if ifconfig $nic | egrep -q '\bUP\b'; then
--            echo `date` "[rescue_nic] $nic is already active."
--         else
--            echo `date` "[rescue_nic] activating $nic ..."
--
--            ifup $nic
--            exitCode=`expr $exitCode \| $?`
--         fi
--      done < $activeList
--
--      rm -f $activeList
--   fi
--}
--
--
--#
--# TranquilizeNetworkManager --
--#
--#    Put the NetworkManager daemon to sleep (maybe).
--#
--#    See http://projects.gnome.org/NetworkManager/developers/spec.html .
--#
--# Results:
--#    Sleep(true) request is sent to the NetworkManager D-Bus interface.
--#
--# Side effects:
--#    None.
--#
--
--TranquilizeNetworkManager() {
--   # `which' may be a bit noisy, so we'll shush it.
--   dbusSend=`which dbus-send 2>/dev/null`
--   if [ $? -eq 0 ]; then
--      # NetworkManager 0.6
--      $dbusSend --system --dest=org.freedesktop.NetworkManager          \
--         /org/freedesktop/NetworkManager                                \
--         org.freedesktop.NetworkManager.sleep
--      # NetworkManager 0.7.0
--      $dbusSend --system --dest=org.freedesktop.NetworkManager          \
--         /org/freedesktop/NetworkManager                                \
--         org.freedesktop.NetworkManager.Sleep boolean:true
--   fi
--}
--
--
--#
--# WakeNetworkManager --
--#
--#    Wake the NetworkManager daemon (maybe).
--#
--#    See http://projects.gnome.org/NetworkManager/developers/spec.html .
--#
--# Results:
--#    Sleep(false)request is sent to the NetworkManager D-Bus interface.
--#
--# Side effects:
--#    None.
--#
--
--WakeNetworkManager() {
--   # `which' may be a bit noisy, so we'll shush it.
--   dbusSend=`which dbus-send 2>/dev/null`
--   if [ $? -eq 0 ]; then
--      # NetworkManager 0.6
--      $dbusSend --system --dest=org.freedesktop.NetworkManager          \
--         /org/freedesktop/NetworkManager                                \
--         org.freedesktop.NetworkManager.wake
--      # NetworkManager 0.7.0
--      $dbusSend --system --dest=org.freedesktop.NetworkManager          \
--         /org/freedesktop/NetworkManager                                \
--         org.freedesktop.NetworkManager.Sleep boolean:false
--   fi
--}
--
--
--#
- # main --
- #
- #    Main entry point.  Perform some sanity checking, then map state change
-@@ -203,45 +45,24 @@
- 
- main() {
-    exitCode=0
--   activeList=/var/run/vmware-active-nics
- 
--   networkScript=`find_networking_script`
--   [ "$networkScript" != "error" ] || Panic "Cannot find system networking script."
--
--   # XXX Are these really necessary?  If so, we should have seen customer
--   # complaints by now.
--   which ifup >/dev/null 2>&1      || Panic "ifup not in search path."
--   which ifconfig >/dev/null 2>&1  || Panic "ifconfig not in search path."
-+   #
-+   # net.eth0, net.eth1, network, wicd, NetworkManager
-+   service="net.eth0"
-+
-+   if [ $(rc-service -e net.eth0) ] 
-+   then
-+   	service="net.eth0"
-+   else
-+	service="network"
-+   fi
- 
-    case "$1" in
--      poweron-vm)
--         rm -f $activeList
--         ;;
-       suspend-vm)
--         save_active_NIC_list
--         "$networkScript" stop
--         TranquilizeNetworkManager
-+         rc-service $service stop
-          ;;
-       resume-vm)
--         # According to hfu, "/etc/init.d/networking restart" on Debian 5.0
--         # may bring down ethernet interfaces tagged as "allow-hotplug" without
--         # bringing them back up.
--         #
--         # This is especially a problem when reverting to a live, running
--         # VM snapshot where an active NIC list hadn't yet been generated,
--         # resulting in sudden loss of an otherwise operational NIC.
--         #
--         # So, if the active list doesn't exist, assume we're coming back to
--         # a live snapshot and capture the current active list now for
--         # rescue later.
--         if [ ! -s $activeList ]; then
--            save_active_NIC_list
--         fi
--         WakeNetworkManager
--         # XXX Do we really want restart or is start sufficient?  Like, would
--         # using start avoid the problem mentioned above?
--         "$networkScript" restart
--         rescue_NIC
-+         rc-service $service start
-          ;;
-       *) ;;
-    esac
diff --git a/app-emulation/open-vm-tools/files/open-vm.confd b/app-emulation/open-vm-tools/files/open-vm-tools.confd
similarity index 100%
rename from app-emulation/open-vm-tools/files/open-vm.confd
rename to app-emulation/open-vm-tools/files/open-vm-tools.confd
diff --git a/app-emulation/open-vm-tools/files/vmguestlib-pkg-config.patch b/app-emulation/open-vm-tools/files/vmguestlib-pkg-config.patch
deleted file mode 100644
index 6b125a1c91c7..000000000000
--- a/app-emulation/open-vm-tools/files/vmguestlib-pkg-config.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/libguestlib/vmguestlib.pc.in b/libguestlib/vmguestlib.pc.in
-index 815d897..9fae5fd 100644
---- a/libguestlib/vmguestlib.pc.in
-+++ b/libguestlib/vmguestlib.pc.in
-@@ -1,5 +1,7 @@
- # VMware GuestLib pkgconfig data.
- 
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
- libdir=@libdir@
- includedir=@includedir@
- 
diff --git a/app-emulation/open-vm-tools/open-vm-tools-0.0.20110124.354108.ebuild b/app-emulation/open-vm-tools/open-vm-tools-0.0.20110124.354108.ebuild
deleted file mode 100644
index 9b8afecb4503..000000000000
--- a/app-emulation/open-vm-tools/open-vm-tools-0.0.20110124.354108.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/open-vm-tools-0.0.20110124.354108.ebuild,v 1.2 2011/03/30 08:20:12 nirbheek Exp $
-
-EAPI="2"
-
-inherit eutils pam versionator
-
-MY_DATE="$(get_version_component_range 3)"
-MY_BUILD="$(get_version_component_range 4)"
-MY_PV="${MY_DATE:0:4}.${MY_DATE:4:2}.${MY_DATE:6:2}-${MY_BUILD}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Opensourced tools for VMware guests"
-HOMEPAGE="http://open-vm-tools.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X doc fuse icu +pic unity xinerama"
-
-RDEPEND="app-emulation/open-vm-tools-kmod
-	dev-libs/glib:2
-	dev-libs/libdnet
-	sys-apps/ethtool
-	sys-process/procps
-	virtual/pam
-	X? (
-		dev-cpp/gtkmm:2.4
-		x11-base/xorg-server
-		x11-drivers/xf86-input-vmmouse
-		x11-drivers/xf86-video-vmware
-		x11-libs/gtk+:2
-		x11-libs/libnotify
-		x11-libs/libX11
-		x11-libs/libXtst
-	)
-	fuse? ( sys-fs/fuse )
-	icu? ( dev-libs/icu )
-	unity? (
-		dev-libs/uriparser
-		media-libs/libpng
-		x11-libs/libXScrnSaver
-	)
-	xinerama? ( x11-libs/libXinerama )
-	"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	dev-util/pkgconfig
-	virtual/linux-sources
-	sys-apps/findutils
-	"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	use unity && ! use X && die 'The Unity USE flag requires "X" USE flag as well'
-	use unity && ! use xinerama && die 'The Unity USE flag requires xinerame USE="xinerama" as well'
-
-	enewgroup vmware
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/default-scripts.patch"
-	#epatch "${FILESDIR}/checkvm-pie-safety.patch"
-	#sed -i -e 's/proc-3.2.7/proc/g' configure || die "sed configure failed"
-	# Do not filter out Werror
-	# Upstream Bug  http://sourceforge.net/tracker/?func=detail&aid=2959749&group_id=204462&atid=989708
-	# sed -i -e 's/CFLAGS=.*Werror/#&/g' configure || die "sed comment out Werror failed"
-	sed -i -e 's:\(TEST_PLUGIN_INSTALLDIR=\).*:\1\$libdir/open-vm-tools/plugins/tests:g' configure || die "sed test_plugin_installdir failed"
-}
-
-src_configure() {
-	econf \
-		--with-procps \
-		--with-dnet \
-		--without-kernel-modules \
-		$(use_enable doc docs) \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_with X x) \
-		$(use_with X gtk2) \
-		$(use_with X gtkmm) \
-		$(use_with icu) \
-		$(use_with pic) \
-		$(use_enable unity) \
-		$(use_enable xinerama multimon)
-
-	# Bugs 260878, 326761
-	find ./ -name Makefile | xargs sed -i -e 's/-Werror//g'  || die "sed out Werror failed"
-}
-
-src_compile() {
-	emake || die "failed to compile"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "failed to install"
-
-	rm "${D}"/etc/pam.d/vmtoolsd
-	pamd_mimic_system vmtoolsd auth account
-
-	rm "${D}"/usr/$(get_libdir)/*.la
-	rm "${D}"/usr/$(get_libdir)/open-vm-tools/plugins/common/*.la
-
-	newinitd "${FILESDIR}/open-vm-tools.initd" vmware-tools || die "failed to newinitd"
-	newconfd "${FILESDIR}/open-vm.confd" vmware-tools || die "failed to newconfd"
-
-	if use X;
-	then
-		dobin "${S}"/scripts/common/vmware-xdg-detect-de
-
-		insinto /etc/xdg/autostart
-		doins "${FILESDIR}/open-vm-tools.desktop" || die "failed to install .desktop"
-
-		elog "To be able to use the drag'n'drop feature of VMware for file"
-		elog "exchange, you need to do this:"
-		elog "	Add 'vmware-tools' to your default runlevel."
-		elog "	Add the users which should have access to this function"
-		elog "	to the group 'vmware'."
-	fi
-}
diff --git a/app-emulation/open-vm-tools/open-vm-tools-0.0.20110223.368700.ebuild b/app-emulation/open-vm-tools/open-vm-tools-0.0.20110223.368700.ebuild
deleted file mode 100644
index 233298a68b98..000000000000
--- a/app-emulation/open-vm-tools/open-vm-tools-0.0.20110223.368700.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/open-vm-tools-0.0.20110223.368700.ebuild,v 1.2 2011/03/29 06:17:16 nirbheek Exp $
-
-EAPI="2"
-
-inherit eutils pam versionator
-
-MY_DATE="$(get_version_component_range 3)"
-MY_BUILD="$(get_version_component_range 4)"
-MY_PV="${MY_DATE:0:4}.${MY_DATE:4:2}.${MY_DATE:6:2}-${MY_BUILD}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Opensourced tools for VMware guests"
-HOMEPAGE="http://open-vm-tools.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X doc fuse icu +pic unity xinerama"
-
-RDEPEND="app-emulation/open-vm-tools-kmod
-	dev-libs/glib:2
-	dev-libs/libdnet
-	sys-apps/ethtool
-	sys-process/procps
-	virtual/pam
-	X? (
-		dev-cpp/gtkmm:2.4
-		x11-base/xorg-server
-		x11-drivers/xf86-input-vmmouse
-		x11-drivers/xf86-video-vmware
-		x11-libs/gtk+:2
-		x11-libs/libnotify
-		x11-libs/libX11
-		x11-libs/libXtst
-	)
-	fuse? ( sys-fs/fuse )
-	icu? ( dev-libs/icu )
-	unity? (
-		dev-libs/uriparser
-		media-libs/libpng
-		x11-libs/libXScrnSaver
-	)
-	xinerama? ( x11-libs/libXinerama )
-	"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	dev-util/pkgconfig
-	virtual/linux-sources
-	sys-apps/findutils
-	"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	use unity && ! use X && die 'The Unity USE flag requires "X" USE flag as well'
-	use unity && ! use xinerama && die 'The Unity USE flag requires xinerame USE="xinerama" as well'
-
-	enewgroup vmware
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/default-scripts.patch"
-	#epatch "${FILESDIR}/checkvm-pie-safety.patch"
-	#sed -i -e 's/proc-3.2.7/proc/g' configure || die "sed configure failed"
-	# Do not filter out Werror
-	# Upstream Bug  http://sourceforge.net/tracker/?func=detail&aid=2959749&group_id=204462&atid=989708
-	# sed -i -e 's/CFLAGS=.*Werror/#&/g' configure || die "sed comment out Werror failed"
-	sed -i -e 's:\(TEST_PLUGIN_INSTALLDIR=\).*:\1\$libdir/open-vm-tools/plugins/tests:g' configure || die "sed test_plugin_installdir failed"
-}
-
-src_configure() {
-	econf \
-		--with-procps \
-		--with-dnet \
-		--without-kernel-modules \
-		$(use_enable doc docs) \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_with X x) \
-		$(use_with X gtk2) \
-		$(use_with X gtkmm) \
-		$(use_with icu) \
-		$(use_with pic) \
-		$(use_enable unity) \
-		$(use_enable xinerama multimon)
-
-	# Bugs 260878, 326761
-	find ./ -name Makefile | xargs sed -i -e 's/-Werror//g'  || die "sed out Werror failed"
-}
-
-src_compile() {
-	emake || die "failed to compile"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "failed to install"
-
-	rm "${D}"/etc/pam.d/vmtoolsd
-	pamd_mimic_system vmtoolsd auth account
-
-	rm "${D}"/usr/$(get_libdir)/*.la
-	rm "${D}"/usr/$(get_libdir)/open-vm-tools/plugins/common/*.la
-
-	newinitd "${FILESDIR}/open-vm-tools.initd" vmware-tools || die "failed to newinitd"
-	newconfd "${FILESDIR}/open-vm.confd" vmware-tools || die "failed to newconfd"
-
-	if use X;
-	then
-		dobin "${S}"/scripts/common/vmware-xdg-detect-de
-
-		insinto /etc/xdg/autostart
-		doins "${FILESDIR}/open-vm-tools.desktop" || die "failed to install .desktop"
-
-		elog "To be able to use the drag'n'drop feature of VMware for file"
-		elog "exchange, you need to do this:"
-		elog "	Add 'vmware-tools' to your default runlevel."
-		elog "	Add the users which should have access to this function"
-		elog "	to the group 'vmware'."
-	fi
-}
diff --git a/app-emulation/open-vm-tools/open-vm-tools-0.0.20110328.387002-r2.ebuild b/app-emulation/open-vm-tools/open-vm-tools-0.0.20110328.387002-r2.ebuild
deleted file mode 100644
index d3a915bcd164..000000000000
--- a/app-emulation/open-vm-tools/open-vm-tools-0.0.20110328.387002-r2.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/open-vm-tools-0.0.20110328.387002-r2.ebuild,v 1.2 2011/05/02 11:15:33 angelos Exp $
-
-EAPI="2"
-
-inherit eutils pam versionator
-
-MY_DATE="$(get_version_component_range 3)"
-MY_BUILD="$(get_version_component_range 4)"
-MY_PV="${MY_DATE:0:4}.${MY_DATE:4:2}.${MY_DATE:6:2}-${MY_BUILD}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Opensourced tools for VMware guests"
-HOMEPAGE="http://open-vm-tools.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X doc fuse icu +pic unity xinerama"
-
-RDEPEND="app-emulation/open-vm-tools-kmod
-	dev-libs/glib:2
-	dev-libs/libdnet
-	sys-apps/ethtool
-	sys-process/procps
-	virtual/pam
-	X? (
-		dev-cpp/gtkmm:2.4
-		x11-base/xorg-server
-		x11-drivers/xf86-input-vmmouse
-		x11-drivers/xf86-video-vmware
-		x11-libs/gtk+:2
-		x11-libs/libnotify
-		x11-libs/libX11
-		x11-libs/libXtst
-	)
-	fuse? ( sys-fs/fuse )
-	icu? ( dev-libs/icu )
-	unity? (
-		dev-libs/uriparser
-		media-libs/libpng
-		x11-libs/libXScrnSaver
-	)
-	xinerama? ( x11-libs/libXinerama )
-	"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	dev-util/pkgconfig
-	virtual/linux-sources
-	sys-apps/findutils
-	"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	use unity && ! use X && die 'The Unity USE flag requires "X" USE flag as well'
-	use unity && ! use xinerama && die 'The Unity USE flag requires xinerame USE="xinerama" as well'
-
-	enewgroup vmware
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/default-scripts.patch"
-	#epatch "${FILESDIR}/checkvm-pie-safety.patch"
-	#sed -i -e 's/proc-3.2.7/proc/g' configure || die "sed configure failed"
-	# Do not filter out Werror
-	# Upstream Bug  http://sourceforge.net/tracker/?func=detail&aid=2959749&group_id=204462&atid=989708
-	# sed -i -e 's/CFLAGS=.*Werror/#&/g' configure || die "sed comment out Werror failed"
-	sed -i -e 's:\(TEST_PLUGIN_INSTALLDIR=\).*:\1\$libdir/open-vm-tools/plugins/tests:g' configure || die "sed test_plugin_installdir failed"
-}
-
-src_configure() {
-	econf \
-		--with-procps \
-		--with-dnet \
-		--without-kernel-modules \
-		$(use_enable doc docs) \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_with X x) \
-		$(use_with X gtk2) \
-		$(use_with X gtkmm) \
-		$(use_with icu) \
-		$(use_with pic) \
-		$(use_enable unity) \
-		$(use_enable xinerama multimon)
-
-	# Bugs 260878, 326761
-	find ./ -name Makefile | xargs sed -i -e 's/-Werror//g'  || die "sed out Werror failed"
-}
-
-src_compile() {
-	emake || die "failed to compile"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "failed to install"
-
-	rm "${D}"/etc/pam.d/vmtoolsd
-	pamd_mimic_system vmtoolsd auth account
-
-	rm "${D}"/usr/$(get_libdir)/*.la
-	rm "${D}"/usr/$(get_libdir)/open-vm-tools/plugins/common/*.la
-
-	newinitd "${FILESDIR}/open-vm-tools.initd" vmware-tools || die "failed to newinitd"
-	newconfd "${FILESDIR}/open-vm.confd" vmware-tools || die "failed to newconfd"
-
-	if use X;
-	then
-		fperms 4755 "/usr/bin/vmware-user-suid-wrapper" || die
-
-		dobin "${S}"/scripts/common/vmware-xdg-detect-de
-
-		insinto /etc/xdg/autostart
-		doins "${FILESDIR}/open-vm-tools.desktop" || die "failed to install .desktop"
-
-		elog "To be able to use the drag'n'drop feature of VMware for file"
-		elog "exchange, you need to do this:"
-		elog "	Add 'vmware-tools' to your default runlevel."
-		elog "	Add the users which should have access to this function"
-		elog "	to the group 'vmware'."
-	fi
-}
diff --git a/app-emulation/open-vm-tools/open-vm-tools-0.0.20110627.437995.ebuild b/app-emulation/open-vm-tools/open-vm-tools-0.0.20110627.437995.ebuild
deleted file mode 100644
index 8c3d25d1db2c..000000000000
--- a/app-emulation/open-vm-tools/open-vm-tools-0.0.20110627.437995.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/open-vm-tools-0.0.20110627.437995.ebuild,v 1.1 2011/07/16 12:57:42 vadimk Exp $
-
-EAPI="2"
-
-inherit eutils pam versionator
-
-MY_DATE="$(get_version_component_range 3)"
-MY_BUILD="$(get_version_component_range 4)"
-MY_PV="${MY_DATE:0:4}.${MY_DATE:4:2}.${MY_DATE:6:2}-${MY_BUILD}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Opensourced tools for VMware guests"
-HOMEPAGE="http://open-vm-tools.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X doc fuse icu +pic unity xinerama"
-
-RDEPEND="app-emulation/open-vm-tools-kmod
-	dev-libs/glib:2
-	dev-libs/libdnet
-	sys-apps/ethtool
-	sys-process/procps
-	virtual/pam
-	X? (
-		dev-cpp/gtkmm:2.4
-		x11-base/xorg-server
-		x11-drivers/xf86-input-vmmouse
-		x11-drivers/xf86-video-vmware
-		x11-libs/gtk+:2
-		x11-libs/libnotify
-		x11-libs/libX11
-		x11-libs/libXtst
-	)
-	fuse? ( sys-fs/fuse )
-	icu? ( dev-libs/icu )
-	unity? (
-		dev-libs/uriparser
-		media-libs/libpng
-		x11-libs/libXScrnSaver
-	)
-	xinerama? ( x11-libs/libXinerama )
-	"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	dev-util/pkgconfig
-	virtual/linux-sources
-	sys-apps/findutils
-	"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	use unity && ! use X && die 'The Unity USE flag requires "X" USE flag as well'
-	use unity && ! use xinerama && die 'The Unity USE flag requires xinerame USE="xinerama" as well'
-
-	enewgroup vmware
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/default-scripts.patch"
-	#epatch "${FILESDIR}/checkvm-pie-safety.patch"
-	#sed -i -e 's/proc-3.2.7/proc/g' configure || die "sed configure failed"
-	# Do not filter out Werror
-	# Upstream Bug  http://sourceforge.net/tracker/?func=detail&aid=2959749&group_id=204462&atid=989708
-	# sed -i -e 's/CFLAGS=.*Werror/#&/g' configure || die "sed comment out Werror failed"
-	sed -i -e 's:\(TEST_PLUGIN_INSTALLDIR=\).*:\1\$libdir/open-vm-tools/plugins/tests:g' configure || die "sed test_plugin_installdir failed"
-}
-
-src_configure() {
-	econf \
-		--with-procps \
-		--with-dnet \
-		--without-kernel-modules \
-		$(use_enable doc docs) \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_with X x) \
-		$(use_with X gtk2) \
-		$(use_with X gtkmm) \
-		$(use_with icu) \
-		$(use_with pic) \
-		$(use_enable unity) \
-		$(use_enable xinerama multimon)
-
-	# Bugs 260878, 326761
-	find ./ -name Makefile | xargs sed -i -e 's/-Werror//g'  || die "sed out Werror failed"
-}
-
-src_compile() {
-	emake || die "failed to compile"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "failed to install"
-
-	rm "${D}"/etc/pam.d/vmtoolsd
-	pamd_mimic_system vmtoolsd auth account
-
-	rm "${D}"/usr/$(get_libdir)/*.la
-	rm "${D}"/usr/$(get_libdir)/open-vm-tools/plugins/common/*.la
-
-	newinitd "${FILESDIR}/open-vm-tools.initd" vmware-tools || die "failed to newinitd"
-	newconfd "${FILESDIR}/open-vm.confd" vmware-tools || die "failed to newconfd"
-
-	if use X;
-	then
-		fperms 4755 "/usr/bin/vmware-user-suid-wrapper" || die
-
-		dobin "${S}"/scripts/common/vmware-xdg-detect-de
-
-		insinto /etc/xdg/autostart
-		doins "${FILESDIR}/open-vm-tools.desktop" || die "failed to install .desktop"
-
-		elog "To be able to use the drag'n'drop feature of VMware for file"
-		elog "exchange, please add the users to the 'vmware' group."
-	fi
-	elog "Add 'vmware-tools' service to the default runlevel."
-}
diff --git a/app-emulation/open-vm-tools/open-vm-tools-0.0.20111026.514583.ebuild b/app-emulation/open-vm-tools/open-vm-tools-0.0.20111026.514583.ebuild
index afc114915bd7..0dc78366759e 100644
--- a/app-emulation/open-vm-tools/open-vm-tools-0.0.20111026.514583.ebuild
+++ b/app-emulation/open-vm-tools/open-vm-tools-0.0.20111026.514583.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/open-vm-tools-0.0.20111026.514583.ebuild,v 1.1 2011/11/11 14:20:19 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/open-vm-tools-0.0.20111026.514583.ebuild,v 1.2 2011/12/03 18:34:42 vadimk Exp $
 
 EAPI="2"
 
@@ -51,16 +51,10 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
-	#use unity && ! use X && die 'The Unity USE flag requires "X" USE flag as well'
-	#use unity && ! use xinerama && die 'The Unity USE flag requires xinerame USE="xinerama" as well'
-
 	enewgroup vmware
 }
 
 src_prepare() {
-	#epatch "${FILESDIR}/default-scripts.patch"
-	#epatch "${FILESDIR}/checkvm-pie-safety.patch"
-	#sed -i -e 's/proc-3.2.7/proc/g' configure || die "sed configure failed"
 	# Do not filter out Werror
 	# Upstream Bug  http://sourceforge.net/tracker/?func=detail&aid=2959749&group_id=204462&atid=989708
 	# sed -i -e 's/CFLAGS=.*Werror/#&/g' configure || die "sed comment out Werror failed"
@@ -99,7 +93,7 @@ src_install() {
 	rm "${D}"/usr/$(get_libdir)/open-vm-tools/plugins/common/*.la
 
 	newinitd "${FILESDIR}/open-vm-tools.initd" vmware-tools || die "failed to newinitd"
-	newconfd "${FILESDIR}/open-vm.confd" vmware-tools || die "failed to newconfd"
+	newconfd "${FILESDIR}/open-vm-tools.confd" vmware-tools || die "failed to newconfd"
 
 	exeinto /etc/vmware-tools/scripts/vmware/
 	doexe "${FILESDIR}"/network
diff --git a/app-emulation/open-vm-tools/open-vm-tools-0.0.20110923.491607.ebuild b/app-emulation/open-vm-tools/open-vm-tools-2011.11.20.535097.ebuild
similarity index 69%
rename from app-emulation/open-vm-tools/open-vm-tools-0.0.20110923.491607.ebuild
rename to app-emulation/open-vm-tools/open-vm-tools-2011.11.20.535097.ebuild
index cd25980394db..71f58d6e6474 100644
--- a/app-emulation/open-vm-tools/open-vm-tools-0.0.20110923.491607.ebuild
+++ b/app-emulation/open-vm-tools/open-vm-tools-2011.11.20.535097.ebuild
@@ -1,14 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/open-vm-tools-0.0.20110923.491607.ebuild,v 1.2 2011/11/11 14:20:19 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/open-vm-tools-2011.11.20.535097.ebuild,v 1.1 2011/12/03 18:34:42 vadimk Exp $
 
-EAPI="2"
+EAPI="4"
 
 inherit eutils pam versionator
 
-MY_DATE="$(get_version_component_range 3)"
-MY_BUILD="$(get_version_component_range 4)"
-MY_PV="${MY_DATE:0:4}.${MY_DATE:4:2}.${MY_DATE:6:2}-${MY_BUILD}"
+MY_PV="$(replace_version_separator 3 '-')"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="Opensourced tools for VMware guests"
@@ -51,16 +49,10 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
-	#use unity && ! use X && die 'The Unity USE flag requires "X" USE flag as well'
-	#use unity && ! use xinerama && die 'The Unity USE flag requires xinerame USE="xinerama" as well'
-
 	enewgroup vmware
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/default-scripts.patch"
-	#epatch "${FILESDIR}/checkvm-pie-safety.patch"
-	#sed -i -e 's/proc-3.2.7/proc/g' configure || die "sed configure failed"
 	# Do not filter out Werror
 	# Upstream Bug  http://sourceforge.net/tracker/?func=detail&aid=2959749&group_id=204462&atid=989708
 	# sed -i -e 's/CFLAGS=.*Werror/#&/g' configure || die "sed comment out Werror failed"
@@ -85,12 +77,8 @@ src_configure() {
 	find ./ -name Makefile | xargs sed -i -e 's/-Werror//g'  || die "sed out Werror failed"
 }
 
-src_compile() {
-	emake || die "failed to compile"
-}
-
 src_install() {
-	emake DESTDIR="${D}" install || die "failed to install"
+	default
 
 	rm "${D}"/etc/pam.d/vmtoolsd
 	pamd_mimic_system vmtoolsd auth account
@@ -98,17 +86,20 @@ src_install() {
 	rm "${D}"/usr/$(get_libdir)/*.la
 	rm "${D}"/usr/$(get_libdir)/open-vm-tools/plugins/common/*.la
 
-	newinitd "${FILESDIR}/open-vm-tools.initd" vmware-tools || die "failed to newinitd"
-	newconfd "${FILESDIR}/open-vm.confd" vmware-tools || die "failed to newconfd"
+	newinitd "${FILESDIR}/open-vm-tools.initd" vmware-tools
+	newconfd "${FILESDIR}/open-vm-tools.confd" vmware-tools
+
+	exeinto /etc/vmware-tools/scripts/vmware/
+	doexe "${FILESDIR}"/network
 
 	if use X;
 	then
-		fperms 4755 "/usr/bin/vmware-user-suid-wrapper" || die
+		fperms 4755 "/usr/bin/vmware-user-suid-wrapper"
 
 		dobin "${S}"/scripts/common/vmware-xdg-detect-de
 
 		insinto /etc/xdg/autostart
-		doins "${FILESDIR}/open-vm-tools.desktop" || die "failed to install .desktop"
+		doins "${FILESDIR}/open-vm-tools.desktop"
 
 		elog "To be able to use the drag'n'drop feature of VMware for file"
 		elog "exchange, please add the users to the 'vmware' group."
diff --git a/app-emulation/open-vm-tools/open-vm-tools-0.0.20110821.471295.ebuild b/app-emulation/open-vm-tools/open-vm-tools-8.8.1.528969.ebuild
similarity index 75%
rename from app-emulation/open-vm-tools/open-vm-tools-0.0.20110821.471295.ebuild
rename to app-emulation/open-vm-tools/open-vm-tools-8.8.1.528969.ebuild
index 7fda555164ff..b152bf9be400 100644
--- a/app-emulation/open-vm-tools/open-vm-tools-0.0.20110821.471295.ebuild
+++ b/app-emulation/open-vm-tools/open-vm-tools-8.8.1.528969.ebuild
@@ -1,14 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/open-vm-tools-0.0.20110821.471295.ebuild,v 1.1 2011/09/04 17:43:32 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/open-vm-tools-8.8.1.528969.ebuild,v 1.1 2011/12/03 18:34:42 vadimk Exp $
 
-EAPI="2"
+EAPI="4"
 
 inherit eutils pam versionator
 
-MY_DATE="$(get_version_component_range 3)"
-MY_BUILD="$(get_version_component_range 4)"
-MY_PV="${MY_DATE:0:4}.${MY_DATE:4:2}.${MY_DATE:6:2}-${MY_BUILD}"
+MY_PV="$(replace_version_separator 3 '-')"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="Opensourced tools for VMware guests"
@@ -40,7 +38,7 @@ RDEPEND="app-emulation/open-vm-tools-kmod
 	icu? ( dev-libs/icu )
 	unity? (
 		dev-libs/uriparser
-		media-libs/libpng
+		media-libs/libpng:1.2
 		x11-libs/libXScrnSaver
 	)
 	xinerama? ( x11-libs/libXinerama )
@@ -63,9 +61,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/default-scripts.patch"
-	#epatch "${FILESDIR}/checkvm-pie-safety.patch"
-	#sed -i -e 's/proc-3.2.7/proc/g' configure || die "sed configure failed"
 	# Do not filter out Werror
 	# Upstream Bug  http://sourceforge.net/tracker/?func=detail&aid=2959749&group_id=204462&atid=989708
 	# sed -i -e 's/CFLAGS=.*Werror/#&/g' configure || die "sed comment out Werror failed"
@@ -91,12 +86,8 @@ src_configure() {
 	find ./ -name Makefile | xargs sed -i -e 's/-Werror//g'  || die "sed out Werror failed"
 }
 
-src_compile() {
-	emake || die "failed to compile"
-}
-
 src_install() {
-	emake DESTDIR="${D}" install || die "failed to install"
+	default
 
 	rm "${D}"/etc/pam.d/vmtoolsd
 	pamd_mimic_system vmtoolsd auth account
@@ -104,17 +95,20 @@ src_install() {
 	rm "${D}"/usr/$(get_libdir)/*.la
 	rm "${D}"/usr/$(get_libdir)/open-vm-tools/plugins/common/*.la
 
-	newinitd "${FILESDIR}/open-vm-tools.initd" vmware-tools || die "failed to newinitd"
-	newconfd "${FILESDIR}/open-vm.confd" vmware-tools || die "failed to newconfd"
+	newinitd "${FILESDIR}/open-vm-tools.initd" vmware-tools
+	newconfd "${FILESDIR}/open-vm-tools.confd" vmware-tools
+
+	exeinto /etc/vmware-tools/scripts/vmware/
+	doexe "${FILESDIR}"/network
 
 	if use X;
 	then
-		fperms 4755 "/usr/bin/vmware-user-suid-wrapper" || die
+		fperms 4755 "/usr/bin/vmware-user-suid-wrapper"
 
 		dobin "${S}"/scripts/common/vmware-xdg-detect-de
 
 		insinto /etc/xdg/autostart
-		doins "${FILESDIR}/open-vm-tools.desktop" || die "failed to install .desktop"
+		doins "${FILESDIR}/open-vm-tools.desktop"
 
 		elog "To be able to use the drag'n'drop feature of VMware for file"
 		elog "exchange, please add the users to the 'vmware' group."