Changed default location from /opt/vmware to /opt/vmware/workstation to allow for side-by-side installations of VMware Workstation and Player.

(Portage version: 2.0.53_rc7)

9 files changed, 57 insertions, 40 deletions

diff --git a/app-emulation/vmware-workstation/ChangeLog b/app-emulation/vmware-workstation/ChangeLog
index f1fe730a50c7..f4da04365057 100644
--- a/app-emulation/vmware-workstation/ChangeLog
+++ b/app-emulation/vmware-workstation/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for app-emulation/vmware-workstation
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.101 2005/11/09 02:07:14 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.102 2005/11/09 16:49:32 wolf31o2 Exp $
+
+*vmware-workstation-5.5.0.18007-r1 (09 Nov 2005)
+*vmware-workstation-5.0.0.13124-r3 (09 Nov 2005)
+*vmware-workstation-4.5.2.8848-r8 (09 Nov 2005)
+*vmware-workstation-3.2.1.2242-r5 (09 Nov 2005)
+
+  09 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  -vmware-workstation-3.2.1.2242-r4.ebuild,
+  +vmware-workstation-3.2.1.2242-r5.ebuild,
+  -vmware-workstation-4.5.2.8848-r7.ebuild,
+  +vmware-workstation-4.5.2.8848-r8.ebuild,
+  -vmware-workstation-5.0.0.13124-r2.ebuild,
+  +vmware-workstation-5.0.0.13124-r3.ebuild,
+  -vmware-workstation-5.5.0.18007.ebuild,
+  +vmware-workstation-5.5.0.18007-r1.ebuild:
+  Changed default location from /opt/vmware to /opt/vmware/workstation to
+  allow for side-by-side installations of VMware Workstation and Player.
 
 *vmware-workstation-5.5.0.18007 (09 Nov 2005)
 
diff --git a/app-emulation/vmware-workstation/files/digest-vmware-workstation-3.2.1.2242-r4 b/app-emulation/vmware-workstation/files/digest-vmware-workstation-3.2.1.2242-r5
index 212a211eef8a..212a211eef8a 100644
--- a/app-emulation/vmware-workstation/files/digest-vmware-workstation-3.2.1.2242-r4
+++ b/app-emulation/vmware-workstation/files/digest-vmware-workstation-3.2.1.2242-r5
diff --git a/app-emulation/vmware-workstation/files/digest-vmware-workstation-4.5.2.8848-r7 b/app-emulation/vmware-workstation/files/digest-vmware-workstation-4.5.2.8848-r8
index cd8c4b3392a6..cd8c4b3392a6 100644
--- a/app-emulation/vmware-workstation/files/digest-vmware-workstation-4.5.2.8848-r7
+++ b/app-emulation/vmware-workstation/files/digest-vmware-workstation-4.5.2.8848-r8
diff --git a/app-emulation/vmware-workstation/files/digest-vmware-workstation-5.0.0.13124-r2 b/app-emulation/vmware-workstation/files/digest-vmware-workstation-5.0.0.13124-r3
index 95a53caedb82..95a53caedb82 100644
--- a/app-emulation/vmware-workstation/files/digest-vmware-workstation-5.0.0.13124-r2
+++ b/app-emulation/vmware-workstation/files/digest-vmware-workstation-5.0.0.13124-r3
diff --git a/app-emulation/vmware-workstation/files/digest-vmware-workstation-5.5.0.18007 b/app-emulation/vmware-workstation/files/digest-vmware-workstation-5.5.0.18007-r1
index 0d467ce5c43b..0d467ce5c43b 100644
--- a/app-emulation/vmware-workstation/files/digest-vmware-workstation-5.5.0.18007
+++ b/app-emulation/vmware-workstation/files/digest-vmware-workstation-5.5.0.18007-r1
diff --git a/app-emulation/vmware-workstation/vmware-workstation-3.2.1.2242-r4.ebuild b/app-emulation/vmware-workstation/vmware-workstation-3.2.1.2242-r5.ebuild
index 2062bb40aa10..1bc9b98ee15f 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-3.2.1.2242-r4.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-3.2.1.2242-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-3.2.1.2242-r4.ebuild,v 1.3 2005/09/22 15:14:36 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-3.2.1.2242-r5.ebuild,v 1.1 2005/11/09 16:49:32 wolf31o2 Exp $
 
 # Unlike many other binary packages the user doesn't need to agree to a licence
 # to download VM Ware.  The agreeing to a licence is part of the configure step
@@ -39,7 +39,7 @@ RDEPEND="sys-libs/glibc
 	virtual/x11
 	media-libs/gdk-pixbuf"
 
