Initial updates for bug #88307. This is not quite complete yet, nor tested, so the package is currently masked. I am working on making this much easier and more transparent for the user, by reusing code from the vmware-workstation ebuilds.

Package-Manager: portage-2.1_pre9-r4

8 files changed, 181 insertions, 104 deletions

diff --git a/app-emulation/vmware-workstation-tools/ChangeLog b/app-emulation/vmware-workstation-tools/ChangeLog
index 38a910e84350..f601c30236ed 100644
--- a/app-emulation/vmware-workstation-tools/ChangeLog
+++ b/app-emulation/vmware-workstation-tools/ChangeLog
@@ -1,6 +1,16 @@
 # 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.3 2006/05/08 13:27:48 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation-tools/ChangeLog,v 1.4 2006/05/08 13:56:33 wolf31o2 Exp $
+
+  08 May 2006; Chris Gianelloni <wolf31o2@gentoo.org> files/4.5.2/locations,
+  files/5.0.0/locations, files/4.5.2/vmware-workstation-tools,
+  files/5.0.0/vmware-workstation-tools,
+  vmware-workstation-tools-4.5.2.ebuild,
+  vmware-workstation-tools-5.0.0.ebuild:
+  Initial updates for bug #88307. This is not quite complete yet, nor tested,
+  so the package is currently masked. I am working on making this much easier
+  and more transparent for the user, by reusing code from the
+  vmware-workstation ebuilds.
 
   08 May 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   files/4.5.2/vmware-workstation-tools,
diff --git a/app-emulation/vmware-workstation-tools/Manifest b/app-emulation/vmware-workstation-tools/Manifest
index fafe1ec5d30f..d662da639ae4 100644
--- a/app-emulation/vmware-workstation-tools/Manifest
+++ b/app-emulation/vmware-workstation-tools/Manifest
@@ -1,41 +1,41 @@
-AUX 4.5.2/locations 874 RMD160 5a01cc0605d8147d23c25384d409b792daedba41 SHA1 34758dfa2751b1f04044c89c03b879024e67ca0e SHA256 8ea84a436fd9a135c6ffb52b9c0e53f71ce13009e19e2d01eedcdf19ba1bb40c size 874
-MD5 7f6694e67686fa494cb860db3f6a87b4 files/4.5.2/locations 874
-RMD160 5a01cc0605d8147d23c25384d409b792daedba41 files/4.5.2/locations 874
-SHA256 8ea84a436fd9a135c6ffb52b9c0e53f71ce13009e19e2d01eedcdf19ba1bb40c files/4.5.2/locations 874
-AUX 4.5.2/vmware-workstation-tools 1982 RMD160 96927f891e8f186046a13472cfd8e1dbc39fc0ca SHA1 170aed80ab3dfb883abbeb51e1f906e6a03ed659 SHA256 61d0f7e46a67a81f7e25e060de004088e6d2bf6a89f3cbc3e1ad308a1d66a8f2 size 1982
-MD5 e4e213e42b1bd4109334371da9f7bf57 files/4.5.2/vmware-workstation-tools 1982
-RMD160 96927f891e8f186046a13472cfd8e1dbc39fc0ca files/4.5.2/vmware-workstation-tools 1982
-SHA256 61d0f7e46a67a81f7e25e060de004088e6d2bf6a89f3cbc3e1ad308a1d66a8f2 files/4.5.2/vmware-workstation-tools 1982
+AUX 4.5.2/locations 888 RMD160 dc354044991c02a2c0ed853593948db9577b2056 SHA1 cb992fd5ec897ea7219f4ed767f665d8d8e58036 SHA256 e4f604767e21812ddb15aa3f1f16eaa04cadc7e7e8615170660c464f3b764f39 size 888
+MD5 4eb752b6e3e2e4358128e248ef892ed3 files/4.5.2/locations 888
+RMD160 dc354044991c02a2c0ed853593948db9577b2056 files/4.5.2/locations 888
+SHA256 e4f604767e21812ddb15aa3f1f16eaa04cadc7e7e8615170660c464f3b764f39 files/4.5.2/locations 888
+AUX 4.5.2/vmware-workstation-tools 1982 RMD160 131726b2d565b282ae87b8d8dee7ecea4f3c5cd7 SHA1 5745691b558d562eabe98147c3ccb303bc8917c5 SHA256 e57cd6429a2f691e6a4b66609ad100af5d394844a8b3d786377e1925eeaaecac size 1982
+MD5 ba90c2b68a85575ae7fcad613cf2210a files/4.5.2/vmware-workstation-tools 1982
+RMD160 131726b2d565b282ae87b8d8dee7ecea4f3c5cd7 files/4.5.2/vmware-workstation-tools 1982
+SHA256 e57cd6429a2f691e6a4b66609ad100af5d394844a8b3d786377e1925eeaaecac files/4.5.2/vmware-workstation-tools 1982
 AUX 4.5.2/xorg.conf 2646 RMD160 c3e2e153b3b9520fc8d5fa20e9e8f7a6c3790084 SHA1 a44f4240f19390a6707da4313139160ee6972da0 SHA256 2503352f7fd53f23e51d53017f76167a2da0fdfbb9eb434c85573108c6bc53c8 size 2646
 MD5 bd0505ab92d03f82b898858d45787f58 files/4.5.2/xorg.conf 2646
 RMD160 c3e2e153b3b9520fc8d5fa20e9e8f7a6c3790084 files/4.5.2/xorg.conf 2646
 SHA256 2503352f7fd53f23e51d53017f76167a2da0fdfbb9eb434c85573108c6bc53c8 files/4.5.2/xorg.conf 2646
