BIG update for the vmware-* packages, including:

* New patch system
* Cleaned up files directory
* New vmware-modules build system
* New vmware-pkg eclass (to be used for workstation/player/etc eventually)
* Vmware-console now finally installed as vmware-server-console

svn path=/trunk/; revision=33

5 files changed, 51 insertions, 42 deletions

diff --git a/app-emulation/vmware-server-console/Manifest b/app-emulation/vmware-server-console/Manifest
index 260f38d..5f99879 100644
--- a/app-emulation/vmware-server-console/Manifest
+++ b/app-emulation/vmware-server-console/Manifest
@@ -1,12 +1,16 @@
-MD5 e422834560595f9a56b6a2036c583b97 files/99vmware-console 76
-RMD160 22fed127d20bfb758163443dcbd2879bf1d49be6 files/99vmware-console 76
-SHA256 ff3abe9d58fd673d8f3d2f7e967aa6db426e3e15b4d868dc1483682357a928b8 files/99vmware-console 76
-MD5 20044d05f014c70b544f249d90d34b62 files/digest-vmware-server-console-1.0.0.22874 313
-RMD160 0863d8d3619946bb0dba171ae7ce51779193a07b files/digest-vmware-server-console-1.0.0.22874 313
-SHA256 9d759b10342ded232cf2cb955a6c2f23da308b4c21d15d65725ba85501e6d6dd files/digest-vmware-server-console-1.0.0.22874 313
+AUX 99vmware-server-console 76 RMD160 22fed127d20bfb758163443dcbd2879bf1d49be6 SHA1 105e3194c134b752a8d5cef1a23ae621cd835d80 SHA256 ff3abe9d58fd673d8f3d2f7e967aa6db426e3e15b4d868dc1483682357a928b8 size 76
+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
 MD5 aa1b576735134579f04b29763901dc4f files/vmware.xml 1592
 RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e8c files/vmware.xml 1592
 SHA256 56aafee80ad705e8d832f8853c36d763d37b87d1cb132a41c50eb63085ae854d files/vmware.xml 1592
-MD5 f4b4fb8a9ac98ed3766cf009e10528b1 vmware-server-console-1.0.0.22874.ebuild 5135
-RMD160 6a22ca003388b4fe5d7a27cbda48e4f94ff5f2cc vmware-server-console-1.0.0.22874.ebuild 5135
-SHA256 fbd48f93e96ac433fafc8aa521ab7385ade04ab693a7f2f6deb6d85f833e692c vmware-server-console-1.0.0.22874.ebuild 5135
+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 4881 RMD160 034106ee25921ac9c626b433131c7c904b715caa SHA1 a33a9d83fbf2d4ccee01c41dc85367740b5479b9 SHA256 428f7d2f94b0e7f33f38855d78b695fff265eba78986a13889dfb85ba58170da size 4881
+MD5 123e3a863ae2d67d0a6588751d9c8a4b vmware-server-console-1.0.0.23869.ebuild 4881
+RMD160 034106ee25921ac9c626b433131c7c904b715caa vmware-server-console-1.0.0.23869.ebuild 4881
+SHA256 428f7d2f94b0e7f33f38855d78b695fff265eba78986a13889dfb85ba58170da vmware-server-console-1.0.0.23869.ebuild 4881
+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
diff --git a/app-emulation/vmware-server-console/files/99vmware-console b/app-emulation/vmware-server-console/files/99vmware-server-console
index 847dd8c..847dd8c 100644
--- a/app-emulation/vmware-server-console/files/99vmware-console
+++ b/app-emulation/vmware-server-console/files/99vmware-server-console
diff --git a/app-emulation/vmware-server-console/files/digest-vmware-server-console-1.0.0.22874 b/app-emulation/vmware-server-console/files/digest-vmware-server-console-1.0.0.22874
deleted file mode 100644
index 11777e9..0000000
--- a/app-emulation/vmware-server-console/files/digest-vmware-server-console-1.0.0.22874
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 63e5e8d689eaaf68da3abd7077ef48e4 VMware-server-linux-client-e.x.p-22874.zip 33781705
-RMD160 3b502888eb91bf33499899da9ca1ed42af5a7fa8 VMware-server-linux-client-e.x.p-22874.zip 33781705
-SHA256 d28608b0dd66ae2015db60e8bba9e1278f3d382183029de8b5850b099399620c VMware-server-linux-client-e.x.p-22874.zip 33781705
diff --git a/app-emulation/vmware-server-console/files/digest-vmware-server-console-1.0.0.23869 b/app-emulation/vmware-server-console/files/digest-vmware-server-console-1.0.0.23869
new file mode 100644
index 0000000..3ece405
--- /dev/null
+++ b/app-emulation/vmware-server-console/files/digest-vmware-server-console-1.0.0.23869
@@ -0,0 +1,3 @@
+MD5 0d96ddfa90ede84a7b3632b9681875fc VMware-server-linux-client-e.x.p-23869.zip 24680832
+RMD160 0bd8cf6acd4924519d44506387eb869ad5b9fd7d VMware-server-linux-client-e.x.p-23869.zip 24680832
+SHA256 0d585a3eec68e8ee2d06dc64c9e7613fa12ce5095a5fbaf8f101fd008041687d VMware-server-linux-client-e.x.p-23869.zip 24680832
diff --git a/app-emulation/vmware-server-console/vmware-server-console-1.0.0.22874.ebuild b/app-emulation/vmware-server-console/vmware-server-console-1.0.0.23869.ebuild
index c9948b0..640aefd 100644
--- a/app-emulation/vmware-server-console/vmware-server-console-1.0.0.22874.ebuild
+++ b/app-emulation/vmware-server-console/vmware-server-console-1.0.0.23869.ebuild
@@ -8,11 +8,11 @@
 
 inherit eutils versionator
 
