Added new 5.5.1 version, which I have tested on a 32-bit VM. It should work for 64-bit, also, but I have been unable to test it. Removing 5.0.0 version, since we no longer have that version in portage and 5.5.1 is a free upgrade for all 5.x users.

Package-Manager: portage-2.1_rc4-r3

5 files changed, 198 insertions, 4 deletions

diff --git a/app-emulation/vmware-workstation-tools/ChangeLog b/app-emulation/vmware-workstation-tools/ChangeLog
index 339b7d8bb42b..ceb5954fa3b4 100644
--- a/app-emulation/vmware-workstation-tools/ChangeLog
+++ b/app-emulation/vmware-workstation-tools/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for app-emulation/vmware-linux-tools
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation-tools/ChangeLog,v 1.6 2006/05/19 18:28:38 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation-tools/ChangeLog,v 1.7 2006/06/09 15:07:39 wolf31o2 Exp $
+
+*vmware-workstation-tools-5.5.1 (09 Jun 2006)
+
+  09 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/vmware-workstation-tools-5.5.1-config.patch,
+  vmware-workstation-tools-4.5.3.ebuild,
+  -vmware-workstation-tools-5.0.0.ebuild,
+  +vmware-workstation-tools-5.5.1.ebuild:
+  Added new 5.5.1 version, which I have tested on a 32-bit VM. It should work
+  for 64-bit, also, but I have been unable to test it. Removing 5.0.0 version,
+  since we no longer have that version in portage and 5.5.1 is a free upgrade
+  for all 5.x users.
 
   19 May 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   vmware-workstation-tools-4.5.3.ebuild,
