Update open-vm-tools to the latest version in the tree, clean out the cruft.

svn path=/trunk/; revision=331

7 files changed, 15 insertions, 546 deletions

diff --git a/ChangeLog b/ChangeLog
index 6d84b32..49d8145 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,16 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $ Id: $
 
+  31 Dec 2008; Mike Auty <ikelos@gentoo.org>
+  -app-emulation/open-vm-tools/open-vm-tools-0.0.20080414.87182.ebuild,
+  -app-emulation/open-vm-tools/open-vm-tools-0.0.20080515.93241.ebuild,
+  -app-emulation/open-vm-tools/open-vm-tools-0.0.20080701.102166.ebuild,
+  -app-emulation/open-vm-tools/open-vm-tools-0.0.20080808.109361.ebuild,
+  -app-emulation/open-vm-tools/open-vm-tools-0.0.20081010.123053.ebuild,
+  +app-emulation/open-vm-tools/open-vm-tools-0.0.20081223.137496.ebuild:
+  Update open-vm-tools to the latest version in the tree, clean out the
+  cruft.
+
   20 Dec 2008; Mike Auty <ikelos@gentoo.org>
   app-emulation/vmware-server/files/vmware-server-2.rc:
   Add hald requirement to vmware-server-2 initscript.
diff --git a/app-emulation/open-vm-tools/Manifest b/app-emulation/open-vm-tools/Manifest
index 65ccbf5..0fbf889 100644
--- a/app-emulation/open-vm-tools/Manifest
+++ b/app-emulation/open-vm-tools/Manifest
@@ -6,13 +6,5 @@ AUX open-vm.confd 88 RMD160 5e398024e72a871f258d73e09f02e37a815443b0 SHA1 56133c
 AUX open-vm.initd 1875 RMD160 9d2cc36fd93e70ae20eecd49b10c4da0e09aad69 SHA1 1702f267d32ca138e0e99d9ed86b4abc32cc3997 SHA256 1799b78836441b389de0b3d92aad80fcf020fe8b57da4f6d6999f86ee87f51bf
 AUX tools.conf 21 RMD160 88b5b8c8e088333e9c00b2e1c3f3572553342e7b SHA1 42a670b887751dbe9317624dd11068390d1780b0 SHA256 05dcb62e54991ca5546066e4d04b50be98fb0cc229168d4d73df8cf8a94c068c
 AUX xautostart.conf 59 RMD160 ca1ea3f1b82caa6e97d94835d88a39a6f153ff7a SHA1 92ba86e426fdaa3de1a8aad56db2d2ac358949a1 SHA256 13398e0ffcd7005bc8c92f3cd62865d2601e52fc980a4702fa252bef5c1efcc7
