Fixes bugs 273211, 270433, 260878. Hardcoded procpc, Werror, general ebuild clean up and missing dependencies. USE flags are added: doc, fuse. However, vmblock-fuse still needs init script changes.

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

4 files changed, 149 insertions, 5 deletions

diff --git a/app-emulation/open-vm-tools/ChangeLog b/app-emulation/open-vm-tools/ChangeLog
index 19e007c6aade..1ebf416743ea 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.20 2009/06/30 12:27:06 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/ChangeLog,v 1.21 2009/07/09 21:01:41 vadimk Exp $
+
+*open-vm-tools-0.0.20090618.172495-r1 (09 Jul 2009)
+
+  09 Jul 2009; Vadim Kuznetsov vadimk@gentoo.org
+  +open-vm-tools-0.0.20090618.172495-r1.ebuild, metadata.xml:
+  Fixes bugs 273211, 270433, 260878. Hardcoded procpc, Werror, general
+  ebuild clean up and missing dependencies. USE flags are added: doc, fuse.
+  However, vmblock-fuse still needs init script changes.
 
 *open-vm-tools-0.0.20090618.172495 (30 Jun 2009)
 
diff --git a/app-emulation/open-vm-tools/Manifest b/app-emulation/open-vm-tools/Manifest
index 6963339e751a..51f3ca3a0f06 100644
--- a/app-emulation/open-vm-tools/Manifest
+++ b/app-emulation/open-vm-tools/Manifest
@@ -21,6 +21,7 @@ EBUILD open-vm-tools-0.0.20081223.137496.ebuild 2829 RMD160 422593b6d129a5a97f9c
 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
 EBUILD open-vm-tools-0.0.20090522.167859.ebuild 3150 RMD160 abdd6c1c863513819898b7602b2f9244aea5a988 SHA1 4533c413639df1b0c6df5e0f6317b6bd36383112 SHA256 6dea3ac18170d4850ad6800635ec9e800691d9737855b02416d4933c6c2cfd00
+EBUILD open-vm-tools-0.0.20090618.172495-r1.ebuild 3492 RMD160 2d566bd8e4139f56484dfd1b037d2c8a9db5259f SHA1 e3dd3afae39dde900448ffac4f3076a5e5ffcd30 SHA256 d357f9686139f26d21f33147e02eac292b636618e2c28942c4c04d84c5350b8f
 EBUILD open-vm-tools-0.0.20090618.172495.ebuild 3104 RMD160 8e0d45055be611a25d729d3cc2f90c722e42398d SHA1 b15b674dc2b719062dc3b83fcfef5506c4b31f77 SHA256 f415442be615f0451ee77a4064c365c0ad0bd50e43d91f562f7db4d825c09af1
-MISC ChangeLog 4056 RMD160 d821d7646d8777f9fc4bd9f0f6cc3b14b4c503ef SHA1 36ca55644f6f9c9100d065d69f24d61f9f9feff2 SHA256 771b9332ec413f27d8e67b27c37af0f598147c13d32f1fe6844c05ccfdf582ac
-MISC metadata.xml 614 RMD160 54b67aeefe367ea22203208a6ace6c730fd6adc4 SHA1 5ccaac50a242f2848dbec69e208c6b64fb067924 SHA256 980ad594a463d334bcbc0282710144d109db5fbfc06df0a723ff522fc59f08a8
+MISC ChangeLog 4425 RMD160 a608d990cf5ed347e0e8eb69996d45333b4b0113 SHA1 3bc9018befa49ebd45b9831a0dde4d5c5b3c08ac SHA256 73cceb74a35937fd73cc6acd4ba33f9e9539c594010ab5faa5dddb64bd7b2ebd
+MISC metadata.xml 772 RMD160 c0765cede9a8ea4d2386dfc88d53e8886a6320d1 SHA1 6772cc22b89c8423676993d4f415fc4ff6ae4782 SHA256 35b6e005a80332816308a9cb3e322911b5d6365961ef7b7467a47023ea7dd3e9
diff --git a/app-emulation/open-vm-tools/metadata.xml b/app-emulation/open-vm-tools/metadata.xml
index c6a85f5192fe..e9f203bf9bdb 100644
--- a/app-emulation/open-vm-tools/metadata.xml
+++ b/app-emulation/open-vm-tools/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>vmware</herd>
 	<maintainer>
-		<email>vadimk@g.o</email>
+		<email>vadimk@gentoo.org</email>
 	</maintainer>
 	<longdescription>
 		The Open Virtual Machine Tools (open-vm-tools) are the open source
@@ -12,7 +12,10 @@
 		of virtual machines.
 	</longdescription>
 	<use>
-		<flag name='unity'>Enable host unity support</flag>
+		<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='gtkmm'>Enable gtkmm support</flag>
+		<flag name='unity'>Enable host unity support</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-emulation/open-vm-tools/open-vm-tools-0.0.20090618.172495-r1.ebuild b/app-emulation/open-vm-tools/open-vm-tools-0.0.20090618.172495-r1.ebuild
new file mode 100644
index 000000000000..18cb5b5dfdef
--- /dev/null
+++ b/app-emulation/open-vm-tools/open-vm-tools-0.0.20090618.172495-r1.ebuild
@@ -0,0 +1,132 @@
+# 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-r1.ebuild,v 1.1 2009/07/09 21:01:41 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}"
+
+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 unity xinerama"
+
+RDEPEND=">=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 )
+		!app-emulation/vmware-esx-tools
+		!app-emulation/vmware-server-tools
+		!app-emulation/vmware-workstation-tools
+		"
+
+DEPEND="${RDEPEND}
+		dev-util/pkgconfig
+		virtual/linux-sources
+		doc? ( app-doc/doxygen )
+		"
+
+S="${WORKDIR}/${MY_P}"
+
+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 -i -e 's:VMTOOLSD_PLUGIN_ROOT=\\"\$(pkglibdir)\\":VMTOOLSD_PLUGIN_ROOT=\\"\$(pkglibdir)/plugins\\":g' \
+		services/vmtoolsd/Makefile.in || die "sed plugin path failed"
+	sed -i -e 's/proc-3.2.7/proc/g' configure{,.ac} || die "sed configure failed"
+	sed -i -e 's/CFLAGS=.*Werror/#&/g' configure{,.ac} || die "sed comment out Werror failed"
+	#eautoreconf
+}
+
+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_enable unity) \
+		$(use_enable xinerama multimon)
+}
+
+src_compile() {
+	linux-mod_src_compile
+
+	emake || die "failed to compile"
+}
+
+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 || 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
+}