Add in new vmware-modules ebuilds to make use of the vmware-mod.eclass

Also bump vmware-server and -server-console versions to build 24927.

svn path=/trunk/; revision=47

3 files changed, 196 insertions, 4 deletions

diff --git a/app-emulation/vmware-server-console/Manifest b/app-emulation/vmware-server-console/Manifest
index cf2552a..fce33bd 100644
--- a/app-emulation/vmware-server-console/Manifest
+++ b/app-emulation/vmware-server-console/Manifest
@@ -1,16 +1,24 @@
-AUX 99vmware-server-console 76 RMD160 22fed127d20bfb758163443dcbd2879bf1d49be6 SHA1 105e3194c134b752a8d5cef1a23ae621cd835d80 SHA256 ff3abe9d58fd673d8f3d2f7e967aa6db426e3e15b4d868dc1483682357a928b8 size 76
+AUX 99vmware-server-console 76 RMD160 22fed127d20bfb758163443dcbd2879bf1d49be6 SHA1 105e3194c134b752a8d5cef1a23ae621cd835d80 SHA256 ff3abe9d58fd673d8f3d2f7e967aa6db426e3e15b4d868dc1483682357a928b8
 MD5 e422834560595f9a56b6a2036c583b97 files/99vmware-server-console 76
 RMD160 22fed127d20bfb758163443dcbd2879bf1d49be6 files/99vmware-server-console 76
 SHA256 ff3abe9d58fd673d8f3d2f7e967aa6db426e3e15b4d868dc1483682357a928b8 files/99vmware-server-console 76
-AUX vmware.xml 1592 RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e8c SHA1 02db2ee7ca0abb8b8793c9f56d858bb08c1c715f SHA256 56aafee80ad705e8d832f8853c36d763d37b87d1cb132a41c50eb63085ae854d size 1592
+AUX vmware.xml 1592 RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e8c SHA1 02db2ee7ca0abb8b8793c9f56d858bb08c1c715f SHA256 56aafee80ad705e8d832f8853c36d763d37b87d1cb132a41c50eb63085ae854d
 MD5 aa1b576735134579f04b29763901dc4f files/vmware.xml 1592
 RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e8c files/vmware.xml 1592
 SHA256 56aafee80ad705e8d832f8853c36d763d37b87d1cb132a41c50eb63085ae854d files/vmware.xml 1592
-DIST VMware-server-linux-client-e.x.p-23869.zip 24680832 RMD160 0bd8cf6acd4924519d44506387eb869ad5b9fd7d SHA256 0d585a3eec68e8ee2d06dc64c9e7613fa12ce5095a5fbaf8f101fd008041687d size 24680832
-EBUILD vmware-server-console-1.0.0.23869.ebuild 4953 RMD160 c48fc103da5eb9d15157fcda8e4c3513379c7e84 SHA1 7680aaa9348312fe8984bc2413a17cf52c6ef133 SHA256 306ec13dc8fbcb12b7058bbcf692e34854e2b16fe9d650d71c9713299325f001 size 4953
+DIST VMware-server-linux-client-1.0.0-24927.zip 23347926 RMD160 7c77d6b0981af78f3c32d127da0b5db9db1961c8 SHA1 64475333923eba59f6462cc6b86ce1e10e87d65f SHA256 c92d8b25b08fe654bf2ea73b0010c4a4ffce651e1d3f08c040d36b8f1df2b458
+DIST VMware-server-linux-client-e.x.p-23869.zip 24680832 RMD160 0bd8cf6acd4924519d44506387eb869ad5b9fd7d SHA256 0d585a3eec68e8ee2d06dc64c9e7613fa12ce5095a5fbaf8f101fd008041687d
+EBUILD vmware-server-console-1.0.0.23869.ebuild 4953 RMD160 c48fc103da5eb9d15157fcda8e4c3513379c7e84 SHA1 7680aaa9348312fe8984bc2413a17cf52c6ef133 SHA256 306ec13dc8fbcb12b7058bbcf692e34854e2b16fe9d650d71c9713299325f001
 MD5 555368ea61fcc6da9d6a9f073a037931 vmware-server-console-1.0.0.23869.ebuild 4953
 RMD160 c48fc103da5eb9d15157fcda8e4c3513379c7e84 vmware-server-console-1.0.0.23869.ebuild 4953
 SHA256 306ec13dc8fbcb12b7058bbcf692e34854e2b16fe9d650d71c9713299325f001 vmware-server-console-1.0.0.23869.ebuild 4953
