Fix a couple places where we're doing something on /etc/vmware instead of /etc/vmware-tools.

Package-Manager: portage-2.1_rc1-r2

4 files changed, 31 insertions, 25 deletions

diff --git a/app-emulation/vmware-workstation-tools/ChangeLog b/app-emulation/vmware-workstation-tools/ChangeLog
index 6dea79199bcb..339b7d8bb42b 100644
--- a/app-emulation/vmware-workstation-tools/ChangeLog
+++ b/app-emulation/vmware-workstation-tools/ChangeLog
@@ -1,6 +1,12 @@
 # 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.5 2006/05/10 16:11:09 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation-tools/ChangeLog,v 1.6 2006/05/19 18:28:38 wolf31o2 Exp $
+
+  19 May 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  vmware-workstation-tools-4.5.3.ebuild,
+  vmware-workstation-tools-5.0.0.ebuild:
+  Fix a couple places where we're doing something on /etc/vmware instead of
+  /etc/vmware-tools.
 
 *vmware-workstation-tools-4.5.3 (10 May 2006)
 
diff --git a/app-emulation/vmware-workstation-tools/Manifest b/app-emulation/vmware-workstation-tools/Manifest
index 33985e5b4a5a..cfb3f2ba18e9 100644
--- a/app-emulation/vmware-workstation-tools/Manifest
+++ b/app-emulation/vmware-workstation-tools/Manifest
@@ -14,18 +14,18 @@ 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
-EBUILD vmware-workstation-tools-4.5.3.ebuild 4557 RMD160 e4855812cc546e96797c8a8b728c332594f70efb SHA1 84fe4d1323eec1e344fb9e7273a3860ca562ac8a SHA256 38ebe3077ec6c9c3605c3f2b7ecf4d0412de998381765f48f75e13a33103e272 size 4557
-MD5 46b78c5469d6eb3f267bb7cbd031c236 vmware-workstation-tools-4.5.3.ebuild 4557
-RMD160 e4855812cc546e96797c8a8b728c332594f70efb vmware-workstation-tools-4.5.3.ebuild 4557
-SHA256 38ebe3077ec6c9c3605c3f2b7ecf4d0412de998381765f48f75e13a33103e272 vmware-workstation-tools-4.5.3.ebuild 4557
-EBUILD vmware-workstation-tools-5.0.0.ebuild 4567 RMD160 811adcddcd7f76e025e6f5cc42d40c363f54b3a6 SHA1 36c1302af9277a859e56040400297617ea1bbd45 SHA256 8b76feeae3648482f24f1754f03faca611d180fb43607d7f44eddf1306cf0c4f size 4567
-MD5 a3f324aa86a3a6ad0a0c0f5c6a5f23e4 vmware-workstation-tools-5.0.0.ebuild 4567
-RMD160 811adcddcd7f76e025e6f5cc42d40c363f54b3a6 vmware-workstation-tools-5.0.0.ebuild 4567
-SHA256 8b76feeae3648482f24f1754f03faca611d180fb43607d7f44eddf1306cf0c4f vmware-workstation-tools-5.0.0.ebuild 4567
-MISC ChangeLog 3346 RMD160 6fab1e0f2f740d1faea9057234bbcb83897ba905 SHA1 55084ba098621e665e88cecff367a236568b0740 SHA256 00017346cf72542b5b577ae577a954e31b964cd637495485bb2c43da0a25c937 size 3346
-MD5 4ed8bec0a967add86a9437a7c22fa7f2 ChangeLog 3346
-RMD160 6fab1e0f2f740d1faea9057234bbcb83897ba905 ChangeLog 3346
-SHA256 00017346cf72542b5b577ae577a954e31b964cd637495485bb2c43da0a25c937 ChangeLog 3346
+EBUILD vmware-workstation-tools-4.5.3.ebuild 4583 RMD160 0f934d5809a2c70f505c4149046b02526c60f609 SHA1 34290fdb8012e290156703875b3fac43cdad0788 SHA256 ecab50f3f551369e784a55d8cf2c1e0f92f8c2be3c592263c644671b061d0008 size 4583
+MD5 fed6bc9a1ab68e3461c7a05207c3afc6 vmware-workstation-tools-4.5.3.ebuild 4583
+RMD160 0f934d5809a2c70f505c4149046b02526c60f609 vmware-workstation-tools-4.5.3.ebuild 4583
+SHA256 ecab50f3f551369e784a55d8cf2c1e0f92f8c2be3c592263c644671b061d0008 vmware-workstation-tools-4.5.3.ebuild 4583
+EBUILD vmware-workstation-tools-5.0.0.ebuild 4593 RMD160 227ffada08cfc691cba157b16c0a7054a0e4cae6 SHA1 0345d190c0a5770fca274dc544faedcd055aff0e SHA256 26eb6edac5658d89a42529fafeb777aa4a77d92e49a1608adf9f60d21e9f9f1d size 4593
+MD5 00cfe1a7b10cba788335fa17c88a265e vmware-workstation-tools-5.0.0.ebuild 4593
+RMD160 227ffada08cfc691cba157b16c0a7054a0e4cae6 vmware-workstation-tools-5.0.0.ebuild 4593
+SHA256 26eb6edac5658d89a42529fafeb777aa4a77d92e49a1608adf9f60d21e9f9f1d vmware-workstation-tools-5.0.0.ebuild 4593
+MISC ChangeLog 3580 RMD160 4eef5057a1e4d1b807e4b40b7336e7645bc6dbf1 SHA1 cab3e3e97ad3ba29d0b8ef09b977dfd3f22b717b SHA256 0261032bd9c1134897c40f761d9d9ad8d0263952b6e414d0d5e02dafc288c827 size 3580
+MD5 acf2ae44d53492e56289a461d79830dc ChangeLog 3580
+RMD160 4eef5057a1e4d1b807e4b40b7336e7645bc6dbf1 ChangeLog 3580
+SHA256 0261032bd9c1134897c40f761d9d9ad8d0263952b6e414d0d5e02dafc288c827 ChangeLog 3580
 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/vmware-workstation-tools-4.5.3.ebuild b/app-emulation/vmware-workstation-tools/vmware-workstation-tools-4.5.3.ebuild
