From 7a6d839256c4734c98abadea9e062d0ff4788ad6 Mon Sep 17 00:00:00 2001
From: geos_one <geos_one@6952d904-891a-0410-993b-d76249ca496b>
Date: Sun, 31 May 2009 21:18:43 +0000
Subject: [PATCH] small corrections

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@1289 6952d904-891a-0410-993b-d76249ca496b
---
 eclass/vmware-1.eclass     | 38 +++++++++++++++++++++++---------------
 eclass/vmware-mod-2.eclass |  2 +-
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/eclass/vmware-1.eclass b/eclass/vmware-1.eclass
index 06c74594..19ebb3a3 100644
--- a/eclass/vmware-1.eclass
+++ b/eclass/vmware-1.eclass
@@ -40,13 +40,13 @@ vmware-1_determine_product() {
 	case "${shortname}" in
 		workstation)
 			FULL_NAME="Workstation"
-			SRC_URI="mirror://vmware/software/wkst/${VM_SRC}"
+			SRC_URI_ROOT="mirror://vmware/software/wkst/"
 			HOMEPAGE="http://www.vmware.com/download/ws/"
 			RESTRICT="fetch strip"
 			;;
 		player)
 			FULL_NAME="Player"
-			SRC_URI="mirror://vmware/software/vmplayer/${VM_SRC}"
+			SRC_URI_ROOT="mirror://vmware/software/vmplayer/"
 			HOMEPAGE="http://www.vmware.com/download/player/"
 			;;
 		converter)
@@ -55,12 +55,12 @@ vmware-1_determine_product() {
 			;;
 		server)
 			FULL_NAME="Server"
-			SRC_URI="mirror://vmware/software/vmserver/${VM_SRC}"
+			SRC_URI_ROOT="mirror://vmware/software/vmserver/"
 			HOMEPAGE="http://www.vmware.com/download/server/"
 			;;
 		server-console)
 			FULL_NAME="Server Console"
-			SRC_URI="mirror://vmware/software/vmserver/${VM_SRC}"
+			SRC_URI_ROOT="mirror://vmware/software/vmserver/"
 			HOMEPAGE="http://www.vmware.com/download/server/"
 			config_program="vmware-config-server-console.pl"
 			config_dir="/etc/${PN}"
@@ -71,18 +71,16 @@ vmware-1_determine_product() {
 	esac
 }
 
-DEPEND="x11-misc/shared-mime-info"
-DESCRIPTION="VMware ${FULL_NAME} for Linux"
+# check if we have a amd64 package
+if [[ -n  ${VM_SRC64} ]]
+then
+	SRC_URI="x86? ( ${SRC_URI_ROOT}${VM_SRC} )
+			amd64? ( ${SRC_URI_ROOT}${VM_SRC64} )"
+else
+	SRC_URI="${SRC_URI_ROOT}${VM_SRC}"
+fi
 
-LICENSE="vmware"
-IUSE=""
-RESTRICT="strip"
-
-#if [ -z "${VM_SRC}" ] && die "Buggy ebuild plz define VM_SRC"
-
-vmware-1_determine_product
-
-if [ -n "${VM_SRC_EXTRA}" ]
+if [[ -n "${VM_SRC_EXTRA}" ]]
 then
 	for a in ${VM_SRC_EXTRA}
 	do
@@ -90,6 +88,16 @@ then
 	done
 fi
 
+DESCRIPTION="VMware ${FULL_NAME} for Linux"
+LICENSE="vmware"
+RESTRICT="strip mirror"
+SLOT="0"
+DEPEND="x11-misc/shared-mime-info"
+
+#if [ -z "${VM_SRC}" ] && die "Buggy ebuild plz define VM_SRC"
+
+vmware-1_determine_product
+
 export VMWARE_GROUP=${VMWARE_GROUP:-vmware}
 export VMWARE_INSTALL_DIR=/opt/${PN//-//}
 
diff --git a/eclass/vmware-mod-2.eclass b/eclass/vmware-mod-2.eclass
index fe7b1ee8..4e3728e8 100644
--- a/eclass/vmware-mod-2.eclass
+++ b/eclass/vmware-mod-2.eclass
@@ -18,7 +18,7 @@ case ${PN} in
 	vmware-modules)
 		# vmware modules greater 208 (Workstation 6.5.* or Player 2.5.* or server 2.0.*) are GPL-2
 		# the MAJOR version number is from vmmon-only/include/iocontrols.h VMMON_VERSION
-		# the MINOR version number is the SUBVERSION number if the wkst, player, or server package
+		# the MINOR version number is the SUBVERSION number of the wkst, player, or server package
 		# (normally they match) put them into its own package
 		# older modules are licensed VMware Confidental
 		# we have to get them from the upstream package