New version of VMware Workstation. The big changes are in the init script that

has been rewritten to be much more pretty at boot time and menu items are added
to the KDE start panel if use kde is set.

7 files changed, 311 insertions, 25 deletions

diff --git a/app-emulation/vmware-workstation/ChangeLog b/app-emulation/vmware-workstation/ChangeLog
index e652ba4d55ea..08a65ea829f9 100644
--- a/app-emulation/vmware-workstation/ChangeLog
+++ b/app-emulation/vmware-workstation/ChangeLog
@@ -1,44 +1,62 @@
 # ChangeLog for app-emulation/vmware-workstation
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.1 2002/02/21 04:18:48 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.2 2002/04/19 06:22:50 sandymac Exp $
+
+*vmware-workstation-3.1.1.1790 (2002/4/13)
+
+  13 Apr 2002; William McArthur <sandymac@gentoo.org> /etc/init.d/vmare:
+  Rewrote the /etc/init.d/vmare script to not mangle error messages that aren't
+  in an expected format. Added ~dev-lang/tcl-8.3.3 to the DEPEND line.
+
+  11 Apr 2002; William McArthur <sandymac@gentoo.org> vmware-workstation-3.1.1.1790.ebuild:
+  New version of VMware Workstation released. The ebuild was updated for this
+  version. The Gentoo (/etc/init.d/vmware) init script was changed to capture
+  the output from the VMware (/etc/vmware/init.d/vmware) script and prettify
+  (Is that a word?) it's output to look more like the Gentoo boot output. Also,
+  any error lines from the vmware init script are sent to the system logger to
+  hopefully increase their chance of being noticed. I made an icon from the
+  logo off of vmware.com for use in "start" type menus. It can be found in
+  /opt/vmware/lib/icon/ .  If kde is in the USE var then menu items are
+  automatically added for the user.
 
 *vmware-workstation-3.0.0.1455-r1 (2002/2/20)
 
-  20 Feb 2002; William McArthur <leknor@leknor.com> vmware-workstation-3.0.0.1455-r1.ebuild :
+  20 Feb 2002; William McArthur <sandymac@gentoo.org> vmware-workstation-3.0.0.1455-r1.ebuild :
 
   If you had an existing vmware install there was a problem where the file 
-  /etc/vmware/not_configured would have a mtime different from what was in the locations
-  file. This is fixed by not having a mtime in the locations file for the not_configured
-  file.
+  /etc/vmware/not_configured would have a mtime different from what was in the
+  locations file. This is fixed by not having a mtime in the locations file for
+  the not_configured file.
 
-  At the end of the merge the new locations file is appended to the existing locations.
-  This plus the above should solve any problems that people with manual vmware installs
-  have.
+  At the end of the merge the new locations file is appended to the existing
+  locations. This plus the above should solve any problems that people with
+  manual vmware installs have.
 
-  If the user was to merge vmware twice without running vmware-config.pl the rc#.d dirs
-  in /etc/vmware/init.d/ would be remove despite config protection. To keep them around
-  I added .keep files in each of them.
+  If the user was to merge vmware twice without running vmware-config.pl the
+  rc#.d dirs in /etc/vmware/init.d/ would be remove despite config protection.
+  To keep them around I added .keep files in each of them.
   
 *vmware-workstation-3.0.0.1455 (2002/2/10)
 
-  10 Feb 2002; William McArthur <leknor@leknor.com> vmware-workstation-3.0.0.1455.ebuild :
+  10 Feb 2002; William McArthur <sandymac@gentoo.org> vmware-workstation-3.0.0.1455.ebuild :
 
   I don't remember the details but the following was written:
 
-  The ebuild bypassed the official install because it doesn't all a install prefix.
-  Basicly the files from the work dir are copyied to the image dir.
+  The ebuild bypassed the official install because it doesn't all a install
+  prefix.  Basicly the files from the work dir are copyied to the image dir.
 
-  DEBUG=true is set because the strip command line tool dumps core on the vmware
-  executable and setting DEBUG will disable it.
+  DEBUG=true is set because the strip command line tool dumps core on the
+  vmware executable and setting DEBUG will disable it.
 
-  After the files have had their mtime updated we scan the image dir and collect the
-  mtimes and add the info to the /etc/vmware/locations file. This file is used by vmware
-  to track config choices and it is used in upgrading. By creating this file we make sure
-  the vmware config tools work and I think you could do a non gentoo package install of
-  vmware and it would work.
+  After the files have had their mtime updated we scan the image dir and collect
+  the mtimes and add the info to the /etc/vmware/locations file. This file is
+  used by vmware to track config choices and it is used in upgrading. By
+  creating this file we make sure the vmware config tools work and I think you
+  could do a non gentoo package install of vmware and it would work.
 
-  The vmware-config tool insists on a set of init dirs named rc#.d so they are created in
-  /etc/vmware/init.d/ . The other option was edit vmware-config.pl .
+  The vmware-config tool insists on a set of init dirs named rc#.d so they are
+  created in /etc/vmware/init.d/ . The other option was edit vmware-config.pl .
 