-dir=/opt/vmware
+dir=/opt/vmware/workstation
 Ddir=${D}/${dir}
 VMWARE_GROUP=${VMWARE_GROUP:-vmware}
 
@@ -147,17 +147,17 @@ src_install() {
 	# Questions:
 	einfo "Adding answers to /etc/vmware/locations"
 	locations="${D}/etc/vmware/locations"
-	echo "answer BINDIR /opt/vmware/bin" >> ${locations}
-	echo "answer LIBDIR /opt/vmware/lib" >> ${locations}
-	echo "answer MANDIR /opt/vmware/man" >> ${locations}
-	echo "answer DOCDIR /opt/vmware/doc" >> ${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}
 
 	if [ ${GLIBC_232} -eq 1 ] ; then
 		dolib.so vmware-glibc-2.3.2-compat.so
-		cd ${D}/opt/vmware/lib/bin
+		cd ${Ddir}/lib/bin
 		mv vmware-ui{,.bin}
 		mv vmware-mks{,.bin}
 		echo '#!/bin/sh' > vmware-ui
@@ -175,14 +175,14 @@ pkg_preinst() {
 	# 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/bin/vmware -printf %T@
+	# 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 ${D}/opt/vmware ${D}/etc/vmware` ; do
+	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
@@ -215,7 +215,7 @@ pkg_postinst() {
 	done
 
 	einfo
-	einfo "You need to run /opt/vmware/bin/vmware-config.pl to complete the install."
+	einfo "You need to run ${dir}/bin/vmware-config.pl to complete the install."
 	einfo
 	einfo "For VMware Add-Ons just visit"
 	einfo "http://www.vmware.com/download/downloadaddons.html"
diff --git a/app-emulation/vmware-workstation/vmware-workstation-4.5.2.8848-r7.ebuild b/app-emulation/vmware-workstation/vmware-workstation-4.5.2.8848-r8.ebuild
index de0c84b37457..782195caf5d6 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-4.5.2.8848-r7.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-4.5.2.8848-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-4.5.2.8848-r7.ebuild,v 1.3 2005/09/22 15:14:36 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-4.5.2.8848-r8.ebuild,v 1.1 2005/11/09 16:49:32 wolf31o2 Exp $
 
 # Unlike many other binary packages the user doesn't need to agree to a licence
 # to download VMWare. The agreeing to a licence is part of the configure step
@@ -43,7 +43,7 @@ RDEPEND=">=dev-lang/perl-5
 	virtual/x11
 	sys-apps/pciutils"
 
-dir=/opt/vmware
+dir=/opt/vmware/workstation
 Ddir=${D}/${dir}
 VMWARE_GROUP=${VMWARE_GROUP:-vmware}
 
@@ -147,10 +147,10 @@ src_install() {
 	# Questions:
 	einfo "Adding answers to /etc/vmware/locations"
 	locations="${D}/etc/vmware/locations"
-	echo "answer BINDIR /opt/vmware/bin" >> ${locations}
-	echo "answer LIBDIR /opt/vmware/lib" >> ${locations}
-	echo "answer MANDIR /opt/vmware/man" >> ${locations}
-	echo "answer DOCDIR /opt/vmware/doc" >> ${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}
@@ -162,7 +162,7 @@ pkg_preinst() {
 	# 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/bin/vmware -printf %T@
+	# 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)
@@ -207,7 +207,7 @@ pkg_postinst() {
 	done
 
 	einfo
-	einfo "You need to run /opt/vmware/bin/vmware-config.pl to complete the install."
+	einfo "You need to run ${dir}/bin/vmware-config.pl to complete the install."
 	einfo
 	einfo "For VMware Add-Ons just visit"
 	einfo "http://www.vmware.com/download/downloadaddons.html"
diff --git a/app-emulation/vmware-workstation/vmware-workstation-5.0.0.13124-r2.ebuild b/app-emulation/vmware-workstation/vmware-workstation-5.0.0.13124-r3.ebuild
index 7d5e1a6b66ec..248a51e742e6 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-5.0.0.13124-r2.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-5.0.0.13124-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-5.0.0.13124-r2.ebuild,v 1.3 2005/09/22 15:14:36 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-5.0.0.13124-r3.ebuild,v 1.1 2005/11/09 16:49:32 wolf31o2 Exp $
 
 # Unlike many other binary packages the user doesn't need to agree to a licence
 # to download VMWare. The agreeing to a licence is part of the configure step
@@ -42,7 +42,7 @@ RDEPEND="sys-libs/glibc
 	>=dev-lang/perl-5
 	sys-apps/pciutils"
 
-dir=/opt/vmware
+dir=/opt/vmware/workstation
 Ddir=${D}/${dir}
 VMWARE_GROUP=${VMWARE_GROUP:-vmware}
 
@@ -145,10 +145,10 @@ src_install() {
 	# Questions:
 	einfo "Adding answers to /etc/vmware/locations"
 	locations="${D}/etc/vmware/locations"
-	echo "answer BINDIR /opt/vmware/bin" >> ${locations}
-	echo "answer LIBDIR /opt/vmware/lib" >> ${locations}
-	echo "answer MANDIR /opt/vmware/man" >> ${locations}
-	echo "answer DOCDIR /opt/vmware/doc" >> ${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}
@@ -160,14 +160,14 @@ pkg_preinst() {
 	# 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/bin/vmware -printf %T@
+	# find /opt/vmware/bin/workstation/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 ${D}/opt/vmware ${D}/etc/vmware` ; do
+	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
@@ -188,7 +188,7 @@ pkg_preinst() {
 }
 
 pkg_config() {
-	einfo "Running /opt/vmware/bin/vmware-config.pl"
+	einfo "Running ${dir}/bin/vmware-config.pl"
 	${dir}/bin/vmware-config.pl
 }
 
@@ -207,7 +207,7 @@ pkg_postinst() {
 	done
 
 	einfo
-	einfo "You need to run /opt/vmware/bin/vmware-config.pl to complete the install."
+	einfo "You need to run ${dir}/bin/vmware-config.pl to complete the install."
 	einfo
 	einfo "For VMware Add-Ons just visit"
 	einfo "http://www.vmware.com/download/downloadaddons.html"
diff --git a/app-emulation/vmware-workstation/vmware-workstation-5.5.0.18007.ebuild b/app-emulation/vmware-workstation/vmware-workstation-5.5.0.18007-r1.ebuild
index e01ef3121ff0..d207cd99517b 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-5.5.0.18007.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-5.5.0.18007-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-5.5.0.18007.ebuild,v 1.1 2005/11/09 02:07:14 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-5.5.0.18007-r1.ebuild,v 1.1 2005/11/09 16:49:32 wolf31o2 Exp $
 
 # Unlike many other binary packages the user doesn't need to agree to a licence
 # to download VMWare. The agreeing to a licence is part of the configure step
@@ -9,7 +9,7 @@
 inherit eutils
 
 S=${WORKDIR}/vmware-distrib
-#ANY_ANY="vmware-any-any-update93"
+#ANY_ANY="vmware-any-any-update94"
 NP="VMware-workstation-5.5.0-18007"
 DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
 HOMEPAGE="http://www.vmware.com/products/desktop/ws_features.html"
@@ -30,7 +30,7 @@ RDEPEND="sys-libs/glibc
 	>=dev-lang/perl-5
 	sys-apps/pciutils"
 
-dir=/opt/vmware
+dir=/opt/vmware/workstation
 Ddir=${D}/${dir}
 VMWARE_GROUP=${VMWARE_GROUP:-vmware}
 
@@ -128,10 +128,10 @@ src_install() {
 	# Questions:
 	einfo "Adding answers to /etc/vmware/locations"
 	locations="${D}/etc/vmware/locations"
-	echo "answer BINDIR /opt/vmware/bin" >> ${locations}
-	echo "answer LIBDIR /opt/vmware/lib" >> ${locations}
-	echo "answer MANDIR /opt/vmware/man" >> ${locations}
-	echo "answer DOCDIR /opt/vmware/doc" >> ${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}
@@ -143,14 +143,14 @@ pkg_preinst() {
 	# 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/bin/vmware -printf %T@
+	# 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 ${D}/opt/vmware ${D}/etc/vmware` ; do
+	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
@@ -171,7 +171,7 @@ pkg_preinst() {
 }
 
 pkg_config() {
-	einfo "Running /opt/vmware/bin/vmware-config.pl"
+	einfo "Running ${dir}/bin/vmware-config.pl"
 	${dir}/bin/vmware-config.pl
 }
 
@@ -190,7 +190,7 @@ pkg_postinst() {
 	done
 
 	einfo
-	einfo "You need to run /opt/vmware/bin/vmware-config.pl to complete the install."
+	einfo "You need to run ${dir}/bin/vmware-config.pl to complete the install."
 	einfo
 	einfo "For VMware Add-Ons just visit"
 	einfo "http://www.vmware.com/download/downloadaddons.html"