+EBUILD vmware-server-console-1.0.0.24927.ebuild 4947 RMD160 7ff35c0fbe1579676e065c0c27835505066a17fa SHA1 d47fdc6d0805c2b8ad090b4056f1e4eb3ccc42a6 SHA256 b3ecd14631244b4eeed425f0efc1476639a4f42d32dcc7b2bd0e030714498f79
+MD5 10344d749784492c5959305f26a59bc0 vmware-server-console-1.0.0.24927.ebuild 4947
+RMD160 7ff35c0fbe1579676e065c0c27835505066a17fa vmware-server-console-1.0.0.24927.ebuild 4947
+SHA256 b3ecd14631244b4eeed425f0efc1476639a4f42d32dcc7b2bd0e030714498f79 vmware-server-console-1.0.0.24927.ebuild 4947
 MD5 322676dcbda83026e3e508ff58d77881 files/digest-vmware-server-console-1.0.0.23869 313
 RMD160 67e422935bcdc78b5eb850bfe47a718a94fa060d files/digest-vmware-server-console-1.0.0.23869 313
 SHA256 08c5a8a2cca094752436696355dc6760a0587ba16c8d3ffa18fb87956f082005 files/digest-vmware-server-console-1.0.0.23869 313
+MD5 169e209dcc507a9afb913a10068f1445 files/digest-vmware-server-console-1.0.0.24927 313
+RMD160 6711e1d73d14582135da43e4a7457a239912e60d files/digest-vmware-server-console-1.0.0.24927 313
+SHA256 2ddfe40b5e7929b1c09f4639cb3cb18d69fbaea0a29449fe255701abd3eb8bb1 files/digest-vmware-server-console-1.0.0.24927 313
diff --git a/app-emulation/vmware-server-console/files/digest-vmware-server-console-1.0.0.24927 b/app-emulation/vmware-server-console/files/digest-vmware-server-console-1.0.0.24927
new file mode 100644
index 0000000..9837f48
--- /dev/null
+++ b/app-emulation/vmware-server-console/files/digest-vmware-server-console-1.0.0.24927
@@ -0,0 +1,3 @@
+MD5 b8a85550e9df0c2e6057ed18b01d06f9 VMware-server-linux-client-1.0.0-24927.zip 23347926
+RMD160 7c77d6b0981af78f3c32d127da0b5db9db1961c8 VMware-server-linux-client-1.0.0-24927.zip 23347926
+SHA256 c92d8b25b08fe654bf2ea73b0010c4a4ffce651e1d3f08c040d36b8f1df2b458 VMware-server-linux-client-1.0.0-24927.zip 23347926
diff --git a/app-emulation/vmware-server-console/vmware-server-console-1.0.0.24927.ebuild b/app-emulation/vmware-server-console/vmware-server-console-1.0.0.24927.ebuild
new file mode 100644
index 0000000..6763ee0
--- /dev/null
+++ b/app-emulation/vmware-server-console/vmware-server-console-1.0.0.24927.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# 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
+# which the user must run manually.
+
+inherit eutils versionator
+
+MY_PN=${PN/vm/VM}
+MY_PV=$(replace_version_separator 3 '-')
+NP="${MY_PN}-${MY_PV}"
+FN="VMware-server-linux-client-${MY_PV}"
+S="${WORKDIR}/${PN}-distrib"
+
+DESCRIPTION="VMware Remote Console for Linux"
+HOMEPAGE="http://www.vmware.com/"
+SRC_URI="http://download3.vmware.com/software/vmserver/${FN}.zip"
+
+LICENSE="vmware"
+IUSE=""
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="nostrip"
+
+DEPEND=">=sys-libs/glibc-2.3.5
+		virtual/os-headers
+		>=dev-lang/perl-5
+		>=sys-apps/portage-2.0.54
+		app-arch/unzip
+	   "
+# vmware-server-console should not use virtual/libc as this is a 
+# precompiled binary package thats linked to glibc.
+RDEPEND=">=sys-libs/glibc-2.3.5
+		 amd64? ( app-emulation/emul-linux-x86-gtklibs )
+		 !amd64 ( || ( ( x11-libs/libSM
+						 x11-libs/libICE
+						 x11-libs/libX11
+						 x11-libs/libXau
+						 x11-libs/libXcursor
+						 x11-libs/libXdmcp
+						 x11-libs/libXext
+						 x11-libs/libXfixes
+						 x11-libs/libXft
+						 x11-libs/libXi
+						 x11-libs/libXrandr
+						 x11-libs/libXrender
+						 x11-libs/libXt
+						 x11-libs/libXtst
+	     	  		   )
+			  		   virtual/x11
+	        		 )
+				)
+		 >=dev-lang/perl-5
+		 "
+
+etcdir="/etc/${PN}"
+dir="/opt/vmware/server/console"
+Ddir=${D}/${dir}
+
+src_unpack() {
+	cd ${WORKDIR}
+	unpack ${FN}.zip
+	unpack ./${NP}.tar.gz
+	cd ${S}
+}
+
+src_install() {
+	echo 'libdir = "/opt/vmware/server/console/lib"' >etc/config
+	
+	dodir ${dir}/bin
+	cp -pPR ${S}/bin/* ${Ddir}/bin
+
+	dodir ${dir}/lib
+	cp -dr ${S}/lib/* ${Ddir}/lib
+
+	dodoc doc/* || die "dodoc"
+	# Fix for bug #91191
+	dodir ${dir}/doc
+	insinto ${dir}/doc
+	doins doc/EULA || die "copying EULA"
+
+	doman ${S}/man/man1/${PN}.1.gz || die "doman"
+
+	# vmware enviroment
+	doenvd ${FILESDIR}/99${PN} || die "doenvd"
+
+	dodir ${etcdir}
+	cp -pPR etc/* ${D}${etcdir}
+
+	insinto ${dir}/lib/icon
+	newins ${S}/doc/icon48x48.png ${PN}.png || die
+	newicon ${S}/doc/icon48x48.png ${PN}.png || die
+	insinto /usr/share/mime/packages
+	doins ${FILESDIR}/vmware.xml
+
+	make_desktop_entry ${PN} "VMWare Remote Console" ${PN}.png
+
+	dodir /usr/bin
+	dosym ${dir}/bin/${PN} /usr/bin/${PN}
+
+	# Questions:
+	einfo "Adding answers to ${etcdir}/locations"
+	locations="${D}${etcdir}/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}
+}
+
+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/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 ${etcdir}/locations file."
+	d=`echo ${D} | wc -c`
+	for x in `find ${Ddir} ${D}${etcdir}` ; do
+		x="`echo ${x} | cut -c ${d}-`"
+		if [ -d ${D}/${x} ] ; then
+			echo "directory ${x}" >> ${D}${etcdir}/locations
+		else
+			echo -n "file ${x}" >> ${D}${etcdir}/locations
+			if [ "${x}" == "${etcdir}/locations" ] ; then
+				echo "" >> ${D}${etcdir}/locations
+			elif [ "${x}" == "${etcdir}/not_configured" ] ; then
+				echo "" >> ${D}${etcdir}/locations
+			else
+				echo -n " " >> ${D}${etcdir}/locations
+				#perl -e "@a = stat('${D}${x}'); print \$a[9]" >> ${D}${etcdir}/locations
+				find ${D}${x} -printf %T@ >> ${D}${etcdir}/locations
+				echo "" >> ${D}${etcdir}/locations
+			fi
+		fi
+	done
+}
+
+pkg_config() {
+	einfo "Running ${ROOT}${dir}/bin/vmware-config-server-console.pl"
+	${ROOT}${dir}/bin/vmware-config-server-console.pl
+}
+
+pkg_postinst() {
+	update-mime-database "${ROOT}/usr/share/mime"
+
+	# 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-console.pl script it can delete it.
+	einfo "Updating ${etcdir}/locations"
+	for x in "${ROOT}${etcdir}/._cfg????_locations" ; do
+		if [ -f $x ] ; then
+			cat $x >> "${ROOT}${etcdir}/locations"
+			rm $x
+		fi
+	done
+
+	einfo
+	einfo "You need to run"
+	einfo 
+	einfo "    ${dir}/bin/vmware-config-server-console.pl"
+	einfo
+	einfo "to complete the install."
+	einfo
+	einfo "For VMware Add-Ons just visit"
+	einfo "http://www.vmware.com/download/downloadaddons.html"
+	einfo
+}
+
+pkg_postrm() {
+	einfo
+	einfo "To remove all traces of vmware you will need to remove the files"
+	einfo "in ${etcdir}."
+	einfo
+}