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.

Package-Manager: portage-2.1.2_rc1-r6

9 files changed, 200 insertions, 17 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/Manifest b/app-emulation/vmware-workstation-tools/Manifest
index 5d54c4e46388..7bc07dd23696 100644
--- a/app-emulation/vmware-workstation-tools/Manifest
+++ b/app-emulation/vmware-workstation-tools/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 5.5.1/000_all_initd-scripts.patch 1339 RMD160 0b074f1001c7fac558be71e764b2511a6612e44a SHA1 c39d057e66bc4e6a0eaba413f6813682176e0bc1 SHA256 5c430054d25e3fd2632d1496b10f55e93b5eed96859eeab1269164f6600ad02c
+MD5 e0995d0a6484d507abc077ea4bbc51b0 files/5.5.1/000_all_initd-scripts.patch 1339
+RMD160 0b074f1001c7fac558be71e764b2511a6612e44a files/5.5.1/000_all_initd-scripts.patch 1339
+SHA256 5c430054d25e3fd2632d1496b10f55e93b5eed96859eeab1269164f6600ad02c files/5.5.1/000_all_initd-scripts.patch 1339
 AUX 90vmware-tools 88 RMD160 0b7743c0c55d5ab36684c274f3bba3d92239090e SHA1 f56dae84f0fdd0844184c9e497e87c9201893d51 SHA256 137040e747111019299cf7c3a4d668fec68ee848e1131e54802fd164e9b98f27
 MD5 ecd5e9b34bd5e5ce29955c46b7fc4cca files/90vmware-tools 88
 RMD160 0b7743c0c55d5ab36684c274f3bba3d92239090e files/90vmware-tools 88
@@ -21,32 +25,47 @@ AUX xorg.conf 2646 RMD160 c3e2e153b3b9520fc8d5fa20e9e8f7a6c3790084 SHA1 a44f4240
 MD5 bd0505ab92d03f82b898858d45787f58 files/xorg.conf 2646
 RMD160 c3e2e153b3b9520fc8d5fa20e9e8f7a6c3790084 files/xorg.conf 2646
 SHA256 2503352f7fd53f23e51d53017f76167a2da0fdfbb9eb434c85573108c6bc53c8 files/xorg.conf 2646
+DIST vmware-any-any-update104.tar.gz 297243 RMD160 426616f026de409ca057ec1a0913dc9b3d43ef03 SHA1 9ca5224d832f2b0c0041a1e6afa0103915cdad0f SHA256 c0a9efad2677e93ed914e296131916f8b316377644c5d8c716e6575cd58b3c69
+EBUILD vmware-workstation-tools-4.5.3-r1.ebuild 2301 RMD160 1e7b33017b639ce5708fd3a40add85cc8f0c2352 SHA1 22dfbabf10091620fe748c081ae4b9cbd7c1e99a SHA256 bb332934ff1a2a67b6c6e8b934b9c05d27816651512c8208d73eb539f3403421
+MD5 55f2bffb6f6d4513a0245f0a88a90347 vmware-workstation-tools-4.5.3-r1.ebuild 2301
+RMD160 1e7b33017b639ce5708fd3a40add85cc8f0c2352 vmware-workstation-tools-4.5.3-r1.ebuild 2301
+SHA256 bb332934ff1a2a67b6c6e8b934b9c05d27816651512c8208d73eb539f3403421 vmware-workstation-tools-4.5.3-r1.ebuild 2301
 EBUILD vmware-workstation-tools-4.5.3.ebuild 4879 RMD160 6299464c97c9336ee64b7db98639a3c27aef1a8b SHA1 a20e3133c16336b5d7ae46230e9eac764e56e801 SHA256 297d9273785c64f8094e760684637594f41f4e63f90a99845891149db0e7cd48
 MD5 f226c0b882f1b8c19a11788a14a85d70 vmware-workstation-tools-4.5.3.ebuild 4879
 RMD160 6299464c97c9336ee64b7db98639a3c27aef1a8b vmware-workstation-tools-4.5.3.ebuild 4879
 SHA256 297d9273785c64f8094e760684637594f41f4e63f90a99845891149db0e7cd48 vmware-workstation-tools-4.5.3.ebuild 4879
