version bump. ebuild split.

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

8 files changed, 284 insertions, 280 deletions

diff --git a/app-emulation/open-vm-tools/ChangeLog b/app-emulation/open-vm-tools/ChangeLog
index 1b777fe9059a..ad94d754203e 100644
--- a/app-emulation/open-vm-tools/ChangeLog
+++ b/app-emulation/open-vm-tools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/open-vm-tools
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/ChangeLog,v 1.25 2009/08/27 19:03:47 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/ChangeLog,v 1.26 2009/10/29 14:14:51 vadimk Exp $
+
+*open-vm-tools-0.0.20091015.201664 (29 Oct 2009)
+
+  29 Oct 2009; Vadim Kuznetsov vadimk@gentoo.org
+  +files/default-scripts1.patch, -open-vm-tools-0.0.20090522.167859.ebuild,
+  -open-vm-tools-0.0.20090618.172495.ebuild,
+  +open-vm-tools-0.0.20091015.201664.ebuild, -files/wiper-warning-fix.patch:
+  version bump. ebuild split. see open-vm-tools-kmod.
 
 *open-vm-tools-0.0.20090824.187411 (27 Aug 2009)
 
diff --git a/app-emulation/open-vm-tools/Manifest b/app-emulation/open-vm-tools/Manifest
index b6dc4da28052..db2869f1c178 100644
--- a/app-emulation/open-vm-tools/Manifest
+++ b/app-emulation/open-vm-tools/Manifest
@@ -1,19 +1,18 @@
 AUX default-scripts.patch 3525 RMD160 7c3dfd342be245531493a9cf7a8be2be4c67dc4b SHA1 56ba6ca91262f73732a7d806a9c812aea683c2d2 SHA256 99ad1a202335736c50bbb92432371e522934d1a3347e992158b881cf9f810da6
+AUX default-scripts1.patch 4787 RMD160 3186d91d1f6f840bb7fb2e757b802ba05675894b SHA1 5843708e342b8c57f600a6cbd7d0b12f7f14a35b SHA256 3190fe24e2b03e99fa0b7b9f93d413c7b886138c1e964ca7917a45099f29609e
 AUX open-vm-tools.desktop 127 RMD160 375ec8cd688a5fe0609076798e515c048be81c15 SHA1 6b6adcb93fbcb11e1638d6a80b3828256f880dcf SHA256 7cb78f0d94f1849aa964bc8e9d9a6c49955ba1a9b937174b1c266a9cc8eb4bc3
 AUX open-vm-tools.initd 1857 RMD160 00aa23a56a6d05fa40c16f46d44c81920f9a2198 SHA1 f16c0b75ffafbf77e0af0e14b07572d754164bb2 SHA256 4803f662448599d7d1f6b69c80e190706d7c8a9a7004a96b7ed83d6a94d56740
 AUX open-vm.confd 88 RMD160 5e398024e72a871f258d73e09f02e37a815443b0 SHA1 56133c21c6d29243ac81a9c1ada61616778f3ce2 SHA256 180a2b6d9d18af319b79b2ca6ebf1020b63e5ebf2f601a63c1a9f9f7d2e0b95c
 AUX open-vm.initd 1875 RMD160 9d2cc36fd93e70ae20eecd49b10c4da0e09aad69 SHA1 1702f267d32ca138e0e99d9ed86b4abc32cc3997 SHA256 1799b78836441b389de0b3d92aad80fcf020fe8b57da4f6d6999f86ee87f51bf
 AUX tools.conf 21 RMD160 88b5b8c8e088333e9c00b2e1c3f3572553342e7b SHA1 42a670b887751dbe9317624dd11068390d1780b0 SHA256 05dcb62e54991ca5546066e4d04b50be98fb0cc229168d4d73df8cf8a94c068c