-MY_PN="VMware-console"
+MY_PN=${PN/vm/VM}
 MY_PV="e.x.p-$(get_version_component_range 4)"
 NP="${MY_PN}-${MY_PV}"
 FN="VMware-server-linux-client-${MY_PV}"
-S="${WORKDIR}/vmware-console-distrib"
+S="${WORKDIR}/${PN}-distrib"
 
 DESCRIPTION="VMware Remote Console for Linux"
 HOMEPAGE="http://www.vmware.com/"
@@ -55,7 +55,8 @@ RDEPEND=">=sys-libs/glibc-2.3.5
 		 >=dev-lang/perl-5
 		 "
 
-dir=/opt/vmware/server/console
+etcdir="/etc/${PN}"
+dir="/opt/vmware/server/console"
 Ddir=${D}/${dir}
 
 src_unpack() {
@@ -80,13 +81,13 @@ src_install() {
 	insinto ${dir}/doc
 	doins doc/EULA || die "copying EULA"
 
-	doman ${S}/man/man1/vmware-console.1.gz || die "doman"
+	doman ${S}/man/man1/${PN}.1.gz || die "doman"
 
 	# vmware enviroment
-	doenvd ${FILESDIR}/99vmware-console || die "doenvd"
+	doenvd ${FILESDIR}/99${PN} || die "doenvd"
 
-	dodir /etc/vmware-console/
-	cp -pPR etc/* ${D}/etc/vmware-console/
+	dodir ${etcdir}
+	cp -pPR etc/* ${D}${etcdir}
 
 	insinto ${dir}/lib/icon
 	newins ${S}/doc/icon48x48.png ${PN}.png || die
@@ -94,14 +95,14 @@ src_install() {
 	insinto /usr/share/mime/packages
 	doins ${FILESDIR}/vmware.xml
 
-	make_desktop_entry vmware-console "VMWare Remote Console" ${PN}.png
+	make_desktop_entry ${PN} "VMWare Remote Console" ${PN}.png
 
 	dodir /usr/bin
-	dosym ${dir}/bin/vmware-console /usr/bin/vmware-console
+	dosym ${dir}/bin/${PN} /usr/bin/${PN}
 
 	# Questions:
-	einfo "Adding answers to /etc/vmware-console/locations"
-	locations="${D}/etc/vmware-console/locations"
+	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}
@@ -119,31 +120,31 @@ pkg_preinst() {
 	#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-console/locations file."
+	einfo "Generating ${etcdir}/locations file."
 	d=`echo ${D} | wc -c`
-	for x in `find ${Ddir} ${D}/etc/vmware-console` ; do
+	for x in `find ${Ddir} ${D}${etcdir}` ; do
 		x="`echo ${x} | cut -c ${d}-`"
 		if [ -d ${D}/${x} ] ; then
-			echo "directory ${x}" >> ${D}/etc/vmware-console/locations
+			echo "directory ${x}" >> ${D}${etcdir}/locations
 		else
-			echo -n "file ${x}" >> ${D}/etc/vmware-console/locations
-			if [ "${x}" == "/etc/vmware-console/locations" ] ; then
-				echo "" >> ${D}/etc/vmware-console/locations
-			elif [ "${x}" == "/etc/vmware-console/not_configured" ] ; then
-				echo "" >> ${D}/etc/vmware-console/locations
+			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}/etc/vmware-console/locations
-				#perl -e "@a = stat('${D}${x}'); print \$a[9]" >> ${D}/etc/vmware-console/locations
-				find ${D}${x} -printf %T@ >> ${D}/etc/vmware-console/locations
-				echo "" >> ${D}/etc/vmware-console/locations
+				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-console.pl"
-	${ROOT}${dir}/bin/vmware-config-console.pl
+	einfo "Running ${ROOT}${dir}/bin/vmware-config-server-console.pl"
+	${ROOT}${dir}/bin/vmware-config-server-console.pl
 }
 
 pkg_postinst() {
@@ -152,16 +153,20 @@ 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-console.pl script it can delete it.
-	einfo "Updating /etc/vmware-console/locations"
-	for x in "${ROOT}/etc/vmware-console/._cfg????_locations" ; do
+	einfo "Updating ${etcdir}/locations"
+	for x in "${ROOT}${etcdir}/._cfg????_locations" ; do
 		if [ -f $x ] ; then
-			cat $x >> "${ROOT}/etc/vmware-console/locations"
+			cat $x >> "${ROOT}${etcdir}/locations"
 			rm $x
 		fi
 	done
 
 	einfo
-	einfo "You need to run ${dir}/bin/vmware-config-console.pl to complete the install."
+	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"
@@ -171,6 +176,6 @@ pkg_postinst() {
 pkg_postrm() {
 	einfo
 	einfo "To remove all traces of vmware you will need to remove the files"
-	einfo "in /etc/vmware-console/."
+	einfo "in ${etcdir}."
 	einfo
 }