index a5402d59f35b..0c98ac5f7ac0 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.1 2006/05/10 16:11:09 wolf31o2 Exp $
+# $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 $
 
 inherit eutils
 
@@ -39,7 +39,7 @@ vmware_create_initd() {
 	# 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
+	keepdir /etc/vmware-tools/init.d/rc{0,1,2,3,4,5,6}.d
 }
 
 vmware_run_questions() {
@@ -52,8 +52,8 @@ vmware_run_questions() {
 	echo "answer DOCDIR ${dir}/doc" >> ${locations}
 	echo "answer SBINDIR ${dir}/sbin" >> ${locations}
 	echo "answer RUN_CONFIGURATOR no" >> ${locations}
-	echo "answer INITDIR /etc/vmware/init.d" >> ${locations}
-	echo "answer INITSCRIPTSDIR /etc/vmware/init.d" >> ${locations}
+	echo "answer INITDIR /etc/vmware-tools/init.d" >> ${locations}
+	echo "answer INITSCRIPTSDIR /etc/vmware-tools/init.d" >> ${locations}
 }
 
 pkg_setup() {
@@ -99,7 +99,7 @@ src_install() {
 
 	vmware_create_initd || die
 
-	cp -pPR installer/services.sh ${D}/etc/vmware-tools/init.d/vmware || die
+	cp -pPR installer/services.sh ${D}/etc/vmware-tools/init.d/vmware-tools || die
 
 	vmware_run_questions || die
 }
@@ -137,7 +137,7 @@ pkg_postinst () {
 	done
 	einfo "To start using the vmware-tools, please run the following:"
 	einfo
-	einfo "  /usr/bin/vmware-config-tools.pl"
+	einfo "  ${dir}/bin/vmware-config-tools.pl"
 	einfo "  rc-update add vmware-tools default"
 	einfo "  /etc/init.d/vmware-tools start"
 	einfo
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 3931481bfd19..589dccbf3753 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.4 2006/05/10 16:11:09 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation-tools/vmware-workstation-tools-5.0.0.ebuild,v 1.5 2006/05/19 18:28:38 wolf31o2 Exp $
 
 inherit eutils
 
@@ -39,7 +39,7 @@ vmware_create_initd() {
 	# 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
+	keepdir /etc/vmware-tools/init.d/rc{0,1,2,3,4,5,6}.d
 }
 
 vmware_run_questions() {
@@ -52,8 +52,8 @@ vmware_run_questions() {
 	echo "answer DOCDIR ${dir}/doc" >> ${locations}
 	echo "answer SBINDIR ${dir}/sbin" >> ${locations}
 	echo "answer RUN_CONFIGURATOR no" >> ${locations}
-	echo "answer INITDIR /etc/vmware/init.d" >> ${locations}
-	echo "answer INITSCRIPTSDIR /etc/vmware/init.d" >> ${locations}
+	echo "answer INITDIR /etc/vmware-tools/init.d" >> ${locations}
+	echo "answer INITSCRIPTSDIR /etc/vmware-tools/init.d" >> ${locations}
 }
 
 pkg_setup() {
@@ -99,7 +99,7 @@ src_install() {
 
 	vmware_create_initd || die
 
-	cp -pPR installer/services.sh ${D}/etc/vmware-tools/init.d/vmware || die
+	cp -pPR installer/services.sh ${D}/etc/vmware-tools/init.d/vmware-tools || die
 
 	vmware_run_questions || die
 }
@@ -137,7 +137,7 @@ pkg_postinst () {
 	done
 	einfo "To start using the vmware-tools, please run the following:"
 	einfo
-	einfo "  /usr/bin/vmware-config-tools.pl"
+	einfo "  ${dir}/bin/vmware-config-tools.pl"
 	einfo "  rc-update add vmware-tools default"
 	einfo "  /etc/init.d/vmware-tools start"
 	einfo