-AUX 5.0.0/locations 874 RMD160 5a01cc0605d8147d23c25384d409b792daedba41 SHA1 34758dfa2751b1f04044c89c03b879024e67ca0e SHA256 8ea84a436fd9a135c6ffb52b9c0e53f71ce13009e19e2d01eedcdf19ba1bb40c size 874
-MD5 7f6694e67686fa494cb860db3f6a87b4 files/5.0.0/locations 874
-RMD160 5a01cc0605d8147d23c25384d409b792daedba41 files/5.0.0/locations 874
-SHA256 8ea84a436fd9a135c6ffb52b9c0e53f71ce13009e19e2d01eedcdf19ba1bb40c files/5.0.0/locations 874
-AUX 5.0.0/vmware-workstation-tools 1984 RMD160 ca6ce3502eaecd9a424335c11a564f66ba58d959 SHA1 5be7555cafa3df665ed62e1361791c74d1803675 SHA256 e51ee06f5b47dff22752bcec4ea0765b45933392fc6a975772b5b5211c377237 size 1984
-MD5 a07114bb02221f21451f5d9fdf232867 files/5.0.0/vmware-workstation-tools 1984
-RMD160 ca6ce3502eaecd9a424335c11a564f66ba58d959 files/5.0.0/vmware-workstation-tools 1984
-SHA256 e51ee06f5b47dff22752bcec4ea0765b45933392fc6a975772b5b5211c377237 files/5.0.0/vmware-workstation-tools 1984
+AUX 5.0.0/locations 888 RMD160 dc354044991c02a2c0ed853593948db9577b2056 SHA1 cb992fd5ec897ea7219f4ed767f665d8d8e58036 SHA256 e4f604767e21812ddb15aa3f1f16eaa04cadc7e7e8615170660c464f3b764f39 size 888
+MD5 4eb752b6e3e2e4358128e248ef892ed3 files/5.0.0/locations 888
+RMD160 dc354044991c02a2c0ed853593948db9577b2056 files/5.0.0/locations 888
+SHA256 e4f604767e21812ddb15aa3f1f16eaa04cadc7e7e8615170660c464f3b764f39 files/5.0.0/locations 888
+AUX 5.0.0/vmware-workstation-tools 1984 RMD160 c28a4b43a6b22eab71a387e9a9c55355ae6a3d48 SHA1 a2b16a6fa0f1740aba11ce60577e92ea48db6a95 SHA256 fef4a2931213c693dc9f74ec69d4277c6e0d71e13007ca034e2f8c8e218fd83a size 1984
+MD5 598ef875b1413f773a405652c681b39b files/5.0.0/vmware-workstation-tools 1984
+RMD160 c28a4b43a6b22eab71a387e9a9c55355ae6a3d48 files/5.0.0/vmware-workstation-tools 1984
+SHA256 fef4a2931213c693dc9f74ec69d4277c6e0d71e13007ca034e2f8c8e218fd83a files/5.0.0/vmware-workstation-tools 1984
 AUX 5.0.0/xorg.conf 2646 RMD160 c3e2e153b3b9520fc8d5fa20e9e8f7a6c3790084 SHA1 a44f4240f19390a6707da4313139160ee6972da0 SHA256 2503352f7fd53f23e51d53017f76167a2da0fdfbb9eb434c85573108c6bc53c8 size 2646
 MD5 bd0505ab92d03f82b898858d45787f58 files/5.0.0/xorg.conf 2646
 RMD160 c3e2e153b3b9520fc8d5fa20e9e8f7a6c3790084 files/5.0.0/xorg.conf 2646
 SHA256 2503352f7fd53f23e51d53017f76167a2da0fdfbb9eb434c85573108c6bc53c8 files/5.0.0/xorg.conf 2646
 DIST VMwareTools-5.0.0-13124.tar.gz 11370290 size 11370290
 DIST vmware-linux-tools.tar.gz 6630450 size 6630450