-  VMWare needs some modules loaded so at boot an init script is run that is really just
-  glue to start the init script supplied from vmware which is at /etc/vmware/init.d/vmware
+  VMWare needs some modules loaded so at boot an init script is run that is
+  really just glue to start the init script supplied from vmware which is at
+  /etc/vmware/init.d/vmware
diff --git a/app-emulation/vmware-workstation/files/3.1.1.1790/90vmware b/app-emulation/vmware-workstation/files/3.1.1.1790/90vmware
new file mode 100644
index 000000000000..8e00d2bb0587
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/3.1.1.1790/90vmware
@@ -0,0 +1,3 @@
+PATH=/opt/vmware/bin
+ROOTPATH=/opt/vmware/bin
+MANPATH=/opt/vmware/man
diff --git a/app-emulation/vmware-workstation/files/3.1.1.1790/VMwareWorkstation.desktop b/app-emulation/vmware-workstation/files/3.1.1.1790/VMwareWorkstation.desktop
new file mode 100644
index 000000000000..9e42f9c1b4c6
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/3.1.1.1790/VMwareWorkstation.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=VMware Workstation
+Comment=VMware Workstation
+GenericName=Virtual PC Emulator
+Exec=vmware
+Icon=/opt/vmware/lib/icon/vmware.png
+Path=
+Terminal=0
+TerminalOptions=
+Type=Application
+X-KDE-SubstituteUID=false
+X-KDE-Username=
diff --git a/app-emulation/vmware-workstation/files/3.1.1.1790/vmware b/app-emulation/vmware-workstation/files/3.1.1.1790/vmware
new file mode 100644
index 000000000000..4782b384f0c9
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/3.1.1.1790/vmware
@@ -0,0 +1,73 @@
+#!/sbin/runscript
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/files/3.1.1.1790/vmware,v 1.1 2002/04/19 06:22:50 sandymac Exp $
+
+depend() {
+	need localmount net
+	use logger
+}
+
+vmware-prettify() {
+	# Yea, the code is ugly but the output is pretty
+	state=$1
+	waserror=0
+	msgtype=0
+	while read line
+	do
+		[ "$line" == "" ] && continue
+		if [ "$msgtype" -le "0" ]
+		then
+			if [ "$msgtype" == "-1" ]
+			then
+				ewarn $line
+				continue
+			fi
+			if [ "${line/*:*/}" == "" ]
+			then
+				einfon $line
+				echo
+				eend 0
+				msgtype=1
+			else
+				ewarn $line
+				msgtype=-1
+				waserror=1
+			fi
+			continue
+		fi
+
+		# Strip out anything after the <esc> code
+		message=`echo $line | sed -e "s/^\(.*\).*$/\1/"`
+		einfon "  $message"
+		echo
+
+		echo $line | grep done > /dev/null
+		status=$?
+		eend $status
+
+		if [ "$status" != "0" ]
+		then
+			logger -p local0.err -t vmware-${state} "$line"
+			waserror=$status
+		fi
+	done
+	if [ "$msgtype" == "-1" ]
+	then
+		eend 1 "VMware is not properly configured! See above."
+	fi
+	return $waserror
+}
+
+start() {
+	test -x /etc/vmware/init.d/vmware || \
+		eend 1 "vmware init script not found. Aborting" || return 1
+
+	/etc/vmware/init.d/vmware start | vmware-prettify start
+	return $?
+}
+
+stop() {
+	/etc/vmware/init.d/vmware stop | vmware-prettify stop
+	return $?
+}
diff --git a/app-emulation/vmware-workstation/files/3.1.1.1790/vmware.png b/app-emulation/vmware-workstation/files/3.1.1.1790/vmware.png
new file mode 100644
index 000000000000..06672aa3f0bf
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/3.1.1.1790/vmware.png
diff --git a/app-emulation/vmware-workstation/files/digest-vmware-workstation-3.1.1.1790 b/app-emulation/vmware-workstation/files/digest-vmware-workstation-3.1.1.1790
new file mode 100644
index 000000000000..0a59a1135d61
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/digest-vmware-workstation-3.1.1.1790
@@ -0,0 +1 @@
+MD5 d841566d861773c7dcfef30e8cc61b97 VMware-workstation-3.1.1-1790.tar.gz 11377464
diff --git a/app-emulation/vmware-workstation/vmware-workstation-3.1.1.1790.ebuild b/app-emulation/vmware-workstation/vmware-workstation-3.1.1.1790.ebuild
new file mode 100644
index 000000000000..9340589f95b5
--- /dev/null
+++ b/app-emulation/vmware-workstation/vmware-workstation-3.1.1.1790.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Maintainer: William McArthur <sandymac@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-3.1.1.1790.ebuild,v 1.1 2002/04/19 06:22:50 sandymac Exp $
+
+DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators."
+S=${WORKDIR}/vmware-distrib
+NP="VMware-workstation-3.1.1-1790"
+
+# 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
+# which the user must run manually.
+SRC_PATH0="http://vmware-svca.www.conxion.com/software"
+SRC_PATH1="http://www.vmware.com/download1/software"
+SRC_PATH2="ftp://download1.vmware.com/pub/software"
+SRC_PATH3="http://vmware-chil.www.conxion.com/software"
+SRC_PATH4="http://vmware-heva.www.conxion.com/software"
+SRC_PATH5="http://vmware.wespe.de/software"
+SRC_PATH6="ftp://vmware.wespe.de/pub/software"
+
+SRC_URI="$SRC_PATH0/${NP}.tar.gz
+	 $SRC_PATH1/${NP}.tar.gz
+	 $SRC_PATH2/${NP}.tar.gz
+	 $SRC_PATH3/${NP}.tar.gz
+	 $SRC_PATH4/${NP}.tar.gz
+	 $SRC_PATH5/${NP}.tar.gz
+	 $SRC_PATH6/${NP}.tar.gz"
+
+HOMEPAGE="http://www.vmware.com/products/desktop/ws_features.html"
+DEPEND="virtual/glibc virtual/x11 sys-kernel/linux-headers
+		>=sys-devel/perl-5 ~dev-lang/tcl-8.3.3"
+#debug is needed to prevent a segfault from stripping vmware executables
+export DEBUG="yes"
+RESTRICT="nostrip"
+
+src_install () {
+	# Copy:
+	dodir /opt/vmware/bin
+	cp -a bin/* ${D}/opt/vmware/bin/
+	# vmware and vmware-ping needs to be suid root.
+	chmod u+s ${D}/opt/vmware/bin/vmware
+	chmod u+s ${D}/opt/vmware/bin/vmware-ping
+
+	dodir /opt/vmware/lib
+	cp -a lib/* ${D}/opt/vmware/lib/
+	# 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 -r ${D}/opt/vmware/lib/modules/binary
+
+	dodir /opt/vmware/doc
+	cp -a doc/* ${D}/opt/vmware/doc/
+
+	dodir /opt/vmware/man/
+	cp -a man/* ${D}/opt/vmware/man/
+
+	# vmware service loader
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/${PVR}/vmware vmware
+
+	# vmware enviroment
+	insinto /etc/env.d
+	doins ${FILESDIR}/${PVR}/90vmware
+
+	dodir /etc/vmware/
+	cp -a etc/* ${D}/etc/vmware/
+
+	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
+	cp -a installer/services.sh ${D}/etc/vmware/init.d/vmware
+
+	# 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.
+	touch  ${D}/etc/vmware/init.d/rc{0,1,2,3,4,5,6}.d/.keep
+
+	# A simple icon I made
+	dodir /opt/vmware/lib/icon
+	insinto /opt/vmware/lib/icon
+	doins ${FILESDIR}/${PVR}/vmware.png
+
+	if [ "`use kde`" ]
+	then
+		# KDE 2
+		dodir ${KDE2DIR}/share/applnk/Applications
+		insinto ${KDE2DIR}/share/applnk/Applications
+		doins "${FILESDIR}/${PVR}/VMwareWorkstation.desktop"
+		# KDE 3
+		dodir ${KDE3DIR}/share/applnk/Applications
+		insinto ${KDE3DIR}/share/applnk/Applications
+		doins "${FILESDIR}/${PVR}/VMwareWorkstation.desktop"
+		# KDE - This seems redundant but danarmak@gentoo.org seemed to suport it
+		dodir ${KDEDIR}/share/applnk/Applications
+		insinto ${KDEDIR}/share/applnk/Applications
+		doins "${FILESDIR}/${PVR}/VMwareWorkstation.desktop"
+	fi
+
+	# 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 RUN_CONFIGURATOR no" >> ${locations}
+	echo "answer INITDIR /etc/vmware/init.d" >> ${locations}
+	echo "answer INITSCRIPTSDIR /etc/vmware/init.d" >> ${locations}
+}
+
+pkg_preinst () {
+	# 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/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
+		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
+}
+
+pkg_postinst () {
+	# This is to fix the problem where the not_configured file doesn't get
+	# removed when the configuration is run. This doesn't remove the file
+	# It just tells the vmware-config.pl script it can delete it.
+	einfo "Updating /etc/vmware/locations"
+	for x in /etc/vmware/._cfg????_locations
+	do
+		if [ -f $x ]
+		then
+			cat $x >> /etc/vmware/locations
+			rm $x
+		fi
+	done
+
+	einfo "Activating vmware init scripts..."
+	rc-update add vmware default
+	einfo
+	einfo "You need to run /opt/vmware/bin/vmware-config.pl to complete the install."
+	einfo
+}
+
+pkg_postrm () {
+	einfo 
+	einfo "To remove all traces of vmware you will need to remove the files"
+	einfo "in /etc/vmware/, /etc/init.d/vmware, /lib/modules/*/misc/vm*.o,"
+	einfo "and .vmware/ in each users home directory."
+	einfo 
+}