Version bump.

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

4 files changed, 216 insertions, 2 deletions

diff --git a/app-emulation/open-vm-tools/ChangeLog b/app-emulation/open-vm-tools/ChangeLog
index 76bf508955c1..5af3cbc69402 100644
--- a/app-emulation/open-vm-tools/ChangeLog
+++ b/app-emulation/open-vm-tools/ChangeLog
@@ -1,6 +1,12 @@
 # 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.16 2009/06/04 13:20:34 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/ChangeLog,v 1.17 2009/06/07 20:51:57 vadimk Exp $
+
+*open-vm-tools-0.0.20090522.167859 (07 Jun 2009)
+
+  07 Jun 2009; Vadim Kuznetsov vadimk@gentoo.org
+  +open-vm-tools-0.0.20090522.167859.ebuild, +files/open-vm-tools.initd:
+  Version bump.
 
 *open-vm-tools-0.0.20090318.154848 (04 Jun 2009)
 
diff --git a/app-emulation/open-vm-tools/Manifest b/app-emulation/open-vm-tools/Manifest
index 4b36751bc3d9..63a0a63adead 100644
--- a/app-emulation/open-vm-tools/Manifest
+++ b/app-emulation/open-vm-tools/Manifest
@@ -2,6 +2,7 @@ AUX 10-vmware-tools 114 RMD160 381423877ec3368af89bd1860c9ab2237c00ea22 SHA1 0ae
 AUX 2.6.28.1-api-break.patch 648 RMD160 4f5e18d2625a510a99b3c6f82a4b23feb6e36cfe SHA1 a40d9d075cac4ca777262ef6920b4cf6dc0788f0 SHA256 d9d91a06231ae9aba9f3d97cf16e2f31474c4f67c30a6d32d0ddb14fa332493a
 AUX default-scripts.patch 3525 RMD160 7c3dfd342be245531493a9cf7a8be2be4c67dc4b SHA1 56ba6ca91262f73732a7d806a9c812aea683c2d2 SHA256 99ad1a202335736c50bbb92432371e522934d1a3347e992158b881cf9f810da6
 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
@@ -11,10 +12,12 @@ DIST open-vm-tools-2008.08.08-109361.tar.gz 2971141 RMD160 4ea0a6aa2edda2bc404c8
 DIST open-vm-tools-2008.12.23-137496.tar.gz 3317919 RMD160 893d37774593b0d4fa72387ed25bbbd7b90af3c5 SHA1 6b30e81279da31767d135e9d609bd1a5731dccb8 SHA256 41fabaa1be0c865376dbe8dc472baebb559ac6a9f0314c0d4786720a2d354444
 DIST open-vm-tools-2009.01.21-142982.tar.gz 3516654 RMD160 e54625199fa758e15ca58489fd4dd0791ed1e4b3 SHA1 665139c65395a445f94f27b8fc3cb77c178824b2 SHA256 c9ef5f47c47db6844a987a08f5a70e49d8423323e3c6db1eded7f7b180c96c30
 DIST open-vm-tools-2009.03.18-154848.tar.gz 3964960 RMD160 83df432107eaea2c174cd77a6d857c77a29cde2c SHA1 31b85613b6fe43c89dadb7f49ac26e7b96097f58 SHA256 6c9d06dee94c04214526f439599ed42064d6cee62125791f7c9c07d60f09cd57
+DIST open-vm-tools-2009.05.22-167859.tar.gz 3417843 RMD160 c8403e0fe1ff32ec356ce997b7e621ee7fe87d22 SHA1 a38e16e8cc6bb3b9d9ce88244aef8332a233b7e4 SHA256 99f3726f86e53abac4efcf70a871e2003d2f245fd83b663ae8ad756322c48a2b
 EBUILD open-vm-tools-0.0.20080515.93241.ebuild 3725 RMD160 b7996ef3e6bc4b49aab3528ec18b848c3105d2df SHA1 f08ab357f3173e069b000edbec27ec25baa77f8e SHA256 5834278bf5563a3c976af6170b0c64ba47971536d397f98c07a9e003c8c22758
 EBUILD open-vm-tools-0.0.20080808.109361-r1.ebuild 2877 RMD160 9c1a3d6966d5ddcc7a5df878c8ddf697eeab93b1 SHA1 0e25b5d9f1f4ada942bf44e127fef6f2ea51e3dd SHA256 fe99c80ef8161a4d77048ecebf5b55b03a4b066ef48c90cf7c900ed02392720b
 EBUILD open-vm-tools-0.0.20081223.137496.ebuild 2829 RMD160 422593b6d129a5a97f9cac6b1791a55940e355d7 SHA1 7bbfa2a6c939bc4c2228e3071a7cd62d1e58d183 SHA256 bcaed83de3145bd521d4f80df70806d712cb8d84e66a0b5ba6b83ae9660652b8
 EBUILD open-vm-tools-0.0.20090121.142982.ebuild 2876 RMD160 3e0f8db17e74b6f65cb0cd41694e3960023e4d22 SHA1 e717f55933884dba3c4e34252be4823ca58d080c SHA256 46b3fcae1da0e8c9c0bad2c84c52b211efbdef3ee8463da5f662822551a4e59f
 EBUILD open-vm-tools-0.0.20090318.154848.ebuild 2888 RMD160 4592dd626591e2b76aee49f5284c8e4e86eb9f56 SHA1 44db85a86168266cba10e006ce6eb2cc25ec8c75 SHA256 d69cee04b86a1f73e966351c64e12e37be9e3e03da20931f14a3dc4e7f61ad36