-EBUILD vmware-workstation-tools-4.5.2.ebuild 2018 RMD160 14cd807dc8f2e7b4f9c23ae654471ea4e9ed7fca SHA1 9ebccf62d02e2582e9f7057971d01a30d747d67d SHA256 1efb8ab25cdaff680379824d14434028afc5c19c7a2cbfdf0f635139adcd603e size 2018
-MD5 ffc1f4bd6494683ad3192ead2724c1a5 vmware-workstation-tools-4.5.2.ebuild 2018
-RMD160 14cd807dc8f2e7b4f9c23ae654471ea4e9ed7fca vmware-workstation-tools-4.5.2.ebuild 2018
-SHA256 1efb8ab25cdaff680379824d14434028afc5c19c7a2cbfdf0f635139adcd603e vmware-workstation-tools-4.5.2.ebuild 2018
-EBUILD vmware-workstation-tools-5.0.0.ebuild 2049 RMD160 688cb33de27de8571ce07587841e6451190a65a5 SHA1 9879069089034716ac43d35528755c8ff8a815c9 SHA256 99cc000c9ce5cefcf0eb88e4f78fab1d2e36a6e35c4b5927c7e1a531fad19d4c size 2049
-MD5 b97b2798792f6af66b0592e6486284ed vmware-workstation-tools-5.0.0.ebuild 2049
-RMD160 688cb33de27de8571ce07587841e6451190a65a5 vmware-workstation-tools-5.0.0.ebuild 2049
-SHA256 99cc000c9ce5cefcf0eb88e4f78fab1d2e36a6e35c4b5927c7e1a531fad19d4c vmware-workstation-tools-5.0.0.ebuild 2049
-MISC ChangeLog 1981 RMD160 62c7d53739b0b6873e40e9afd3100001a699dc4a SHA1 fc964e87368ef509816f5c28ed8132aeb40d771c SHA256 7298c3ab65cec662cb162f7d6ec03d83e361490d0da8aa7753494043eed6980e size 1981
-MD5 b427d33abe4ec0a27095251a75b39a38 ChangeLog 1981
-RMD160 62c7d53739b0b6873e40e9afd3100001a699dc4a ChangeLog 1981
-SHA256 7298c3ab65cec662cb162f7d6ec03d83e361490d0da8aa7753494043eed6980e ChangeLog 1981
+EBUILD vmware-workstation-tools-4.5.2.ebuild 3746 RMD160 da7601af3a55b44ec8fc5d7dbda2c70e2027428f SHA1 6c083f0062c4839309092791ae59458f849995b5 SHA256 ec03c4d3a542d767853cd50a9d50f59c1e75edacf810f298a0520b16043eb89b size 3746
+MD5 d0ae096c42e75527d3c566431fe79037 vmware-workstation-tools-4.5.2.ebuild 3746
+RMD160 da7601af3a55b44ec8fc5d7dbda2c70e2027428f vmware-workstation-tools-4.5.2.ebuild 3746
+SHA256 ec03c4d3a542d767853cd50a9d50f59c1e75edacf810f298a0520b16043eb89b vmware-workstation-tools-4.5.2.ebuild 3746
+EBUILD vmware-workstation-tools-5.0.0.ebuild 3751 RMD160 334122b1aa057e935af54fe261216cad71bfd270 SHA1 642c96e8f581ad5084c9ba9fdae830dfaf271889 SHA256 28fedb072c795ef9da2f2b55d605351cd68f68bdc9d7f53e2b48fee67c665de6 size 3751
+MD5 275bd0fd835b78298caf4b4076485811 vmware-workstation-tools-5.0.0.ebuild 3751
+RMD160 334122b1aa057e935af54fe261216cad71bfd270 vmware-workstation-tools-5.0.0.ebuild 3751
+SHA256 28fedb072c795ef9da2f2b55d605351cd68f68bdc9d7f53e2b48fee67c665de6 vmware-workstation-tools-5.0.0.ebuild 3751
+MISC ChangeLog 2492 RMD160 681bc4c99aaa6172d2a30f7f2710b4808aafeb27 SHA1 d9dd79d60ab62e503c09c79b12c6f64f4b5b4f10 SHA256 8a8c7867ea4cf0680686a7033ce1949517c4fc30efcdded66a216764541bb995 size 2492
+MD5 b48cadd2fc4b478039dd240741b4bc13 ChangeLog 2492
+RMD160 681bc4c99aaa6172d2a30f7f2710b4808aafeb27 ChangeLog 2492
+SHA256 8a8c7867ea4cf0680686a7033ce1949517c4fc30efcdded66a216764541bb995 ChangeLog 2492
 MISC metadata.xml 159 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 SHA1 f46b02a39bcd0165558de67ff4256cfc812418a3 SHA256 8581ae1c90a48f50fa0542c7fb28cb8984baaf12f50fa18f33e467081effb215 size 159
 MD5 7cc95faad4185e8ed375248bc73a17fc metadata.xml 159
 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 metadata.xml 159