-AUX wiper-warning-fix.patch 418 RMD160 d3595ca361e1b330e22ec10b33b19813df94ff82 SHA1 ff644d5fa4e5d4e5017ce843cd09ab282e4dcd9a SHA256 3678c0ab683336e645a0c2e1c2167ad6fd094784722b63c6e66c435d685ed712
 AUX xautostart.conf 59 RMD160 ca1ea3f1b82caa6e97d94835d88a39a6f153ff7a SHA1 92ba86e426fdaa3de1a8aad56db2d2ac358949a1 SHA256 13398e0ffcd7005bc8c92f3cd62865d2601e52fc980a4702fa252bef5c1efcc7
-DIST open-vm-tools-2009.05.22-167859.tar.gz 3417843 RMD160 c8403e0fe1ff32ec356ce997b7e621ee7fe87d22 SHA1 a38e16e8cc6bb3b9d9ce88244aef8332a233b7e4 SHA256 99f3726f86e53abac4efcf70a871e2003d2f245fd83b663ae8ad756322c48a2b
 DIST open-vm-tools-2009.06.18-172495.tar.gz 3424675 RMD160 7fceacdc3e2e1857a85fd348625ed906383bb52f SHA1 3f2273e2366dc8bca60a3f84e0933580aa4c066d SHA256 27d529553c9a62172876a9a88289102d77bc6307b6fc10b7a2bc17cbbb54251e
 DIST open-vm-tools-2009.07.22-179896.tar.gz 3455624 RMD160 5d6b7bc27cf93061d6fb250db8271c8891699721 SHA1 66aae7773445dc3589420278b0b55bc8a107cb5b SHA256 50eff9fc275b2ceb73cac64cd671ddbd0602337c7190cfda85103c290805a556
 DIST open-vm-tools-2009.08.24-187411.tar.gz 3516336 RMD160 7fde99197565895617ce03677a5803f4b3835462 SHA1 8749f71ea02767e2ea04ac0f66762b5cdc1398dc SHA256 703544111a7c01adfc7c4d81f0d9c783a5d56edff40c0eb5f32410390357f6f5
-EBUILD open-vm-tools-0.0.20090522.167859.ebuild 3150 RMD160 abdd6c1c863513819898b7602b2f9244aea5a988 SHA1 4533c413639df1b0c6df5e0f6317b6bd36383112 SHA256 6dea3ac18170d4850ad6800635ec9e800691d9737855b02416d4933c6c2cfd00
+DIST open-vm-tools-2009.10.15-201664.tar.gz 3507956 RMD160 14a26a7423c97398afe007902ffd50b90328dd38 SHA1 f678d96dad4107c811f312a8bb1da97127b96ce3 SHA256 2a70d2ed605b898192def775958b596c7c4f26dc02de30165a3325af18e16ff5
 EBUILD open-vm-tools-0.0.20090618.172495-r2.ebuild 3466 RMD160 b33bc77efed16056d6b38ef02eaf155f93eb8b7d SHA1 7ef10f905fbabee15fbac540cccaf7bf6065b271 SHA256 1ad2cc59a03d9925b0049f72acbd3ed8436cdd911ab46c15b3a7c6839cec09a7
-EBUILD open-vm-tools-0.0.20090618.172495.ebuild 3104 RMD160 8e0d45055be611a25d729d3cc2f90c722e42398d SHA1 b15b674dc2b719062dc3b83fcfef5506c4b31f77 SHA256 f415442be615f0451ee77a4064c365c0ad0bd50e43d91f562f7db4d825c09af1
 EBUILD open-vm-tools-0.0.20090722.179896.ebuild 3465 RMD160 19a673371becafdbcf2852114a877194eb8421fc SHA1 9b4969677bdc5c131efa9d156ad3550a9322265f SHA256 dcce2a06acf2da73513a42b40d1e08283e303995e73d6e859120d88c767a787d
 EBUILD open-vm-tools-0.0.20090824.187411.ebuild 3177 RMD160 c8be53e80ede486579201fe0bc8b54cc73dc67b0 SHA1 239de3201de177505bd580e1ea5f55e3b5ab6830 SHA256 4769a6f8b250aa2e6029949a4d7454790bbd991fefd060f46e14d777adce3496
