move files in FILESDIR around, version bump, re-ver the previous 4.x release

10 files changed, 286 insertions, 8 deletions

diff --git a/app-emulation/vmware-workstation/ChangeLog b/app-emulation/vmware-workstation/ChangeLog
index e28f75201cf7..8dc573033e7f 100644
--- a/app-emulation/vmware-workstation/ChangeLog
+++ b/app-emulation/vmware-workstation/ChangeLog
@@ -1,8 +1,13 @@
 # ChangeLog for app-emulation/vmware-workstation
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.18 2003/07/26 00:48:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.19 2003/07/30 14:30:16 vapier Exp $
 
-*vmware-workstation-4.0.4460-r1 (25 Jul 2003)
+*vmware-workstation-4.0.1.5289 (30 Jul 2003)
+
+  30 Jul 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump.
+
+*vmware-workstation-4.0.0.4460-r1 (25 Jul 2003)
 
   25 Jul 2003; Mike Frysinger <vapier@gentoo.org> :
   Add 2.5/2.6 kernel support.
diff --git a/app-emulation/vmware-workstation/files/4.0.4460-r1/90vmware b/app-emulation/vmware-workstation/files/90vmware
index 8e00d2bb0587..8e00d2bb0587 100644
--- a/app-emulation/vmware-workstation/files/4.0.4460-r1/90vmware
+++ b/app-emulation/vmware-workstation/files/90vmware
diff --git a/app-emulation/vmware-workstation/files/4.0.4460-r1/VMwareWorkstation.desktop b/app-emulation/vmware-workstation/files/VMwareWorkstation.desktop
index 9e42f9c1b4c6..9e42f9c1b4c6 100644
--- a/app-emulation/vmware-workstation/files/4.0.4460-r1/VMwareWorkstation.desktop
+++ b/app-emulation/vmware-workstation/files/VMwareWorkstation.desktop
diff --git a/app-emulation/vmware-workstation/files/digest-vmware-workstation-4.0.4460-r1 b/app-emulation/vmware-workstation/files/digest-vmware-workstation-4.0.0.4460-r1
index 3d268cf301bb..3d268cf301bb 100644
--- a/app-emulation/vmware-workstation/files/digest-vmware-workstation-4.0.4460-r1
+++ b/app-emulation/vmware-workstation/files/digest-vmware-workstation-4.0.0.4460-r1
diff --git a/app-emulation/vmware-workstation/files/digest-vmware-workstation-4.0.1.5289 b/app-emulation/vmware-workstation/files/digest-vmware-workstation-4.0.1.5289
new file mode 100644
index 000000000000..5758b3bf98c0
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/digest-vmware-workstation-4.0.1.5289
@@ -0,0 +1,2 @@
+MD5 00bf08b9d9d2b88f6a13c0e24883cc2a VMware-workstation-4.0.1-5289.tar.gz 26209254
+MD5 0f03027dafdc6d6edf1ebc8075fcf6de vmware-any-any-update37.tar.gz 174663
diff --git a/app-emulation/vmware-workstation/files/4.0.4460-r1/vmware b/app-emulation/vmware-workstation/files/vmware-4.0.0.4460.rc
index 9799035d45a4..68902ff41c51 100644
--- a/app-emulation/vmware-workstation/files/4.0.4460-r1/vmware
+++ b/app-emulation/vmware-workstation/files/vmware-4.0.0.4460.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2003 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/4.0.4460-r1/vmware,v 1.1 2003/07/26 00:02:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/files/vmware-4.0.0.4460.rc,v 1.1 2003/07/30 14:30:17 vapier Exp $
 
 depend() {
 	need localmount
diff --git a/app-emulation/vmware-workstation/files/vmware-4.0.1.5289.rc b/app-emulation/vmware-workstation/files/vmware-4.0.1.5289.rc
new file mode 100644
index 000000000000..f98ba3b3dd00
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/vmware-4.0.1.5289.rc
@@ -0,0 +1,73 @@
+#!/sbin/runscript
+# Copyright 1999-2003 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/vmware-4.0.1.5289.rc,v 1.1 2003/07/30 14:30:17 vapier Exp $
+
+depend() {
+	need localmount
+	use logger net
+}
+
+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/4.0.4460-r1/vmware.png b/app-emulation/vmware-workstation/files/vmware.png
index 06672aa3f0bf..06672aa3f0bf 100644
--- a/app-emulation/vmware-workstation/files/4.0.4460-r1/vmware.png
+++ b/app-emulation/vmware-workstation/files/vmware.png
diff --git a/app-emulation/vmware-workstation/vmware-workstation-4.0.4460-r1.ebuild b/app-emulation/vmware-workstation/vmware-workstation-4.0.0.4460-r1.ebuild
index 54bd46607501..0337c2f045c2 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-4.0.4460-r1.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-4.0.0.4460-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-4.0.4460-r1.ebuild,v 1.2 2003/07/30 13:20:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-4.0.0.4460-r1.ebuild,v 1.1 2003/07/30 14:30:17 vapier 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
@@ -72,11 +72,11 @@ src_install() {
 
 	# vmware service loader
 	exeinto /etc/init.d
-	newexe ${FILESDIR}/${PVR}/vmware vmware || die
+	newexe ${FILESDIR}/vmware-${PV}.rc vmware || die
 
 	# vmware enviroment
 	insinto /etc/env.d
-	doins ${FILESDIR}/${PVR}/90vmware || die
+	doins ${FILESDIR}/90vmware || die
 
 	dodir /etc/vmware/
 	cp -a etc/* ${D}/etc/vmware/
@@ -99,12 +99,12 @@ src_install() {
 	# A simple icon I made
 	dodir /opt/vmware/lib/icon
 	insinto /opt/vmware/lib/icon
-	doins ${FILESDIR}/${PVR}/vmware.png || die
+	doins ${FILESDIR}/vmware.png || die
 
 	if [ "`use kde`" ] ; then
 		dodir /usr/share/applnk/Applications
 		insinto /usr/share/applnk/Applications
-		doins "${FILESDIR}/${PVR}/VMwareWorkstation.desktop"
+		doins "${FILESDIR}/VMwareWorkstation.desktop"
 	fi
 
 
@@ -183,6 +183,8 @@ pkg_postinst() {
 	einfo "http://www.vmware.com/download/downloadaddons.html"
 	einfo
 	einfo "After configuring, type 'vmware' to launch"
+	echo
+	ewarn "For users of glibc-2.3.x, vmware-nat support is *still* broken"
 }
 
 pkg_postrm() {
diff --git a/app-emulation/vmware-workstation/vmware-workstation-4.0.1.5289.ebuild b/app-emulation/vmware-workstation/vmware-workstation-4.0.1.5289.ebuild
new file mode 100644
index 000000000000..cb41f10ef19a
--- /dev/null
+++ b/app-emulation/vmware-workstation/vmware-workstation-4.0.1.5289.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-4.0.1.5289.ebuild,v 1.1 2003/07/30 14:30:17 vapier 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
+# which the user must run manually.
+
+S=${WORKDIR}/vmware-distrib
+N26KernSupport=vmware-any-any-update37
+NP="VMware-workstation-4.0.1-5289"
+DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
+SRC_URI="http://vmware-svca.www.conxion.com/software/${NP}.tar.gz
+	http://download.vmware.com/htdocs/software/${NP}.tar.gz
+	http://www.vmware.com/download1/software/${NP}.tar.gz
+	ftp://download1.vmware.com/pub/software/${NP}.tar.gz
+	http://vmware-chil.www.conxion.com/software/${NP}.tar.gz
+	http://vmware-heva.www.conxion.com/software/${NP}.tar.gz
+	http://vmware.wespe.de/software/${NP}.tar.gz
+	ftp://vmware.wespe.de/pub/software/${NP}.tar.gz
+	http://ftp.cvut.cz/vmware/${N26KernSupport}.tar.gz
+	http://knihovny.cvut.cz/ftp/pub/vmware/${N26KernSupport}.tar.gz"
+HOMEPAGE="http://www.vmware.com/products/desktop/ws_features.html"
+
+LICENSE="vmware"
+SLOT="0"
+KEYWORDS="-* ~x86"
+IUSE="kde"
+
+DEPEND="virtual/glibc
+	virtual/x11
+	sys-kernel/linux-headers
+	>=dev-lang/perl-5
+	>=dev-lang/tcl-8.3.3
+	sys-apps/pciutils"
+
+RESTRICT="nostrip"
+
+src_unpack() {
+	check_KV
+	unpack ${NP}.tar.gz
+	if [ "${KV:0:3}" == "2.6" ] || [ "${KV:0:3}" == "2.5" ] ; then
+		einfo "Adding 2.{5,6}.x kernel support"
+		unpack ${N26KernSupport}.tar.gz
+		mv ${N26KernSupport}/*.tar ${S}/lib/modules/source/
+	else
+		einfo "Using 2.4.x kernel support"
+	fi
+}
+
+src_install() {
+	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 || die
+	chmod u+s ${D}/opt/vmware/bin/vmware-ping || die
+
+	dodir /opt/vmware/lib
+	cp -a lib/* ${D}/opt/vmware/lib/
+
+	chmod u+s ${D}/opt/vmware/lib/bin/vmware-vmx || 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 ${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}/vmware-${PV}.rc vmware || die
+
+	# vmware enviroment
+	insinto /etc/env.d
+	doins ${FILESDIR}/90vmware || die
+
+	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 || die
+
+	# 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
+
+	# A simple icon I made
+	dodir /opt/vmware/lib/icon
+	insinto /opt/vmware/lib/icon
+	doins ${FILESDIR}/vmware.png || die
+
+	if [ "`use kde`" ] ; then
+		dodir /usr/share/applnk/Applications
+		insinto /usr/share/applnk/Applications
+		doins "${FILESDIR}/VMwareWorkstation.desktop"
+	fi
+
+
+	dodir /usr/bin
+	dosym /opt/vmware/bin/vmware /usr/bin/vmware
+
+	# 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_config() {
+	# In case pkg_config() ends up being the defacto standard for
+	# configuring packages (malverian <malverian@gentoo.org>)
+
+	einfo "Running /opt/vmware/bin/vmware-config.pl"
+	/opt/vmware/bin/vmware-config.pl
+}
+
+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
+	einfo "You need to run /opt/vmware/bin/vmware-config.pl to complete the install."
+	einfo
+	einfo "For VMware Add-Ons just visit"
+	einfo "http://www.vmware.com/download/downloadaddons.html"
+	einfo
+	einfo "After configuring, type 'vmware' to launch"
+	echo
+	ewarn "For users of glibc-2.3.x, vmware-nat support is *still* broken"
+}
+
+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 
+}