diff --git a/app-emulation/vmware-workstation-tools/files/4.5.2/locations b/app-emulation/vmware-workstation-tools/files/4.5.2/locations
index 478b1e4d1af4..df9539b4bff3 100644
--- a/app-emulation/vmware-workstation-tools/files/4.5.2/locations
+++ b/app-emulation/vmware-workstation-tools/files/4.5.2/locations
@@ -8,8 +8,8 @@ answer BUILDR_vmhgfs yes
 answer HEADER_DIR /lib/modules/2.6.7-gentoo-r9/build/include
 answer VMHGFS_CONFED yes
 answer BINDIR /usr/bin
-answer INITDIR /tmp
-answer INITSCRIPTSDIR /tmp
+answer INITDIR /etc/init.d
+answer INITSCRIPTSDIR /etc/init.d
 answer SBINDIR /usr/sbin
 answer LIBDIR /usr/lib/vmware-tools
 directory /etc/vmware-tools
diff --git a/app-emulation/vmware-workstation-tools/files/4.5.2/vmware-workstation-tools b/app-emulation/vmware-workstation-tools/files/4.5.2/vmware-workstation-tools
index 46ed6b782642..b0ee404eeed1 100755
--- a/app-emulation/vmware-workstation-tools/files/4.5.2/vmware-workstation-tools
+++ b/app-emulation/vmware-workstation-tools/files/4.5.2/vmware-workstation-tools
@@ -1,6 +1,6 @@
 #!/sbin/runscript
 #
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation-tools/files/4.5.2/vmware-workstation-tools,v 1.2 2006/05/08 13:27:49 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation-tools/files/4.5.2/vmware-workstation-tools,v 1.3 2006/05/08 13:56:34 wolf31o2 Exp $
 #
 # This script manages the services needed to run VMware software
 
@@ -30,12 +30,12 @@ vmware_tools_load_module() {
    if [ "`isLoaded "$1"`" = 'yes' ]; then
       /sbin/rmmod "$1"
    fi
-   /sbin/insmod -s -f "/lib/modules/`uname -r`/misc/$1.o" >/dev/null 2>&1 || /sbin/insmod -s -f "$1" >/dev/null 2>&1 || exit 1
+   /sbin/insmod -s -f "/lib/modules/`uname -r`/misc/$1.o" >/dev/null 2>&1 || /sbin/insmod -s -f "$1" >/dev/null 2>&1 || eend 1
 }
 
 vmware_tools_unload_module() {
    if [ "`isLoaded "$1"`" = 'yes' ]; then
-      /sbin/rmmod "$1" >/dev/null 2>&1 || exit 1
+      /sbin/rmmod "$1" >/dev/null 2>&1 || eend 1
    fi
 }
 