diff --git a/app-emulation/vmware-workstation-tools/files/digest-vmware-workstation-tools-5.5.1 b/app-emulation/vmware-workstation-tools/files/digest-vmware-workstation-tools-5.5.1
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/app-emulation/vmware-workstation-tools/files/digest-vmware-workstation-tools-5.5.1
@@ -0,0 +1 @@
+
diff --git a/app-emulation/vmware-workstation-tools/files/vmware-workstation-tools-5.5.1-config.patch b/app-emulation/vmware-workstation-tools/files/vmware-workstation-tools-5.5.1-config.patch
new file mode 100644
index 000000000000..d64eb215ca76
--- /dev/null
+++ b/app-emulation/vmware-workstation-tools/files/vmware-workstation-tools-5.5.1-config.patch
@@ -0,0 +1,31 @@
+diff -urN vmware-tools-distrib.orig/bin/vmware-config-tools.pl vmware-tools-distrib/bin/vmware-config-tools.pl
+--- vmware-tools-distrib.orig/bin/vmware-config-tools.pl	2006-06-06 07:10:53.000000000 -0400
++++ vmware-tools-distrib/bin/vmware-config-tools.pl	2006-06-07 11:49:07.000000000 -0400
+@@ -3164,7 +3164,8 @@
+     # Figure out the correct network script.
+     my $init_dir = db_get_answer('INITSCRIPTSDIR');
+     my $network_path = find_first_exist("$init_dir/network",
+-                                        "$init_dir/networking");
++                                        "$init_dir/networking",
++					"/etc/init.d/net.eth0");
+     if (!defined($network_path)) {
+       print wrap("Can not find $init_dir/network and $init_dir/networking.\n\n", 0);
+       return 'no';
+@@ -7925,6 +7926,7 @@
+   uninstall_file($gConfFlag);
+ 
+   db_save();
++
+   #
+   # Then start VMware's services.
+   #
+@@ -7946,7 +7948,8 @@
+              0);
+ 
+   my $network_path = find_first_exist("/etc/init.d/network",
+-                                      "/etc/init.d/networking");
++                                      "/etc/init.d/networking",
++				      "/etc/init.d/net.eth0");
+   if (vmware_product() eq 'tools-for-linux' and
+       db_get_answer('VMXNET_CONFED') eq 'yes') {
+     print wrap('To use the vmxnet driver, restart networking using the '
diff --git a/app-emulation/vmware-workstation-tools/vmware-workstation-tools-4.5.3.ebuild b/app-emulation/vmware-workstation-tools/vmware-workstation-tools-4.5.3.ebuild
index 0c98ac5f7ac0..a836ca8780e2 100644
--- a/app-emulation/vmware-workstation-tools/vmware-workstation-tools-4.5.3.ebuild
+++ b/app-emulation/vmware-workstation-tools/vmware-workstation-tools-4.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation-tools/vmware-workstation-tools-4.5.3.ebuild,v 1.2 2006/05/19 18:28:38 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation-tools/vmware-workstation-tools-4.5.3.ebuild,v 1.3 2006/06/09 15:07:39 wolf31o2 Exp $
 
 inherit eutils
 
@@ -136,10 +136,16 @@ pkg_postinst () {
 		fi
 	done
 	einfo "To start using the vmware-tools, please run the following:"
-	einfo
+	echo
 	einfo "  ${dir}/bin/vmware-config-tools.pl"
 	einfo "  rc-update add vmware-tools default"
 	einfo "  /etc/init.d/vmware-tools start"
-	einfo
+	echo
 	einfo "Please report all bugs to http://bugs.gentoo.org/"
+	echo
+	ewarn "These tools might not compile with newer kernels.  I am unable to"
+	ewarn "find any patches for these to make them compile, so you're on your"
+	ewarn "own if using a newer kernel in your VM.  If you know of any patches,"
+	ewarn "then please file a bug so everyone can benefit."
+	echo
 }
diff --git a/app-emulation/vmware-workstation-tools/vmware-workstation-tools-5.5.1.ebuild b/app-emulation/vmware-workstation-tools/vmware-workstation-tools-5.5.1.ebuild
new file mode 100644
index 000000000000..dc3470162b5b
--- /dev/null
+++ b/app-emulation/vmware-workstation-tools/vmware-workstation-tools-5.5.1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation-tools/vmware-workstation-tools-5.5.1.ebuild,v 1.1 2006/06/09 15:07:39 wolf31o2 Exp $
+
+inherit eutils
+
+DESCRIPTION="Guest-os tools for VMware Workstation"
+HOMEPAGE="http://www.vmware.com/"
+
+SRC_URI=""
+LICENSE="vmware"
+SLOT="0"
+KEYWORDS="~amd64 x86"
+IUSE="X"
+RESTRICT=""
+
+RDEPEND="sys-apps/pciutils"
+
+dir=/opt/vmware/tools
+Ddir=${D}/${dir}
+#TARBALL="vmware-linux-tools.tar.gz"
+TARBALL="VMwareTools-5.5.1-19175.tar.gz"
+
+S=${WORKDIR}/vmware-tools-distrib
+
+vmware_create_initd() {
+	dodir /etc/vmware-tools/init.d
+	dodir /etc/vmware-tools/init.d/rc0.d
+	dodir /etc/vmware-tools/init.d/rc1.d
+	dodir /etc/vmware-tools/init.d/rc2.d
+	dodir /etc/vmware-tools/init.d/rc3.d
+	dodir /etc/vmware-tools/init.d/rc4.d
+	dodir /etc/vmware-tools/init.d/rc5.d
+	dodir /etc/vmware-tools/init.d/rc6.d
+
+	# This is to fix a problem where if someone merges vmware and then
+	# before configuring vmware they upgrade or re-merge the vmware
+	# package which would rmdir the /etc/vmware/init.d/rc?.d directories.
+	keepdir /etc/vmware-tools/init.d/rc{0,1,2,3,4,5,6}.d
+}
+
+vmware_run_questions() {
+	# Questions:
+	einfo "Adding answers to /etc/vmware/locations"
+	locations="${D}/etc/vmware-tools/locations"
+	echo "answer BINDIR ${dir}/bin" >> ${locations}
+	echo "answer LIBDIR ${dir}/lib" >> ${locations}
+	echo "answer MANDIR ${dir}/man" >> ${locations}
+	echo "answer DOCDIR ${dir}/doc" >> ${locations}
+	echo "answer SBINDIR ${dir}/sbin" >> ${locations}
+	echo "answer RUN_CONFIGURATOR no" >> ${locations}
+	echo "answer INITDIR /etc/vmware-tools/init.d" >> ${locations}
+	echo "answer INITSCRIPTSDIR /etc/vmware-tools/init.d" >> ${locations}
+}
+
+pkg_setup() {
+	einfo "You will need ${TARBALL} from the VMware installation."
+	einfo "Select VM->Install VMware Tools from VMware Workstation's menu."
+	cdrom_get_cds ${TARBALL}
+}
+
+src_unpack() {
+	cd "${S}"
+	tar xf "${CDROM_ROOT}"/"${TARBALL}"
+	epatch "${FILESDIR}"/${P}-config.patch || die "patching"
+}
+
+src_install() {
+	dodir ${dir}/bin
+	cp -pPR bin/* ${Ddir}/bin || die
+
+	dodir ${dir}/lib
+	cp -dr lib/* ${Ddir}/lib || die
+	# Since with Gentoo we compile everthing it doesn't make sense to keep
+	# the precompiled modules arround. Saves about 4 megs of disk space too.
+	rm -rf ${Ddir}/lib/modules/binary || die
+
+	into ${dir}
+	# install the binaries
+#	dosbin sbin/vmware-checkvm || die
+#	dosbin sbin/vmware-guestd || die
+
+	# install the config files
+	dodir /etc/vmware-tools
+	cp -pPR etc/* ${D}/etc/vmware-tools || die
+
+	# install the init scripts
+	newinitd ${FILESDIR}/${PN}.rc vmware-tools || die
+
+	# Environment
+	doenvd ${FILESDIR}/90vmware-tools || die
+
+	# if we have X, install the default config
+	if use X ; then
+		insinto /etc/X11
+		doins ${FILESDIR}/xorg.conf
+	fi
+
+	vmware_create_initd || die
+
+	cp -pPR installer/services.sh ${D}/etc/vmware-tools/init.d/vmware-tools || die
+
+	vmware_run_questions || die
+}
+
+pkg_postinst () {
+	# This must be done after the install to get the mtimes on each file
+	# right. This perl snippet gets the /etc/vmware/locations file code:
+	# perl -e "@a = stat('bin/vmware'); print \$a[9]"
+	# The above perl line and the find line below output the same thing.
+	# I would think the find line is faster to execute.
+	# find /opt/vmware/workstation/bin/vmware -printf %T@
+
+	#Note: it's a bit weird to use ${D} in a preinst script but it should work
+	#(drobbins, 1 Feb 2002)
+
+	einfo "Generating /etc/vmware-tools/locations file."
+	d=`echo ${D} | wc -c`
+	for x in `find ${Ddir} ${D}/etc/vmware-tools` ; do
+		x="`echo ${x} | cut -c ${d}-`"
+		if [ -d ${D}/${x} ] ; then
+			echo "directory ${x}" >> ${D}/etc/vmware-tools/locations
+		else
+			echo -n "file ${x}" >> ${D}/etc/vmware-tools/locations
+			if [ "${x}" == "/etc/vmware-tools/locations" ] ; then
+				echo "" >> ${D}/etc/vmware-tools/locations
+			elif [ "${x}" == "/etc/vmware-tools/not_configured" ] ; then
+				echo "" >> ${D}/etc/vmware-tools/locations
+			else
+				echo -n " " >> ${D}/etc/vmware-tools/locations
+				#perl -e "@a = stat('${D}${x}'); print \$a[9]" >> ${D}/etc/vmware/locations
+				find ${D}${x} -printf %T@ >> ${D}/etc/vmware-tools/locations
+				echo "" >> ${D}/etc/vmware-tools/locations
+			fi
+		fi
+	done
+	einfo "To start using the vmware-tools, please run the following:"
+	einfo
+	einfo "  ${dir}/bin/vmware-config-tools.pl"
+	einfo "  rc-update add vmware-tools default"
+	einfo "  /etc/init.d/vmware-tools start"
+	einfo
+	einfo "Please report all bugs to http://bugs.gentoo.org/"
+}