-MISC ChangeLog 3399 RMD160 e5d9db6e0f3ee5a3f13455b2a4f8637ba9fe679d SHA1 db891e9674c9c3e20e74e08ddd4235b3fc8ce7d1 SHA256 52dc2d17ffbaed6478c2a8d9d1c63ad2976a385e9c3dc55bd504d978a380511b
+EBUILD open-vm-tools-0.0.20090522.167859.ebuild 3132 RMD160 7bed8e26257ffade448c2bf1fb6c6a5aaeb573ed SHA1 4bb62ac4e1cc310fd0cc32534b0cac882dad0584 SHA256 292f752b930667b4de53a6a0903753b88dad5595a527a7e07c5fbeeebe160c88
+MISC ChangeLog 3588 RMD160 f16bb0b072e4b2ba0ba1a7908ac6eefef15f203f SHA1 232198e1a106eb7b3d9575fa27b6ba6b6d8a6bc1 SHA256 e56f750f345ed55f601b8f05fc50de8fc9040903f44dc94eb25616e03007df17
 MISC metadata.xml 614 RMD160 54b67aeefe367ea22203208a6ace6c730fd6adc4 SHA1 5ccaac50a242f2848dbec69e208c6b64fb067924 SHA256 980ad594a463d334bcbc0282710144d109db5fbfc06df0a723ff522fc59f08a8
diff --git a/app-emulation/open-vm-tools/files/open-vm-tools.initd b/app-emulation/open-vm-tools/files/open-vm-tools.initd
new file mode 100644
index 000000000000..3988c297daf2
--- /dev/null
+++ b/app-emulation/open-vm-tools/files/open-vm-tools.initd
@@ -0,0 +1,76 @@
+#!/sbin/runscript
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/files/open-vm-tools.initd,v 1.1 2009/06/07 20:51:57 vadimk Exp $
+
+DND_TMPDIR="/tmp/VMwareDnD"
+USER_GROUP="root:vmware"
+DND_TMPDIR_PERMS="1777"
+GUESTD_BIN="/usr/bin/vmtoolsd"
+PIDFILE="/var/run/vmtoolsd.pid"
+MOUNTPOINT="/proc/fs/vmblock/mountPoint"
+
+depend() {
+	before checkfs fsck net X
+}
+
+start() {
+	if [ "${VM_DRAG_AND_DROP}" == "yes" ];
+	then
+
+		if ! grep -q -w vmblock /proc/modules;
+		then
+			ebegin "Loading vmblock module"
+			modprobe vmblock
+			eend $?
+			sleep 0.25
+		fi
+
+		if [[ ! -d "${DND_TMPDIR}" ]];
+		then
+			# einfo "Creating the VM drag and drop directory"
+			mkdir "${DND_TMPDIR}"
+			chown "${USER_GROUP}" "${DND_TMPDIR}"
+			chmod "${DND_TMPDIR_PERMS}" "${DND_TMPDIR}"
+		fi
+
+		# DnD_TMPDIR must exist before vmblock can be mounted
+		ebegin "Mounting vmblock device"
+		mount -t vmblock none ${MOUNTPOINT}
+		eend $?
+	fi
+	
+	ebegin "Starting vmtoolsd"
+	start-stop-daemon --chuid "${USER_GROUP}" --start --quiet --exec ${GUESTD_BIN} -- --background "${PIDFILE}"
+	eend $?
+}
+
+stop() {
+	local ret
+	
+	if [ "${VM_DRAG_AND_DROP}" == "yes" ];
+	then
+		ebegin "Cleaning the contents of ${DND_TMPDIR}"
+		# First check, whether ${DND_TMPDIR} isn valid... we shouldn't risk deleting the content of ""/*
+		if [[ ! -z "${DND_TMPDIR}" ]] && [[ "${DND_TMPDIR}" != "/" ]];
+		then
+			rm -rf ${DND_TMPDIR}/*
+			ret=0
+		else
+			eerror "Not cleaning up ${DND_TMPDIR}, please check definition of variable"
+			ret=1
+		fi
+		eend $ret
+
+		ebegin "Unmounting vmblock device"
+		if grep -q -w "${MOUNTPOINT}" /proc/mounts;
+		then
+			umount ${MOUNTPOINT} 1>&2 > /dev/null
+		fi
+		eend 0
+	fi
+
+	ebegin "Stopping vmtoolsd"
+	start-stop-daemon --stop --quiet --pidfile "${PIDFILE}"
+	eend $?
+}
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
new file mode 100644
index 000000000000..fcc3331afb0d
--- /dev/null
+++ b/app-emulation/open-vm-tools/open-vm-tools-0.0.20090522.167859.ebuild
@@ -0,0 +1,129 @@
+# 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.1 2009/06/07 20:51:57 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
+		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 x11) \
+		$(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
+}