-MISC ChangeLog 5356 RMD160 0c6e3dca2ee73d1b47a99c9ebc254fd21229200d SHA1 8b79b1d9a0dc5673e62458cbc40aea762b98cfe8 SHA256 620a9809637429cd9b67c0f4fec5347e14661c081fe93208e8f8654126971453
-MISC metadata.xml 723 RMD160 b195c993ccf93602cdc1496cbc8fab6b13f3a7c0 SHA1 e2fc93931b25f3175efa0ee0389bc835666da5b1 SHA256 29269008d2ca36d3ecb8e3b3a6782f9fe9af983cab0a914fbc6218e9b21aebf4
+EBUILD open-vm-tools-0.0.20091015.201664.ebuild 2685 RMD160 8d6d3457fec1e7e9dfe889f14ae0e933680105e6 SHA1 1b6ea0b53a3aa8f89b7f98c1a738e79e37dc61aa SHA256 6a92580a968867cd2d6ecf1a66551c91058be278392b3ad5cce155f6f3b00849
+MISC ChangeLog 5708 RMD160 0a13184a9e4f8b3c7b0ffd4ae89663322d7c85b4 SHA1 3cd7959f8c5bcfc747699ca590b99c5312a00c3f SHA256 6f106319d483dc31f956e02eae7d242351f34d866f84a2f22e4a1fec682fca51
+MISC metadata.xml 791 RMD160 fdc392df0eb6c2b1ee6bb9cf2b96b87c23c5883d SHA1 1dbba034c610754769c810a38a0adf4c3aded1f6 SHA256 85ee302699fd64bd96f311935e21847e0d5d2c11d0654c1a9eac7ded2a1bf1b2
diff --git a/app-emulation/open-vm-tools/files/default-scripts1.patch b/app-emulation/open-vm-tools/files/default-scripts1.patch
new file mode 100644
index 000000000000..d89ff907805f
--- /dev/null
+++ b/app-emulation/open-vm-tools/files/default-scripts1.patch
@@ -0,0 +1,163 @@
+diff -ur scripts.orig/linux/resume-vm-default scripts/linux/resume-vm-default
+--- scripts.orig/linux/resume-vm-default	2009-10-26 14:08:44.000000000 -0400
++++ scripts/linux/resume-vm-default	2009-10-26 14:07:29.000000000 -0400
+@@ -25,37 +25,6 @@
+ echo `date` ": Executing '$0'"
+ echo
+ 
+-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() {
+     ifconfig_path=`which ifconfig 2>/dev/null`
+     if [ $? ]; then
+@@ -73,7 +42,7 @@
+ rescue_NIC() {
+    niclist="/var/run/vmware-active-nics"
+ 
+-   ifup_path=`which ifup 2>/dev/null`;
++   ifup_path="/etc/init.d/net.";
+    if [ $? -ne 0 ]; then
+       return 1;
+    fi
+@@ -90,7 +59,7 @@
+          else
+             echo `date` "[rescue_nic] activating $nic ..."
+ 
+-            $ifup_path $nic
++            $ifup_path$nic restart
+          fi
+       done < $niclist
+ 
+@@ -120,7 +89,7 @@
+       # NetworkManager 0.6
+       $dbusSend --system --dest=org.freedesktop.NetworkManager          \
+          /org/freedesktop/NetworkManager                                \
+-         org.freedesktop.NetworkManager.wake
++         org.freedesktop.NetworkManager.Sleep boolean:false
+       # NetworkManager 0.7.0
+       $dbusSend --system --dest=org.freedesktop.NetworkManager          \
+          /org/freedesktop/NetworkManager                                \
+@@ -139,15 +108,8 @@
+ 
+ wakeNetworkManager
+ 
+-network=`find_networking_script`
+-if [ "$network" != "error" ]; then
+-   "$network" restart
+-   # Continue even if the networking init script wasn't successful.
+-   status=0
+-else
+-   echo "networking script not found"
+-   status=1
+-fi
++# Continue even if the networking init script wasn't successful.
++status=0
+ 
+ if [ $status -eq 0 ]; then
+     rescue_NIC
+diff -ur scripts.orig/linux/suspend-vm-default scripts/linux/suspend-vm-default
+--- scripts.orig/linux/suspend-vm-default	2009-10-26 14:08:44.000000000 -0400
++++ scripts/linux/suspend-vm-default	2009-10-25 16:27:09.000000000 -0400
+@@ -25,37 +25,6 @@
+ echo `date` ": Executing '$0'"
+ echo
+ 
+-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() {
+     ifconfig_path=`which ifconfig 2>/dev/null`
+     if [ $? ]; then
+@@ -82,11 +51,6 @@
+    # `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
+@@ -107,16 +71,13 @@
+ 
+ save_active_NIC_list
+ 
+-network=`find_networking_script`
+-if [ "$network" != "error" ]; then
+-   "$network" stop
+-   # If the network is down, this may fail but that's not a good reason
+-   # to prevent the suspend.
+-   status=0
+-else
+-   echo "networking script not found"
+-   status=1
+-fi
++for network in `ls /etc/init.d/net.*`; 
++do
++  "$network" stop
++done
++# If the network is down, this may fail but that's not a good reason
++# to prevent the suspend.
++status=0
+ 
+ tranquilizeNetworkManager
+ 
diff --git a/app-emulation/open-vm-tools/files/wiper-warning-fix.patch b/app-emulation/open-vm-tools/files/wiper-warning-fix.patch
deleted file mode 100644
index 0c36733b53be..000000000000
--- a/app-emulation/open-vm-tools/files/wiper-warning-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/lib/wiper/wiperPosix.c
-+++ b/lib/wiper/wiperPosix.c
-@@ -998,8 +998,9 @@
-                   break;
-                }
-             }
--         } else {
--            fgets(deviceName, sizeof deviceName, fp);
-+         } else if (fgets(deviceName, sizeof deviceName, fp) != deviceName) {
-+            Warning("%s: Error reading device name from /proc/devices.", __func__);
-+            break;
-          }
-       }
- 
diff --git a/app-emulation/open-vm-tools/metadata.xml b/app-emulation/open-vm-tools/metadata.xml
index 54f82e796658..4a729406e06a 100644
--- a/app-emulation/open-vm-tools/metadata.xml
+++ b/app-emulation/open-vm-tools/metadata.xml
@@ -15,6 +15,7 @@
 		<flag name='doc'>Generate API documantation</flag>
 		<flag name='fuse'>Build vmblock-fuse in favor of FUSE based blocking
 		mechanism for DnD</flag>
