Version bump, fixes bug 256678. Thanks to John Plesmid for the testing.

Package-Manager: portage-2.2_rc23/cvs/Linux i686

5 files changed, 168 insertions, 5 deletions

diff --git a/app-emulation/open-vm-tools/ChangeLog b/app-emulation/open-vm-tools/ChangeLog
index 1c3312c06140..54e0e6951973 100644
--- a/app-emulation/open-vm-tools/ChangeLog
+++ b/app-emulation/open-vm-tools/ChangeLog
@@ -1,6 +1,13 @@
 # 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.14 2009/01/25 13:19:44 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/ChangeLog,v 1.15 2009/02/08 20:28:08 ikelos Exp $
+
+*open-vm-tools-0.0.20090121.142982 (08 Feb 2009)
+
+  08 Feb 2009; Mike Auty <ikelos@gentoo.org>
+  +files/2.6.28.1-api-break.patch, +files/open-vm-tools.desktop,
+  +open-vm-tools-0.0.20090121.142982.ebuild:
+  Version bump, fixes bug 256678. Thanks to John Plesmid for the testing.
 
   25 Jan 2009; Mike Auty <ikelos@gentoo.org>
   open-vm-tools-0.0.20081223.137496.ebuild:
diff --git a/app-emulation/open-vm-tools/Manifest b/app-emulation/open-vm-tools/Manifest
index 8ec870ebf353..e6173a7ab341 100644
--- a/app-emulation/open-vm-tools/Manifest
+++ b/app-emulation/open-vm-tools/Manifest
@@ -2,7 +2,9 @@
 Hash: SHA1
 
 AUX 10-vmware-tools 114 RMD160 381423877ec3368af89bd1860c9ab2237c00ea22 SHA1 0ae176a10bd65358a3c7e449e49bced4375ea9ca SHA256 0c0d8c2bdea3f8fee3f061bc5a2dbfbed33167afa9202767a54192c69f186702
+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.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
@@ -10,15 +12,17 @@ AUX xautostart.conf 59 RMD160 ca1ea3f1b82caa6e97d94835d88a39a6f153ff7a SHA1 92ba
 DIST open-vm-tools-2008.05.15-93241.tar.gz 2462536 RMD160 6482557a2bfd5628093e7d02262c6cb1f072c334 SHA1 58c1861ffdedb205fe58f65b29ad47bf72ded836 SHA256 465657c6c59b88458bb6bf8a5411ab7d1e5aef548e931b4291c8cec1cba55ea3
 DIST open-vm-tools-2008.08.08-109361.tar.gz 2971141 RMD160 4ea0a6aa2edda2bc404c865dc5b58f3a177ae411 SHA1 1c44c3524cd9cbc5870f1c6065b03a6b31859a25 SHA256 b7abff74f87b05cf1d78c5076c1e5c83b37639eed84498834becdfc20e4f798e
 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
 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
-MISC ChangeLog 2937 RMD160 296f5589e88cbb39851f7fb14d867b131f7829cd SHA1 d78ff7acbc2ee44d2f4abfa5731672a65cf091a1 SHA256 0858c8795a5cbeb157d21447702b58e05f3414317c0f295682a6ebf5d3043ec1
+EBUILD open-vm-tools-0.0.20090121.142982.ebuild 2876 RMD160 3e0f8db17e74b6f65cb0cd41694e3960023e4d22 SHA1 e717f55933884dba3c4e34252be4823ca58d080c SHA256 46b3fcae1da0e8c9c0bad2c84c52b211efbdef3ee8463da5f662822551a4e59f
+MISC ChangeLog 3217 RMD160 1a26a518ed6f204f818c7c1917078efa7df226b1 SHA1 1be17355c4c05f11aa24d2ce2f3048ea8806ecde SHA256 50fa3fbc4e5aab24988cf19059fa17454ee1cc0582ab1b83ee61fe714ef52226
 MISC metadata.xml 225 RMD160 fc92101cb82e762d6de10485c8eab28fa064e79c SHA1 4e2e08e98ed1b76c8e76330ae2f5dceda3cf21fa SHA256 f405785104f9d69e525d5ed01c619509ca5f00b8f7f4fb2e08ecd1c24cb4480d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkl8Zv4ACgkQu7rWomwgFXqgFgCePKeXQxFOaazOQP7U4DSbEhhU
-paQAoLPmOScpN3Ems+8QBzNJiTlFK27R
-=q1bi
+iEYEARECAAYFAkmPQGQACgkQu7rWomwgFXp/qACgso7gi9no+7maZ043Q6qF2A88
+iNIAoIrPNuzY7F7LVK5D5xPuQZDGvBep
+=FYFS
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/open-vm-tools/files/2.6.28.1-api-break.patch b/app-emulation/open-vm-tools/files/2.6.28.1-api-break.patch
new file mode 100644
index 000000000000..9eb6463c4b66
--- /dev/null
+++ b/app-emulation/open-vm-tools/files/2.6.28.1-api-break.patch
@@ -0,0 +1,20 @@
+diff --git a/modules/linux/vmhgfs/page.c b/modules/linux/vmhgfs/page.c
+index 4fc9b53..d4a5d26 100644
+--- a/modules/linux/vmhgfs/page.c
++++ b/modules/linux/vmhgfs/page.c
+@@ -864,7 +864,15 @@ HgfsWriteBegin(struct file *file,             // IN: File to be written
+    unsigned pageTo = pos + len;
+    struct page *page;
+ 
++   /* 
++    * AOP_FLAG_NOFS was defined in the same changeset that 
++    * grab_cach_page_write_bring() was introduced.
++    */
++#ifdef AOP_FLAG_NOFS
++   page = grab_cache_page_write_begin(mapping, index, flags);
++#else
+    page = __grab_cache_page(mapping, index);
++#endif
+    if (page == NULL) {
+       return -ENOMEM;
+    }
diff --git a/app-emulation/open-vm-tools/files/open-vm-tools.desktop b/app-emulation/open-vm-tools/files/open-vm-tools.desktop
new file mode 100644
index 000000000000..2107a62e0be0
--- /dev/null
+++ b/app-emulation/open-vm-tools/files/open-vm-tools.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Exec=vmware-user
+Name=VMware User Agent
+X-KDE-autostart-phase=1
+NoDisplay=true
diff --git a/app-emulation/open-vm-tools/open-vm-tools-0.0.20090121.142982.ebuild b/app-emulation/open-vm-tools/open-vm-tools-0.0.20090121.142982.ebuild
new file mode 100644
index 000000000000..6eee7666b92b
--- /dev/null
+++ b/app-emulation/open-vm-tools/open-vm-tools-0.0.20090121.142982.ebuild
@@ -0,0 +1,125 @@
+# 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.20090121.142982.ebuild,v 1.1 2009/02/08 20:28:08 ikelos 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() {
+	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}"
+
+	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
+
+	enewgroup vmware
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/2.6.28.1-api-break.patch"
+	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
+		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
+}