--- vmware-workstation-4.5.1.7568-r1.ebuild	2004-06-10 04:23:00.000000000 +0900
+++ vmware-workstation-4.5.2.8848.ebuild	2004-06-12 16:46:58.608082927 +0900
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.5.1.7568-r1.ebuild,v 1.1 2004/06/09 19:23:00 wolf31o2 Exp $
+# $Header: $
 
 # 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
@@ -9,8 +9,7 @@
 inherit eutils
 
 S=${WORKDIR}/vmware-distrib
-N26KernSupport="vmware-any-any-update69"
-NP="VMware-workstation-4.5.1-7568"
+NP="VMware-workstation-4.5.2-8848"
 DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
 HOMEPAGE="http://www.vmware.com/products/desktop/ws_features.html"
 SRC_URI="http://vmware-svca.www.conxion.com/software/wkst/${NP}.tar.gz
@@ -21,14 +20,11 @@
 	http://vmware-chil.www.conxion.com/software/wkst/${NP}.tar.gz
 	http://vmware-heva.www.conxion.com/software/wkst/${NP}.tar.gz
 	http://vmware.wespe.de/software/wkst/${NP}.tar.gz
-	ftp://vmware.wespe.de/pub/software/wkst/${NP}.tar.gz
-	http://ftp.cvut.cz/vmware/${N26KernSupport}.tar.gz
-	http://knihovny.cvut.cz/ftp/pub/vmware/${N26KernSupport}.tar.gz"
+	ftp://vmware.wespe.de/pub/software/wkst/${NP}.tar.gz"
 
 LICENSE="vmware"
-IUSE=""
 SLOT="0"
-KEYWORDS="-* ~x86 -amd64"
+KEYWORDS="-* x86 -amd64"
 # VMWare is broken on amd64.  Please do not file any bugs on it, as we will
 # mark them as WONTFIX until we get some proper vendor support for the amd64
 # platform.  Hopefully, this will be sooner than later.
@@ -45,19 +41,24 @@
 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"
-		cd ${S}
-		unpack ${N26KernSupport}.tar.gz
-		mv -f ${N26KernSupport}/*.tar ${S}/lib/modules/source/
-	else
-		einfo "Using 2.4.x kernel support"
-	fi
+	for mod in vmnet vmmon; do
+		if [ -f "${FILESDIR}/${mod}-${PV}-koutput.patch" ]; then
+			tar -C "${WORKDIR}" -x -f "${S}/lib/modules/source/${mod}.tar" || die
+			cd "${WORKDIR}/${mod}-only"
+			epatch "${FILESDIR}/${mod}-${PV}-koutput.patch"
+			chmod u+w "${S}/lib/modules/source/${mod}.tar"
+			tar -C "${WORKDIR}" -c ${mod}-only > "${S}/lib/modules/source/${mod}.tar" || die
+			chmod u-w "${S}/lib/modules/source/${mod}.tar"
+		fi
+	done
+	cd "${S}/bin"
+	epatch "${FILESDIR}/vmware-config-${PV}-koutput.patch"
 }
 
 src_install() {
 	dodir /opt/vmware/bin
 	cp -a bin/* ${D}/opt/vmware/bin/
+	sed -ie 's,exec,unset $(locale | awk -F= '\''{print $1}'\'')\nexec,' ${D}/opt/vmware/bin/vmware || die
 	# 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
@@ -125,6 +126,7 @@
 	echo "answer RUN_CONFIGURATOR no" >> ${locations}
 	echo "answer INITDIR /etc/vmware/init.d" >> ${locations}
 	echo "answer INITSCRIPTSDIR /etc/vmware/init.d" >> ${locations}
+	echo "answer HEADER_DIR /usr/src/linux/include" >> ${locations}
 }
 
 pkg_preinst() {
@@ -139,22 +141,23 @@
 	#(drobbins, 1 Feb 2002)
 
 	einfo "Generating /etc/vmware/locations file."
+	locations="${D}/etc/vmware/locations"
 	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
+			echo "directory ${x}" >> ${locations}
 		else
-			echo -n "file ${x}" >> ${D}/etc/vmware/locations
+			echo -n "file ${x}" >> ${locations}
 			if [ "${x}" == "/etc/vmware/locations" ] ; then
-				echo "" >> ${D}/etc/vmware/locations
+				echo "" >> ${locations}
 			elif [ "${x}" == "/etc/vmware/not_configured" ] ; then
-				echo "" >> ${D}/etc/vmware/locations
+				echo "" >> ${locations}
 			else
-				echo -n " " >> ${D}/etc/vmware/locations
+				echo -n " " >> ${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
+				find ${D}${x} -printf %T@ >> ${locations}
+				echo "" >> ${locations}
 			fi
 		fi
 	done