-DIST open-vm-tools-2008.04.14-87182.tar.gz 2430703 RMD160 2003b86f881b8a9b51c61e833b0b7d4aca70e083 SHA1 0394f73975a34699b92ce90822803fdb365abc6f SHA256 34c19a50650e70fbaa3c1d01803cc96fd86dde4d5f1349bf444026a4b1016b07
-DIST open-vm-tools-2008.05.15-93241.tar.gz 2462536 RMD160 6482557a2bfd5628093e7d02262c6cb1f072c334 SHA1 58c1861ffdedb205fe58f65b29ad47bf72ded836 SHA256 465657c6c59b88458bb6bf8a5411ab7d1e5aef548e931b4291c8cec1cba55ea3
-DIST open-vm-tools-2008.07.01-102166.tar.gz 2558112 RMD160 7324a0f7f4f99ee23547bf51aaba316c79ceee55 SHA1 311de7dcc6bf50f017a399180b884150c21a6f32 SHA256 51293ff716bff35ecd03e8747280280be0a748e9fc5ec7c2d02d936b0c86d1c5
-DIST open-vm-tools-2008.08.08-109361.tar.gz 2971141 RMD160 4ea0a6aa2edda2bc404c865dc5b58f3a177ae411 SHA1 1c44c3524cd9cbc5870f1c6065b03a6b31859a25 SHA256 b7abff74f87b05cf1d78c5076c1e5c83b37639eed84498834becdfc20e4f798e
-DIST open-vm-tools-2008.10.10-123053.tar.gz 3186908 RMD160 770cb2ccfca24814cbd04fe3b1d076fdd7e23f1e SHA1 c2f3faa67ca40d4b307df5d87659fa898bcb09e7 SHA256 c67e247d85664747363d830d0d893251f0b9978076ac9ac1a364d6cc5aeecc91
-EBUILD open-vm-tools-0.0.20080414.87182.ebuild 3683 RMD160 1ed0a118495b177076ac4585c512770047ccc02b SHA1 49b56355f9b39f5f2c71fac0a7e723dbaaa63836 SHA256 6ddba316a27d4aac5390b983e0ab905a80727c92a8b0c82e42f68a367b9a525c
-EBUILD open-vm-tools-0.0.20080515.93241.ebuild 3638 RMD160 70ab5b74e1c4452cdc6cc2bfaa61fa8048cc5309 SHA1 d95a10736c41eaf1970b50059f756bbff4506868 SHA256 9fcd8f3c40f8bd8cdb04fed77626b4a485ffc8680b876bfd5734c2a898393697
-EBUILD open-vm-tools-0.0.20080701.102166.ebuild 2701 RMD160 5bc76a6525535758de70ec1fbb57add017e7b1fa SHA1 6bb9d0bc96ed8b1fb9fafe3f8bca9b6cf736617a SHA256 e6dee5b5e4c2cf9aa8f0968b44e5f49acf96c813c65ed7e4bd7706e4f93dc1d8
-EBUILD open-vm-tools-0.0.20080808.109361.ebuild 2876 RMD160 0106936fb6a0a566cfef83a3b38de33706cd35a5 SHA1 a31b130987e28f05175845b07cfddcf7d628a03c SHA256 c833808e219220e50467eb0564b07f286cb573a3a7c3019d50aa1792f40b6b18
-EBUILD open-vm-tools-0.0.20081010.123053.ebuild 2876 RMD160 0106936fb6a0a566cfef83a3b38de33706cd35a5 SHA1 a31b130987e28f05175845b07cfddcf7d628a03c SHA256 c833808e219220e50467eb0564b07f286cb573a3a7c3019d50aa1792f40b6b18
+DIST open-vm-tools-2008.12.23-137496.tar.gz 3317919 RMD160 893d37774593b0d4fa72387ed25bbbd7b90af3c5 SHA1 6b30e81279da31767d135e9d609bd1a5731dccb8 SHA256 41fabaa1be0c865376dbe8dc472baebb559ac6a9f0314c0d4786720a2d354444
+EBUILD open-vm-tools-0.0.20081223.137496.ebuild 2967 RMD160 9fef828b6c198fe7d445a8532e9366642dabcae5 SHA1 792735aba3d52cdcc893c91ba062d095053b92c4 SHA256 ecd51b946a1dd51cd24917107c7b2e18e00d232950f66042cf046d928fb4acee
diff --git a/app-emulation/open-vm-tools/open-vm-tools-0.0.20080414.87182.ebuild b/app-emulation/open-vm-tools/open-vm-tools-0.0.20080414.87182.ebuild
deleted file mode 100644
index 5105ea0..0000000
--- a/app-emulation/open-vm-tools/open-vm-tools-0.0.20080414.87182.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2008 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.20071121.64693.ebuild,v 1.2 2007/12/22 23:05:54 mr_bones_ Exp $
-
-inherit pam eutils linux-mod autotools 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"
-DEPEND="
-		virtual/linux-sources
-		sys-apps/ethtool
-		X? (
-			x11-libs/libX11
-			x11-libs/gtk+
-			)
-		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
-		"
-
-RDEPEND="${DEPEND/virtual\/linux\-sources/}
-		 virtual/pam
-		 X? (
-			x11-base/xorg-server
-			x11-drivers/xf86-video-vmware
-			x11-drivers/xf86-input-vmmouse
-		 )
-"
-
-VMWARE_MOD_DIR="modules/linux"
-VMWARE_MODULE_LIST="vmblock vmhgfs vmsync vmmemctl vmxnet"
-
-pkg_setup() {
-
-	linux-mod_pkg_setup
-	MODULE_NAMES=""
-	BUILD_TARGETS="auto-build HEADER_DIR=${KERNEL_DIR}/include BUILD_DIR=${KV_OUT_DIR}"
-
-	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
-
-	ewarn "If you're compiling for a hardened target, please use the hardened"
-	ewarn "nopie compiler in the hardened profile (select it using gcc-config)."
-	ewarn "For more details please see bug #200376, comment 18."
-
-	enewgroup vmware
-
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# epatch "${FILESDIR}/${PN}-as-needed.patch"
-
-	eautoreconf
-}
-
-src_compile() {
-	econf \
-	$(use_with X x) \
-	$(use_enable xinerama multimon) \
-	|| die "Error: econf failed!"
-
-	linux-mod_src_compile
-
-	emake || die
-}
-
-src_install() {
-
-	linux-mod_src_install
-
-	pamd_mimic_system vmware-guestd auth account
-
-	# Install the various tools
-	cd "${S}"
-	VMWARE_BIN_LIST="hgfsclient xferlogs"
-	VMWARE_SBIN_LIST="guestd checkvm"
-	if use X; then
-		# Fix up the vmware-user tool's name
-		mv vmware-user/vmware-user vmware-user/user
-		mv vmware-user user
-		VMWARE_BIN_LIST="${VMWARE_BIN_LIST} user toolbox"
-	fi
-	for i in ${VMWARE_BIN_LIST}; do
-		newbin ${i}/${i} vmware-${i} || die "Failed installing ${i}"
-	done
-	for i in ${VMWARE_SBIN_LIST}; do
-		newsbin ${i}/${i} vmware-${i} || die "Failed installing ${i}"
-	done
-
-	dolib libguestlib/.libs/libguestlib.{so.0.0.0,a}
-
-	# Deal with the hgfsmounter
-	into /
-	newsbin hgfsmounter/hgfsmounter mount.vmhgfs
-	fperms u+s /sbin/mount.vmhgfs
-	### FROM THIS POINT ON, into IS SET TO ${ROOT}/ not ${ROOT}/usr !!!
-
-	# Install the /etc/ files
-	exeinto /etc/vmware-tools
-	doexe scripts/linux/*
-	insinto /etc/vmware-tools
-	doins "${FILESDIR}/tools.conf"
-	# Only install this, when X is being used. Else it's useless waste of
-	# ressources when checking continuously for processes that will never appear
-	use X && doins "${FILESDIR}/xautostart.conf"
-	newinitd "${FILESDIR}/open-vm.initd" vmware-tools
-	newconfd "${FILESDIR}/open-vm.confd" vmware-tools
-
-	if use X;
-	then
-		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.20080515.93241.ebuild b/app-emulation/open-vm-tools/open-vm-tools-0.0.20080515.93241.ebuild
deleted file mode 100644
index b2631f3..0000000
--- a/app-emulation/open-vm-tools/open-vm-tools-0.0.20080515.93241.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2008 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.20071121.64693.ebuild,v 1.2 2007/12/22 23:05:54 mr_bones_ Exp $
-
-inherit pam eutils linux-mod autotools 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"
-DEPEND="
-		virtual/linux-sources
-		sys-apps/ethtool
-		X? (
-			x11-libs/libX11
-			x11-libs/gtk+
-			)
-		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
-		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
-		 )
-"
-
-VMWARE_MOD_DIR="modules/linux"
-VMWARE_MODULE_LIST="vmblock vmhgfs vmsync vmmemctl vmxnet"
-
-pkg_setup() {
-
-	linux-mod_pkg_setup
-	MODULE_NAMES=""
-	BUILD_TARGETS="auto-build HEADER_DIR=${KERNEL_DIR}/include BUILD_DIR=${KV_OUT_DIR}"
-
-	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
-
-	ewarn "If you're compiling for a hardened target, please use the hardened"
-	ewarn "toolchain (see bug #200376, comment 18)."
-
-	enewgroup vmware
-
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/default-scripts.patch"
-
-	eautoreconf
-}
-
-src_compile() {
-	econf \
-	$(use_with icu) \
-	$(use_with X x) \
-	$(use_enable xinerama multimon) \
-	|| die "Error: econf failed!"
-
-	linux-mod_src_compile
-
-	emake || die
-}
-
-src_install() {
-
-	linux-mod_src_install
-
-	pamd_mimic_system vmware-guestd auth account
-
-	# Install the various tools
-	cd "${S}"
-	VMWARE_BIN_LIST="hgfsclient xferlogs"
-	VMWARE_SBIN_LIST="guestd checkvm"
-	if use X; then
-		# Fix up the vmware-user tool's name
-		mv vmware-user/vmware-user vmware-user/user
-		mv vmware-user user
-		VMWARE_BIN_LIST="${VMWARE_BIN_LIST} user toolbox"
-	fi
-	for i in ${VMWARE_BIN_LIST}; do
-		newbin ${i}/${i} vmware-${i} || die "Failed installing ${i}"
-	done
-	for i in ${VMWARE_SBIN_LIST}; do
-		newsbin ${i}/${i} vmware-${i} || die "Failed installing ${i}"
-	done
-
-	dolib libguestlib/.libs/libguestlib.{so.0.0.0,a}
-
-	# Deal with the hgfsmounter
-	into /
-	newsbin hgfsmounter/hgfsmounter mount.vmhgfs
-	fperms u+s /sbin/mount.vmhgfs
-	### FROM THIS POINT ON, into IS SET TO ${ROOT}/ not ${ROOT}/usr !!!
-
-	# Install the /etc/ files
-	exeinto /etc/vmware-tools
-	doexe scripts/linux/*
-	insinto /etc/vmware-tools
-	doins "${FILESDIR}/tools.conf"
-	# Only install this, when X is being used. Else it's useless waste of
-	# ressources when checking continuously for processes that will never appear
-	use X && doins "${FILESDIR}/xautostart.conf"
-	newinitd "${FILESDIR}/open-vm.initd" vmware-tools
-	newconfd "${FILESDIR}/open-vm.confd" vmware-tools
-
-	if use X;
-	then
-		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.20080701.102166.ebuild b/app-emulation/open-vm-tools/open-vm-tools-0.0.20080701.102166.ebuild
deleted file mode 100644
index 694c280..0000000
--- a/app-emulation/open-vm-tools/open-vm-tools-0.0.20080701.102166.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2008 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.20071121.64693.ebuild,v 1.2 2007/12/22 23:05:54 mr_bones_ Exp $
-
-inherit pam eutils linux-mod autotools 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"
-DEPEND="
-		virtual/linux-sources
-		sys-apps/ethtool
-		X? (
-			x11-libs/libX11
-			x11-libs/gtk+
-			)
-		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
-		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
-		 )
-"
-
-VMWARE_MOD_DIR="modules/linux"
-VMWARE_MODULE_LIST="vmblock vmhgfs vmsync vmmemctl vmxnet"
-
-pkg_setup() {
-
-	linux-mod_pkg_setup
-	MODULE_NAMES=""
-	BUILD_TARGETS="auto-build HEADER_DIR=${KERNEL_DIR}/include BUILD_DIR=${KV_OUT_DIR}"
-
-	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
-
-	ewarn "If you're compiling for a hardened target, please use the hardened"
-	ewarn "toolchain (see bug #200376, comment 18)."
-
-	enewgroup vmware
-
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/default-scripts.patch"
-	epatch "${FILESDIR}/makefile-destdir.patch"
-
-	eautoreconf
-}
-
-src_compile() {
-	econf \
-	--without-kernel-modules \
-	$(use_with icu) \
-	$(use_with X x) \
-	$(use_enable xinerama multimon) \
-	|| die "Error: econf failed!"
-
-	linux-mod_src_compile
-
-	emake || die
-}
-
-src_install() {
-
-	linux-mod_src_install
-
-	pamd_mimic_system vmware-guestd auth account
-
-	emake install DESTDIR=${D} || die "Failed to install"
-
-	newinitd "${FILESDIR}/open-vm.initd" vmware-tools
-	newconfd "${FILESDIR}/open-vm.confd" vmware-tools
-
-	if use X;
-	then
-		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.20080808.109361.ebuild b/app-emulation/open-vm-tools/open-vm-tools-0.0.20080808.109361.ebuild
deleted file mode 100644
index fd65880..0000000
--- a/app-emulation/open-vm-tools/open-vm-tools-0.0.20080808.109361.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2008 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.20071121.64693.ebuild,v 1.2 2007/12/22 23:05:54 mr_bones_ Exp $
-
-inherit pam eutils linux-mod 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+
-			)
-		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
-		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="vmblock vmhgfs vmsync vmmemctl vmxnet"
-
-pkg_setup() {
-
-	linux-mod_pkg_setup
-	MODULE_NAMES=""
-	BUILD_TARGETS="auto-build HEADER_DIR=${KERNEL_DIR}/include BUILD_DIR=${KV_OUT_DIR}"
-
-	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
-
-	ewarn "If you're compiling with a hardened toolchain, please use the"
-	ewarn "hardenednopie gcc profile (see bug #200376, comment 18)."
-
-	enewgroup vmware
-
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/default-scripts.patch"
-}
-
-src_compile() {
-	econf \
-	--without-kernel-modules \
-	$(use_with icu) \
-	$(use_with X x) \
-	$(use_enable unity) \
-	$(use_enable xinerama multimon) \
-	|| die "Error: econf failed!"
-
-	linux-mod_src_compile
-
-	emake || die
-}
-
-src_install() {
-
-	linux-mod_src_install
-
-	pamd_mimic_system vmware-guestd auth account
-
-	emake install DESTDIR="${D}" || die "Failed to install"
-
-	newinitd "${FILESDIR}/open-vm.initd" vmware-tools
-	newconfd "${FILESDIR}/open-vm.confd" vmware-tools
-
-	if use X;
-	then
-		exeinto /etc/X11/xinit/xinitrc.d
-		doexe "${FILESDIR}/10-vmware-tools"
-
-		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.20081010.123053.ebuild b/app-emulation/open-vm-tools/open-vm-tools-0.0.20081223.137496.ebuild
index fd65880..f84e9a6 100644
--- a/app-emulation/open-vm-tools/open-vm-tools-0.0.20081010.123053.ebuild
+++ b/app-emulation/open-vm-tools/open-vm-tools-0.0.20081223.137496.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.20071121.64693.ebuild,v 1.2 2007/12/22 23:05:54 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/open-vm-tools-0.0.20081223.137496.ebuild,v 1.1 2008/12/31 00:39:39 ikelos Exp $
 
 inherit pam eutils linux-mod versionator
 
@@ -58,6 +58,8 @@ VMWARE_MOD_DIR="modules/linux"
 VMWARE_MODULE_LIST="vmblock vmhgfs vmsync vmmemctl vmxnet"
 
 pkg_setup() {
+	use unity && ! use xinerama && \
+	  die 'The Unity USE flag requires USE="xinerama" as well'
 
 	linux-mod_pkg_setup
 	MODULE_NAMES=""
@@ -78,7 +80,6 @@ pkg_setup() {
 	ewarn "hardenednopie gcc profile (see bug #200376, comment 18)."
 
 	enewgroup vmware
-
 }
 
 src_unpack() {