Added new revisions which better make use of the vmware eclass. I'm hoping to get the new 5.5.2 and 5.5.3 versions into the tree soon, also.

(Portage version: 2.1.2_rc1-r6)

8 files changed, 167 insertions, 3 deletions

diff --git a/app-emulation/vmware-workstation-tools/ChangeLog b/app-emulation/vmware-workstation-tools/ChangeLog
index 90c3d125114b..69241350afdf 100644
--- a/app-emulation/vmware-workstation-tools/ChangeLog
+++ b/app-emulation/vmware-workstation-tools/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-emulation/vmware-workstation-tools
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation-tools/ChangeLog,v 1.11 2006/06/13 22:07:13 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation-tools/ChangeLog,v 1.12 2006/11/20 21:34:21 wolf31o2 Exp $
+
+*vmware-workstation-tools-5.5.1-r2 (20 Nov 2006)
+*vmware-workstation-tools-4.5.3-r1 (20 Nov 2006)
+
+  20 Nov 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/5.5.1/000_all_initd-scripts.patch,
+  +vmware-workstation-tools-4.5.3-r1.ebuild,
+  +vmware-workstation-tools-5.5.1-r2.ebuild:
+  Added new revisions which better make use of the vmware eclass. I'm hoping
+  to get the new 5.5.2 and 5.5.3 versions into the tree soon, also.
 
   13 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   files/vmware-workstation-tools.rc:
diff --git a/app-emulation/vmware-workstation-tools/files/5.5.1/000_all_initd-scripts.patch b/app-emulation/vmware-workstation-tools/files/5.5.1/000_all_initd-scripts.patch
new file mode 100644
index 000000000000..d64eb215ca76
--- /dev/null
+++ b/app-emulation/vmware-workstation-tools/files/5.5.1/000_all_initd-scripts.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/files/digest-vmware-workstation-tools-4.5.3 b/app-emulation/vmware-workstation-tools/files/digest-vmware-workstation-tools-4.5.3
index 8b137891791f..e69de29bb2d1 100644
--- a/app-emulation/vmware-workstation-tools/files/digest-vmware-workstation-tools-4.5.3
+++ b/app-emulation/vmware-workstation-tools/files/digest-vmware-workstation-tools-4.5.3
@@ -1 +0,0 @@
-
diff --git a/app-emulation/vmware-workstation-tools/files/digest-vmware-workstation-tools-4.5.3-r1 b/app-emulation/vmware-workstation-tools/files/digest-vmware-workstation-tools-4.5.3-r1
new file mode 100644
index 000000000000..797d0e95cbd1
--- /dev/null
+++ b/app-emulation/vmware-workstation-tools/files/digest-vmware-workstation-tools-4.5.3-r1
@@ -0,0 +1,3 @@
+MD5 8cba16d3f6b3723b43d555a5f7cbf850 vmware-any-any-update104.tar.gz 297243
+RMD160 426616f026de409ca057ec1a0913dc9b3d43ef03 vmware-any-any-update104.tar.gz 297243
+SHA256 c0a9efad2677e93ed914e296131916f8b316377644c5d8c716e6575cd58b3c69 vmware-any-any-update104.tar.gz 297243
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
index 8b137891791f..e69de29bb2d1 100644
--- 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
@@ -1 +0,0 @@
-
diff --git a/app-emulation/vmware-workstation-tools/files/digest-vmware-workstation-tools-5.5.1-r2 b/app-emulation/vmware-workstation-tools/files/digest-vmware-workstation-tools-5.5.1-r2
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/app-emulation/vmware-workstation-tools/files/digest-vmware-workstation-tools-5.5.1-r2
diff --git a/app-emulation/vmware-workstation-tools/vmware-workstation-tools-4.5.3-r1.ebuild b/app-emulation/vmware-workstation-tools/vmware-workstation-tools-4.5.3-r1.ebuild
new file mode 100644
index 000000000000..fd3c9e16c3bf
--- /dev/null
+++ b/app-emulation/vmware-workstation-tools/vmware-workstation-tools-4.5.3-r1.ebuild
@@ -0,0 +1,82 @@
+# 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-r1.ebuild,v 1.1 2006/11/20 21:34:21 wolf31o2 Exp $
+
+inherit eutils vmware
+
+DESCRIPTION="Guest-os tools for VMware Workstation"
+HOMEPAGE="http://www.vmware.com/"
+SRC_URI="http://ftp.cvut.cz/vmware/${ANY_ANY}.tar.gz
+	http://ftp.cvut.cz/vmware/obselete/${ANY_ANY}.tar.gz
+	http://knihovny.cvut.cz/ftp/pub/vmware/${ANY_ANY}.tar.gz
+	http://knihovny.cvut.cz/ftp/pub/vmware/obselete/${ANY_ANY}.tar.gz"
+#	http://ftp.cvut.cz/vmware/${TOOLS_ANY}.tar.gz
+#	http://ftp.cvut.cz/vmware/obselete/${TOOLS_ANY}.tar.gz
+#	http://knihovny.cvut.cz/ftp/pub/vmware/${TOOLS_ANY}.tar.gz
+#	http://knihovny.cvut.cz/ftp/pub/vmware/obselete/${TOOLS_ANY}.tar.gz"
+
+LICENSE="vmware"
+SLOT="0"
+KEYWORDS="-* ~x86"
+IUSE="X"
+RESTRICT="strip"
+
+RDEPEND="sys-apps/pciutils"
+
+dir=/opt/vmware/tools
+Ddir=${D}/${dir}
+
+TARBALL="vmware-linux-tools.tar.gz"
+#VMwareTools-5.0.0-13124.tar.gz
+MY_P=${TARBALL/.tar.gz/}
+
+S=${WORKDIR}/vmware-tools-distrib
+
+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 ${etcdir}
+	cp -pPR etc/* ${Detcdir} || die
+
+	# install the init scripts
+	newinitd ${FILESDIR}/${PN}.rc ${product} || die
+
+	# Environment
+	doenvd ${FILESDIR}/90${product} || 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 ${Detcdir}/init.d/${product} || die
+
+	vmware_run_questions || die
+}
+
+pkg_postinst() {
+	vmware_pkg_postinst
+	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/"
+}
diff --git a/app-emulation/vmware-workstation-tools/vmware-workstation-tools-5.5.1-r2.ebuild b/app-emulation/vmware-workstation-tools/vmware-workstation-tools-5.5.1-r2.ebuild
new file mode 100644
index 000000000000..8fb1cde1e6cb
--- /dev/null
+++ b/app-emulation/vmware-workstation-tools/vmware-workstation-tools-5.5.1-r2.ebuild
@@ -0,0 +1,40 @@
+# 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-r2.ebuild,v 1.1 2006/11/20 21:34:21 wolf31o2 Exp $
+
+inherit eutils vmware
+
+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"
+
+S=${WORKDIR}/vmware-tools-distrib
+
+RUN_UPDATE="no"
+
+dir=/opt/vmware/tools
+Ddir=${D}/${dir}
+
+TARBALL="VMwareTools-5.5.1-19175.tar.gz"
+MY_P=${TARBALL/.tar.gz/}
+
+src_install() {
+	vmware_src_install
+	
+	dodir ${dir}/sbin
+	keepdir ${dir}/sbin
+
+	# if we have X, install the default config
+	if use X ; then
+		insinto /etc/X11
+		doins ${FILESDIR}/xorg.conf
+	fi
+}