+		<flag name="pic">Force shared libraries to be build as PIC</flag>
 		<flag name='unity'>Enable host unity support</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-emulation/open-vm-tools/open-vm-tools-0.0.20090522.167859.ebuild b/app-emulation/open-vm-tools/open-vm-tools-0.0.20090522.167859.ebuild
deleted file mode 100644
index 1cc7b84315e1..000000000000
--- a/app-emulation/open-vm-tools/open-vm-tools-0.0.20090522.167859.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2009 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.20090522.167859.ebuild,v 1.3 2009/06/30 12:27:06 vadimk Exp $
-
-EAPI="2"
-
-inherit eutils linux-mod 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}"
-
-S="${WORKDIR}/${MY_P}"
-
-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="~x86 ~amd64"
-IUSE="X xinerama icu unity"
-DEPEND="
-		virtual/linux-sources
-		sys-apps/ethtool
-		X? (
-			x11-libs/libX11
-			x11-libs/gtk+
-			dev-cpp/gtkmm
-		)
-		unity? (
-			x11-libs/libXScrnSaver
-			dev-libs/uriparser
-		)
-		xinerama? (
-			x11-libs/libXinerama
-		)
-		!app-emulation/vmware-workstation-tools
-		!app-emulation/vmware-server-tools
-		!app-emulation/vmware-esx-tools
-		sys-process/procps
-		dev-libs/libdnet
-		>=dev-libs/glib-2
-		icu? ( dev-libs/icu )
-		"
-
-RDEPEND="${DEPEND/virtual\/linux\-sources/}
-		 virtual/pam
-		 X? (
-			x11-base/xorg-server
-			x11-drivers/xf86-video-vmware
-			x11-drivers/xf86-input-vmmouse
-		 )
-		 unity? (
-			x11-libs/libXScrnSaver
-			dev-libs/uriparser
-		 )
-	"
-
-VMWARE_MOD_DIR="modules/linux"
-VMWARE_MODULE_LIST="pvscsi vmblock vmci vmhgfs vmsync vmmemctl vmxnet vmxnet3 vsock"
-
-pkg_setup() {
-	use unity && ! use xinerama && \
-	  die 'The Unity USE flag requires USE="xinerama" as well'
-
-	linux-mod_pkg_setup
-	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" -o "${mod}" == "vmxnet3" ];
-		then
-			MODTARGET="net"
-		else
-			MODTARGET="openvmtools"
-		fi
-		MODULE_NAMES="${MODULE_NAMES} ${mod}(${MODTARGET}:${S}/${VMWARE_MOD_DIR}/${mod})"
-	done
-
-	enewgroup vmware
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/default-scripts.patch"
-	epatch "${FILESDIR}/wiper-warning-fix.patch"
-	sed -e 's:VMTOOLSD_PLUGIN_ROOT=\\"\$(pkglibdir)\\":VMTOOLSD_PLUGIN_ROOT=\\"\$(pkglibdir)/plugins\\":g' -i services/vmtoolsd/Makefile.in
-}
-
-src_configure() {
-	econf \
-		--without-kernel-modules \
-		$(use_with icu) \
-		$(use_with X x) \
-		$(use_with X gtkmm) \
-		$(use_enable unity) \
-		$(use_enable xinerama multimon)
-}
-
-src_compile() {
-	linux-mod_src_compile
-
-	emake || die
-}
-
-src_install() {
-	linux-mod_src_install
-
-	emake DESTDIR="${D}" install || die "Failed to install"
-
-	rm "${D}"/etc/pam.d/vmtoolsd
-	pamd_mimic_system vmtoolsd auth account
-
-	newinitd "${FILESDIR}/open-vm-tools.initd" vmware-tools
-	newconfd "${FILESDIR}/open-vm.confd" vmware-tools
-
-	if use X;
-	then
-		insinto /etc/xdg/autostart
-		doins "${FILESDIR}/open-vm-tools.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.20090618.172495.ebuild b/app-emulation/open-vm-tools/open-vm-tools-0.0.20090618.172495.ebuild
deleted file mode 100644
index fbe61a77663c..000000000000
--- a/app-emulation/open-vm-tools/open-vm-tools-0.0.20090618.172495.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2009 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.20090618.172495.ebuild,v 1.1 2009/06/30 12:27:06 vadimk Exp $
-
-EAPI="2"
-
-inherit eutils linux-mod 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}"
-
-S="${WORKDIR}/${MY_P}"
-
-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="~x86 ~amd64"
-IUSE="X xinerama icu unity"
-DEPEND="
-		!app-emulation/vmware-workstation-tools
-		!app-emulation/vmware-server-tools
-		!app-emulation/vmware-esx-tools
-		virtual/linux-sources
-		sys-apps/ethtool
-		X? (
-			x11-libs/libX11
-			x11-libs/gtk+
-			dev-cpp/gtkmm
-		)
-		unity? (
-			x11-libs/libXScrnSaver
-			dev-libs/uriparser
-		)
-		xinerama? (
-			x11-libs/libXinerama
-		)
-		sys-process/procps
-		dev-libs/libdnet
-		>=dev-libs/glib-2
-		icu? ( dev-libs/icu )
-		"
-
-RDEPEND="${DEPEND/virtual\/linux\-sources/}
-		 virtual/pam
-		 X? (
-			x11-base/xorg-server
-			x11-drivers/xf86-video-vmware
-			x11-drivers/xf86-input-vmmouse
-		 )
-		 unity? (
-			x11-libs/libXScrnSaver
-			dev-libs/uriparser
-		 )
-	"
-
-VMWARE_MOD_DIR="modules/linux"
-VMWARE_MODULE_LIST="pvscsi vmblock vmci vmhgfs vmsync vmmemctl vmxnet vmxnet3 vsock"
-
-pkg_setup() {
-	use unity && ! use xinerama && \
-	  die 'The Unity USE flag requires USE="xinerama" as well'
-
-	linux-mod_pkg_setup
-	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" -o "${mod}" == "vmxnet3" ];
-		then
-			MODTARGET="net"
-		else
-			MODTARGET="openvmtools"
-		fi
-		MODULE_NAMES="${MODULE_NAMES} ${mod}(${MODTARGET}:${S}/${VMWARE_MOD_DIR}/${mod})"
-	done
-
-	enewgroup vmware
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/default-scripts.patch"
-	sed -e 's:VMTOOLSD_PLUGIN_ROOT=\\"\$(pkglibdir)\\":VMTOOLSD_PLUGIN_ROOT=\\"\$(pkglibdir)/plugins\\":g' -i services/vmtoolsd/Makefile.in
-}
-
-src_configure() {
-	econf \
-		--without-kernel-modules \
-		$(use_with icu) \
-		$(use_with X x) \
-		$(use_with X gtkmm) \
-		$(use_enable unity) \
-		$(use_enable xinerama multimon)
-}
-
-src_compile() {
-	linux-mod_src_compile
-
-	emake || die
-}
-
-src_install() {
-	linux-mod_src_install
-
-	emake DESTDIR="${D}" install || die "Failed to install"
-
-	rm "${D}"/etc/pam.d/vmtoolsd
-	pamd_mimic_system vmtoolsd auth account
-
-	newinitd "${FILESDIR}/open-vm-tools.initd" vmware-tools
-	newconfd "${FILESDIR}/open-vm.confd" vmware-tools
-
-	if use X;
-	then
-		insinto /etc/xdg/autostart
-		doins "${FILESDIR}/open-vm-tools.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.20091015.201664.ebuild b/app-emulation/open-vm-tools/open-vm-tools-0.0.20091015.201664.ebuild
new file mode 100644
index 000000000000..cc0501252cc2
--- /dev/null
+++ b/app-emulation/open-vm-tools/open-vm-tools-0.0.20091015.201664.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2009 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.20091015.201664.ebuild,v 1.1 2009/10/29 14:14:51 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
+		x11-base/xorg-server
+		x11-drivers/xf86-input-vmmouse
+		x11-drivers/xf86-video-vmware
+		x11-libs/gtk+
+		x11-libs/libnotify
+		x11-libs/libX11
+	)
+	fuse? ( sys-fs/fuse )
+	icu? ( dev-libs/icu )
+	unity? (
+		dev-libs/uriparser
+		x11-libs/libXScrnSaver
+	)
+	xinerama? ( x11-libs/libXinerama )
+	"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	virtual/linux-sources
+	doc? ( app-doc/doxygen )
+	"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	use unity && ! use xinerama && die 'The Unity USE flag requires USE="xinerama" as well'
+
+	enewgroup vmware
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/default-scripts1.patch"
+	#epatch "${FILESDIR}/checkvm-pie-safety.patch"
+	sed -i -e 's/proc-3.2.7/proc/g' configure || die "sed configure failed"
+	sed -i -e 's/CFLAGS=.*Werror/#&/g' configure || die "sed comment out Werror failed"
+}
+
+src_configure() {
+	econf \
+		--with-procps \
+		--with-dnet \
+		--without-kernel-modules \
+		$(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)
+}
+
+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
+
+	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
+		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
+}