@@ -61,7 +61,7 @@ checkconfig ()
 
 start ()
 {
-	checkconfig || exit 1
+	checkconfig || eend 1
 
 	ebegin "Loading vmware filesystem"
 	vmware_tools_load_module $VMWARE_VMHGFS_MOD
diff --git a/app-emulation/vmware-workstation-tools/files/5.0.0/locations b/app-emulation/vmware-workstation-tools/files/5.0.0/locations
index 478b1e4d1af4..df9539b4bff3 100644
--- a/app-emulation/vmware-workstation-tools/files/5.0.0/locations
+++ b/app-emulation/vmware-workstation-tools/files/5.0.0/locations
@@ -8,8 +8,8 @@ answer BUILDR_vmhgfs yes
 answer HEADER_DIR /lib/modules/2.6.7-gentoo-r9/build/include
 answer VMHGFS_CONFED yes
 answer BINDIR /usr/bin
-answer INITDIR /tmp
-answer INITSCRIPTSDIR /tmp
+answer INITDIR /etc/init.d
+answer INITSCRIPTSDIR /etc/init.d
 answer SBINDIR /usr/sbin
 answer LIBDIR /usr/lib/vmware-tools
 directory /etc/vmware-tools
diff --git a/app-emulation/vmware-workstation-tools/files/5.0.0/vmware-workstation-tools b/app-emulation/vmware-workstation-tools/files/5.0.0/vmware-workstation-tools
index bced33d31939..01b32c3be87a 100755
--- a/app-emulation/vmware-workstation-tools/files/5.0.0/vmware-workstation-tools
+++ b/app-emulation/vmware-workstation-tools/files/5.0.0/vmware-workstation-tools
@@ -1,6 +1,6 @@
 #!/sbin/runscript
 #
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation-tools/files/5.0.0/vmware-workstation-tools,v 1.2 2006/05/08 13:27:49 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation-tools/files/5.0.0/vmware-workstation-tools,v 1.3 2006/05/08 13:56:34 wolf31o2 Exp $
 #
 # This script manages the services needed to run VMware software
 
@@ -30,12 +30,12 @@ vmware_tools_load_module() {
    if [ "`isLoaded "$1"`" = 'yes' ]; then
       /sbin/rmmod "$1"
    fi
-   /sbin/insmod -s -f "/lib/modules/`uname -r`/misc/$1.o" >/dev/null 2>&1 || /sbin/insmod -s -f "$1" >/dev/null 2>&1 || exit 1
+   /sbin/insmod -s -f "/lib/modules/`uname -r`/misc/$1.o" >/dev/null 2>&1 || /sbin/insmod -s -f "$1" >/dev/null 2>&1 || eend 1
 }
 
 vmware_tools_unload_module() {
    if [ "`isLoaded "$1"`" = 'yes' ]; then
-      /sbin/rmmod "$1" >/dev/null 2>&1 || exit 1
+      /sbin/rmmod "$1" >/dev/null 2>&1 || eend 1
    fi
 }
 
@@ -61,7 +61,7 @@ checkconfig ()
 
 start ()
 {
-	checkconfig || exit 1
+	checkconfig || eend 1
 
 	ebegin "Loading vmware filesystem"
 	vmware_tools_load_module $VMWARE_VMHGFS_MOD
diff --git a/app-emulation/vmware-workstation-tools/vmware-workstation-tools-4.5.2.ebuild b/app-emulation/vmware-workstation-tools/vmware-workstation-tools-4.5.2.ebuild
index 495be2f927de..ea656ba51bf1 100644
--- a/app-emulation/vmware-workstation-tools/vmware-workstation-tools-4.5.2.ebuild
+++ b/app-emulation/vmware-workstation-tools/vmware-workstation-tools-4.5.2.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.2.ebuild,v 1.2 2006/05/08 13:08:44 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation-tools/vmware-workstation-tools-4.5.2.ebuild,v 1.3 2006/05/08 13:56:33 wolf31o2 Exp $
 
 inherit eutils
 
@@ -17,62 +17,96 @@ IUSE="X"
 RESTRICT="fetch"
 
 DEPEND=""
-#RDEPEND=""
+RDEPEND="sys-apps/pciutils"
+
+dir=/opt/vmware/tools
+Ddir=${D}/${dir}
 
 S=${WORKDIR}/vmware-tools-distrib
 
 src_install() {
+	into ${dir}
 	# install the binaries
 	dosbin sbin/vmware-checkvm
 	dosbin sbin/vmware-guestd
 	dobin bin/vmware-config-tools.pl
 	dobin bin/vmware-toolbox
 
-	# NOTE: we deliberately do NOT install the vmware-uninstall-tools.pl
-	# script
-	#
-	# if you want to uninstall vmware from this machine, use Portage!
-
 	# install the config files
 	insinto /etc/vmware-tools
-	for x in \
-		installer.sh \
-		not_configured \
-		poweroff-vm-default \
-		poweron-vm-default \
-		resume-vm-default \
-		suspend-vm-default \
-	; do
-		doins etc/$x
-	done
-
-	# populate the locations file
-	# we replace the timestamp in that file with the current
-	# timestamp
-
-	insinto /etc/vmware-tools
-	doins ${FILESDIR}/${PV}/locations
-	timestamp="`date '+%s'`"
-	sed -i "s|1109770680|$timestamp|g" ${D}/etc/vmware-tools/locations
+	doins etc/{installer.sh,not_configured,{powero{ff,n},resume,suspend}-vm-default
 
 	# install the library files
 	mkdir -p ${D}/usr/lib/vmware-tools
 	cp -r lib/* ${D}/usr/lib/vmware-tools
 
 	# install the init scripts
-	doinitd ${FILESDIR}/${PV}/vmware-linux-tools
+	doinitd ${FILESDIR}/${PV}/${PN}
 
 	# if we have X, install the default config
-	if useq X ; then
+	if use X ; then
 		insinto /etc/X11
 		doins ${FILESDIR}/${PV}/xorg.conf
 	fi
 
-	# and we're done
+	dodir /etc/vmware/init.d
+	dodir /etc/vmware/init.d/rc0.d
+	dodir /etc/vmware/init.d/rc1.d
+	dodir /etc/vmware/init.d/rc2.d
+	dodir /etc/vmware/init.d/rc3.d
+	dodir /etc/vmware/init.d/rc4.d
+	dodir /etc/vmware/init.d/rc5.d
+	dodir /etc/vmware/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/init.d/rc{0,1,2,3,4,5,6}.d
+
+	# 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 RUN_CONFIGURATOR no" >> ${locations}
+	echo "answer INITDIR /etc/vmware/init.d" >> ${locations}
+	echo "answer INITSCRIPTSDIR /etc/vmware/init.d" >> ${locations}
+
 }
 
-pkg_postinst ()
-{
+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/locations file."
+	d=`echo ${D} | wc -c`
+	for x in `find ${Ddir} ${D}/etc/vmware` ; do
+		x="`echo ${x} | cut -c ${d}-`"
+		if [ -d ${D}/${x} ] ; then
+			echo "directory ${x}" >> ${D}/etc/vmware/locations
+		else
+			echo -n "file ${x}" >> ${D}/etc/vmware/locations
+			if [ "${x}" == "/etc/vmware/locations" ] ; then
+				echo "" >> ${D}/etc/vmware/locations
+			elif [ "${x}" == "/etc/vmware/not_configured" ] ; then
+				echo "" >> ${D}/etc/vmware/locations
+			else
+				echo -n " " >> ${D}/etc/vmware/locations
+				#perl -e "@a = stat('${D}${x}'); print \$a[9]" >> ${D}/etc/vmware/locations
+				find ${D}${x} -printf %T@ >> ${D}/etc/vmware/locations
+				echo "" >> ${D}/etc/vmware/locations
+			fi
+		fi
+	done
 	einfo "To start using the vmware-tools, please run the following:"
 	einfo
 	einfo "  /usr/bin/vmware-config-tools.pl"
diff --git a/app-emulation/vmware-workstation-tools/vmware-workstation-tools-5.0.0.ebuild b/app-emulation/vmware-workstation-tools/vmware-workstation-tools-5.0.0.ebuild
index 5245c078f40d..2016b8643764 100644
--- a/app-emulation/vmware-workstation-tools/vmware-workstation-tools-5.0.0.ebuild
+++ b/app-emulation/vmware-workstation-tools/vmware-workstation-tools-5.0.0.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-5.0.0.ebuild,v 1.2 2006/05/08 13:08:44 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation-tools/vmware-workstation-tools-5.0.0.ebuild,v 1.3 2006/05/08 13:56:33 wolf31o2 Exp $
 
 inherit eutils
 
@@ -9,8 +9,7 @@ HOMEPAGE="http://www.vmware.com/"
 
 # the vmware-tools sources are part of the vmware virtual machine;
 # they must be installed by hand
-MY_PN="VMwareTools-5.0.0-13124"
-SRC_URI="http://www.vmware.com/${MY_PN}.tar.gz"
+SRC_URI="VMwareTools-5.0.0-13124.tar.gz"
 LICENSE="vmware"
 SLOT="0"
 KEYWORDS="~x86"
@@ -18,43 +17,24 @@ IUSE="X"
 RESTRICT="fetch"
 
 DEPEND=""
-#RDEPEND=""
+RDEPEND="sys-apps/pciutils"
+
+dir=/opt/vmware/tools
+Ddir=${D}/${dir}
 
 S=${WORKDIR}/vmware-tools-distrib
 
 src_install() {
+	into ${dir}
 	# install the binaries
 	dosbin sbin/vmware-checkvm
 	dosbin sbin/vmware-guestd
 	dobin bin/vmware-config-tools.pl
 	dobin bin/vmware-toolbox
 
-	# NOTE: we deliberately do NOT install the vmware-uninstall-tools.pl
-	# script
-	#
-	# if you want to uninstall vmware from this machine, use Portage!
-
 	# install the config files
 	insinto /etc/vmware-tools
-	for x in \
-		installer.sh \
-		not_configured \
-		poweroff-vm-default \
-		poweron-vm-default \
-		resume-vm-default \
-		suspend-vm-default \
-	; do
-		doins etc/$x
-	done
-
-	# populate the locations file
-	# we replace the timestamp in that file with the current
-	# timestamp
-
-	insinto /etc/vmware-tools
-	doins ${FILESDIR}/${PV}/locations
-	timestamp="`date '+%s'`"
-	sed -i "s|1109770680|$timestamp|g" ${D}/etc/vmware-tools/locations
+	doins etc/{installer.sh,not_configured,{powero{ff,n},resume,suspend}-vm-default
 
 	# install the library files
 	mkdir -p ${D}/usr/lib/vmware-tools
@@ -64,16 +44,69 @@ src_install() {
 	doinitd ${FILESDIR}/${PV}/${PN}
 
 	# if we have X, install the default config
-	if useq X ; then
+	if use X ; then
 		insinto /etc/X11
 		doins ${FILESDIR}/${PV}/xorg.conf
 	fi
 
-	# and we're done
+	dodir /etc/vmware/init.d
+	dodir /etc/vmware/init.d/rc0.d
+	dodir /etc/vmware/init.d/rc1.d
+	dodir /etc/vmware/init.d/rc2.d
+	dodir /etc/vmware/init.d/rc3.d
+	dodir /etc/vmware/init.d/rc4.d
+	dodir /etc/vmware/init.d/rc5.d
+	dodir /etc/vmware/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/init.d/rc{0,1,2,3,4,5,6}.d
+
+	# 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 RUN_CONFIGURATOR no" >> ${locations}
+	echo "answer INITDIR /etc/vmware/init.d" >> ${locations}
+	echo "answer INITSCRIPTSDIR /etc/vmware/init.d" >> ${locations}
+
 }
 
-pkg_postinst ()
-{
+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/locations file."
+	d=`echo ${D} | wc -c`
+	for x in `find ${Ddir} ${D}/etc/vmware` ; do
+		x="`echo ${x} | cut -c ${d}-`"
+		if [ -d ${D}/${x} ] ; then
+			echo "directory ${x}" >> ${D}/etc/vmware/locations
+		else
+			echo -n "file ${x}" >> ${D}/etc/vmware/locations
+			if [ "${x}" == "/etc/vmware/locations" ] ; then
+				echo "" >> ${D}/etc/vmware/locations
+			elif [ "${x}" == "/etc/vmware/not_configured" ] ; then
+				echo "" >> ${D}/etc/vmware/locations
+			else
+				echo -n " " >> ${D}/etc/vmware/locations
+				#perl -e "@a = stat('${D}${x}'); print \$a[9]" >> ${D}/etc/vmware/locations
+				find ${D}${x} -printf %T@ >> ${D}/etc/vmware/locations
+				echo "" >> ${D}/etc/vmware/locations
+			fi
+		fi
+	done
 	einfo "To start using the vmware-tools, please run the following:"
 	einfo
 	einfo "  /usr/bin/vmware-config-tools.pl"