+EBUILD vmware-workstation-tools-5.5.1-r2.ebuild 842 RMD160 939bd39ce57b18f8dc7767b20cd0ec1012d95122 SHA1 d557262f0becb6d0f03e3c409e2f7ae43ef2f863 SHA256 053efd6c82caeb8c6ea85d632beda08c33a33d010a50bd0702c09cbd659de284
+MD5 71bfa52e45bda653fde6095f8e69d51b vmware-workstation-tools-5.5.1-r2.ebuild 842
+RMD160 939bd39ce57b18f8dc7767b20cd0ec1012d95122 vmware-workstation-tools-5.5.1-r2.ebuild 842
+SHA256 053efd6c82caeb8c6ea85d632beda08c33a33d010a50bd0702c09cbd659de284 vmware-workstation-tools-5.5.1-r2.ebuild 842
 EBUILD vmware-workstation-tools-5.5.1.ebuild 4601 RMD160 d0b8b3ca51d92d183e2194a264fda2a401856898 SHA1 8c1fe23c0c876d4433496b801daed8cf588ce487 SHA256 a3ca0d1b577c3cb9550c3551f59a2ae27146e80c8f0bf4c08805a54a6c464a5c
 MD5 6616917fe8e605befe065181fdaa3be4 vmware-workstation-tools-5.5.1.ebuild 4601
 RMD160 d0b8b3ca51d92d183e2194a264fda2a401856898 vmware-workstation-tools-5.5.1.ebuild 4601
 SHA256 a3ca0d1b577c3cb9550c3551f59a2ae27146e80c8f0bf4c08805a54a6c464a5c vmware-workstation-tools-5.5.1.ebuild 4601
-MISC ChangeLog 4580 RMD160 3ef1eb33564214fb102bff68b9c79896f5fe7352 SHA1 e19d7a4dc6250bb33d37d45562a5656491a4e767 SHA256 dcf47b03a083aa0d61ae0c13d4e9e27c970278ec8d452642261be54c7ff3f3ef
-MD5 59e96dbbfb35a082adcc8aedd2dc5c02 ChangeLog 4580
-RMD160 3ef1eb33564214fb102bff68b9c79896f5fe7352 ChangeLog 4580
-SHA256 dcf47b03a083aa0d61ae0c13d4e9e27c970278ec8d452642261be54c7ff3f3ef ChangeLog 4580
+MISC ChangeLog 5013 RMD160 2f77b2a320809d2debf564b239915420ff707f59 SHA1 685c1839715314ad55263964916dee3e1c7b0ddb SHA256 9e906f9d50666276368dc47556e6188dc19a6c472045991bec32584468bee6c1
+MD5 e06cb1311983cde056ed457603f697d0 ChangeLog 5013
+RMD160 2f77b2a320809d2debf564b239915420ff707f59 ChangeLog 5013
+SHA256 9e906f9d50666276368dc47556e6188dc19a6c472045991bec32584468bee6c1 ChangeLog 5013
 MISC metadata.xml 159 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 SHA1 f46b02a39bcd0165558de67ff4256cfc812418a3 SHA256 8581ae1c90a48f50fa0542c7fb28cb8984baaf12f50fa18f33e467081effb215
 MD5 7cc95faad4185e8ed375248bc73a17fc metadata.xml 159
 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 metadata.xml 159
 SHA256 8581ae1c90a48f50fa0542c7fb28cb8984baaf12f50fa18f33e467081effb215 metadata.xml 159
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-vmware-workstation-tools-4.5.3 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-vmware-workstation-tools-4.5.3 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-vmware-workstation-tools-4.5.3 1
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-vmware-workstation-tools-5.5.1 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-vmware-workstation-tools-5.5.1 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-vmware-workstation-tools-5.5.1 1
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-vmware-workstation-tools-4.5.3 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-vmware-workstation-tools-4.5.3 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-vmware-workstation-tools-4.5.3 0
+MD5 72f72907eef594a978b2704a6cf2b745 files/digest-vmware-workstation-tools-4.5.3-r1 274
+RMD160 559b8a659200406b9830e697e7616afcb658ff18 files/digest-vmware-workstation-tools-4.5.3-r1 274
+SHA256 97aaec03f8f451be30c7d64ffcde48826c1bf7b63395eca863d0a31deea95130 files/digest-vmware-workstation-tools-4.5.3-r1 274
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-vmware-workstation-tools-5.5.1 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-vmware-workstation-tools-5.5.1 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-vmware-workstation-tools-5.5.1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-vmware-workstation-tools-5.5.1-r2 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-vmware-workstation-tools-5.5.1-r2 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-vmware-workstation-tools-5.5.1-r2 0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFEjzcZkT4lNIS36YERAvFnAJ44OW0xsIZnhU8chur0rs0ZINYHaACgrWzj
-/lRYA5dbWIc/euyU6nWHa2A=
-=G2OB
+iD8DBQFFYiHTkT4lNIS36YERAsm2AKCtC1q3A6R0Ycc1CkgzLS2uic+TVACff+dp
+8XT5jU2AiwZXtSif+0zYucg=
+=Rad0
 -----END PGP SIGNATURE-----
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
+}