move

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/vmware@1339 6952d904-891a-0410-993b-d76249ca496b
2009-07-08 05:56:58 +00:00 · 2009-07-08 05:56:58 +00:00 · 3d8a8a5570
commit 3d8a8a5570
parent bdcbfbbf16
59 changed files with 2769 additions and 0 deletions
--- a/app-emulation/vmware-converter/ChangeLog
+++ b/app-emulation/vmware-converter/ChangeLog
@ -0,0 +1,12 @@
+# ChangeLog for app-emulation/vmware-converter
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  04 Mar 2009; Mike Auty <ikelos@gentoo.org>
+  vmware-converter-4.0.0.146302.ebuild:
+  Fix up lack of datadir during startup.
+
+  04 Mar 2009; Mike Auty <ikelos@gentoo.org>
+  vmware-converter-4.0.0.146302.ebuild:
+  Change dependencies, so no need for X unless we're installing the client.
+
--- a/app-emulation/vmware-converter/Manifest
+++ b/app-emulation/vmware-converter/Manifest
@ -0,0 +1,10 @@
+AUX 4.0.0.146302.off/000_all_initd-location.patch 1131 RMD160 3ab69d825994cc3bb177143d27091fc292cec46a SHA1 14264460c8500f1ead267059e2b9b9a5dc8c057f SHA256 b4055370b0092e71a2b2b0f27edeb7bc063ad265f95ab4530e52c3ab3167ad62
+AUX 4.0.0.146302.off/001_all_fix-permissions.patch 647 RMD160 0f25f7dd60dfcb5a72b1f7b9cf344d6f431143a9 SHA1 cabd3dd071ef62d4c70f52d1a3e02334ec7f3a73 SHA256 41492cde60da6d449c0f427ac7bd65598838ec17ac0e3a5f545feeb1d29ea391
+AUX 4.0.0.146302.off/002_all_pagebreak-detection-fix.patch 800 RMD160 f21a51e552d025a5120519d6dcd41efc3835a432 SHA1 06133c332b6b1f57476b1154de108a9dfc35435d SHA256 d327d7cb2166b9ef4c8c286568c3a7eb64542212164d58b8a7a3c5e51e19ed6d
+AUX 4.0.0.146302.off/004_all_do-not-build-modules.patch 589 RMD160 b2153579c65a232de9c2e6dbd9bbe108d85f95e5 SHA1 394a67a30f1f29084836183303641915ce982bfd SHA256 916754b0616ea330490b9572be1a9216bb7dd441ba328b1e01e777b29fac4e1e
+AUX 4.0.0.146302.off/007_all_use-modprobe-over-insmod.patch 445 RMD160 186ab443a733276a702dea16a23c04f7deed9d13 SHA1 c7113cd3f7f91527397f6fb07797d4e9c5c6f011 SHA256 bcf4930fae4812c8fbb2eb58b200f1da9441d97cd0c74b8ee6250cf097a28630
+AUX 4.0.0.146302.off/009_all_init.d-modules-warning.patch 991 RMD160 6205e976db47cd3361b5eca8593414d411a2ab8d SHA1 3742749baa606a57d447931f0af791696a49e660 SHA256 5fbc9f101abb3816a732f64a75e90ce7fcb6783c3cd7bae521d8785e88634498
+AUX vmware-converter.rc 1500 RMD160 f5bc22dbee280583ebca78836f38d82a4e164409 SHA1 0326487bea4369c8ac2ee1796f472e5e0f0bd858 SHA256 348a516325be26f64b6bbded7fde25f392478a8511330200e6cd58d6977d6067
+DIST VMware-converter-4.0.0-146302.tar.gz 122325894 RMD160 8919371ded3a6756e6d175515bd273a4bf06bd93 SHA1 b736e69a65b96406d3407032fd18f84e403c72f1 SHA256 7a34ba719630979fc1fe0b210e13f2c8ddc414a8baf63400a1f586adffc6f0f0
+EBUILD vmware-converter-4.0.0.146302.ebuild 3209 RMD160 2fdac7591a35be5e1bcaf55c832f3e6da28cdaa5 SHA1 e57423cfd999c8dfb1f0f5f8af9c99158eed46fd SHA256 92fbdd71ca5d10f3867d6d70f446ccb53b7e05e8a4ff6a1ec772dc678c08d277
+MISC ChangeLog 420 RMD160 98ebc3d45419cc011ef7f1153b8521d4e5da029c SHA1 708e6ca231d6b4061ed3b8827d80f3dde109f652 SHA256 ae1792443e57646726d5269435ea59ba5d4a7aaa604e0a0cb78094f08177424d
--- a/app-emulation/vmware-converter/files/4.0.0.146302.off/000_all_initd-location.patch
+++ b/app-emulation/vmware-converter/files/4.0.0.146302.off/000_all_initd-location.patch
@ -0,0 +1,31 @@
+--- vmware-distrib/bin/vmware-config.pl.ori	2005-11-09 01:45:08.000000000 +0000
+++ vmware-distrib/bin/vmware-config.pl	2005-11-09 01:48:21.000000000 +0000
+@@ -8433,7 +8433,7 @@
+          error('Please shut down any running VMs and run this script again.' .
+                "\n\n");
+       } else {
+-         if (system(shell_string(db_get_answer('INITSCRIPTSDIR') . '/vmware')
+         if (system(shell_string('/etc/init.d' . '/vmware')
+                     . ' stop')) {
+             error('Unable to stop services for ' . vmware_product_name() .
+                   "\n\n");
+@@ -8463,8 +8463,8 @@
+   }
+   if (vmware_product() ne 'server') {
+     configure_gtk2();
+-    createMimePackageFile();
+-    configureDesktopFiles();
+#   createMimePackageFile();
+#   configureDesktopFiles();
+     configure_mon();
+     configure_pp();
+     configure_net();
+@@ -8532,7 +8532,7 @@
+   db_save();
+   # Then start VMware's services
+   if (!$gOption{'skipstopstart'}) {
+-    system(shell_string(db_get_answer('INITSCRIPTSDIR') . '/vmware') . ' start');
+    system(shell_string('/etc/init.d' . '/vmware') . ' start');
+     print "\n";
+   }
+ 
--- a/app-emulation/vmware-converter/files/4.0.0.146302.off/001_all_fix-permissions.patch
+++ b/app-emulation/vmware-converter/files/4.0.0.146302.off/001_all_fix-permissions.patch
@ -0,0 +1,15 @@
+diff -urN vmware-distrib.orig/bin/vmware-config.pl vmware-distrib/bin/vmware-config.pl
+--- vmware-distrib.orig/bin/vmware-config.pl	2005-12-16 00:51:03.000000000 -0500
+++ vmware-distrib/bin/vmware-config.pl	2005-12-21 14:34:03.000000000 -0500
+@@ -7327,7 +7327,10 @@
+     error('Unable to write configuration file "' . $name . '".' . "\n\n");
+   }
+   db_add_file($name, 0x1);
+-  safe_chmod(0644, $name);
+  safe_chmod(0664, $name);
+  my $gid = (getgrnam('vmware'))[2];
+  my $uid = (stat($name))[4];
+  safe_chown($uid,$gid,$name);
+ 
+   # Append the promotional configuration if it exists
+   $promoconfig = $libdir . '/configurator/PROMOCONFIG';
--- a/app-emulation/vmware-converter/files/4.0.0.146302.off/002_all_pagebreak-detection-fix.patch
+++ b/app-emulation/vmware-converter/files/4.0.0.146302.off/002_all_pagebreak-detection-fix.patch
@ -0,0 +1,15 @@
+diff -ur vmware-distrib.orig/bin/vmware-config.pl vmware-distrib/bin/vmware-config.pl
+--- vmware-distrib.orig/bin/vmware-config.pl	2006-03-24 23:13:05.000000000 +0100
+++ vmware-distrib/bin/vmware-config.pl	2006-03-24 23:26:40.000000000 +0100
+@@ -2015,9 +2015,9 @@
+       . shell_string($pattern));
+     chomp($header_page_offset);
+     # Ignore PAGE_OFFSET if we cannot parse it.
+-    if ($header_page_offset =~ /^$pattern \(?0x([0-9a-fA-F]{8,})/) {
+    if ($header_page_offset =~ /^$pattern \(?(\([^)]*\))?\)?0x([0-9a-fA-F]{8,}).*$/) {
+       # We found a valid page offset
+-      $header_page_offset = $1;
+      $header_page_offset = $2;
+       if (defined($gSystem{'page_offset'}) and
+           not (lc($header_page_offset) eq lc($gSystem{'page_offset'}))) {
+         if ($source eq 'user') {
--- a/app-emulation/vmware-converter/files/4.0.0.146302.off/004_all_do-not-build-modules.patch
+++ b/app-emulation/vmware-converter/files/4.0.0.146302.off/004_all_do-not-build-modules.patch
@ -0,0 +1,17 @@
+diff -uNr vmware-server-distrib.orig/bin/vmware-config.pl vmware-server-distrib/bin/vmware-config.pl
+--- vmware-server-distrib.orig/bin/vmware-config.pl	2006-02-18 18:12:26.000000000 +0000
+++ vmware-server-distrib/bin/vmware-config.pl	2006-02-18 18:14:17.000000000 +0000
+@@ -8571,10 +8571,10 @@
+     configure_gtk2();
+ #   createMimePackageFile();
+ #   configureDesktopFiles();
+-    configure_mon();
+-    configure_pp();
+#   configure_mon();
+#   configure_pp();
+     configure_net();
+-    build_vmnet();
+#    build_vmnet();
+   }
+ 
+   # Create the directory for the UNIX domain sockets
--- a/app-emulation/vmware-converter/files/4.0.0.146302.off/007_all_use-modprobe-over-insmod.patch
+++ b/app-emulation/vmware-converter/files/4.0.0.146302.off/007_all_use-modprobe-over-insmod.patch
@ -0,0 +1,12 @@
+diff -uNr vmware-server-distrib/installer/services.sh vmware-server-distrib.new/installer/services.sh
+--- vmware-server-distrib/installer/services.sh	2006-02-05 00:21:25.000000000 +0000
+++ vmware-server-distrib.new/installer/services.sh	2006-02-20 23:48:07.000000000 +0000
+@@ -538,7 +538,7 @@
+ }
+ 
+ vmware_load_module() {
+-   /sbin/insmod -s -f "/lib/modules/`uname -r`/misc/$1.o" || exit 1
+   /sbin/modprobe -s "$1" || exit 1
+    exit 0
+ }
+ 
--- a/app-emulation/vmware-converter/files/4.0.0.146302.off/009_all_init.d-modules-warning.patch
+++ b/app-emulation/vmware-converter/files/4.0.0.146302.off/009_all_init.d-modules-warning.patch
@ -0,0 +1,19 @@
+diff -uNr vmware-server-distrib.orig/installer/services.sh vmware-server-distrib/installer/services.sh
+--- vmware-server-distrib.orig/installer/services.sh	2006-07-01 03:14:16.000000000 +0000
+++ vmware-server-distrib/installer/services.sh	2006-07-14 11:59:28.000000000 +0000
+@@ -606,8 +606,13 @@
+    start)
+       if [ -e "$vmware_etc_dir"/not_configured ]; then
+          echo "`vmware_product_name`"' is installed, but it has not been (correctly) configured'
+-         echo 'for the running kernel. To (re-)configure it, invoke the'
+-         echo 'following command: '"$vmdb_answer_BINDIR"'/vmware-config.pl.'
+         echo 'for the running kernel.'
+         echo 
+         echo 'Please ensure that the modules have been compiled for this kernel:'
+         echo '  emerge --oneshot vmware-modules'
+         echo
+         echo 'Also ensure '"`vmware_product_name`"' has been configured:'
+         echo '  '"$vmdb_answer_BINDIR"'/vmware-config.pl'
+          echo
+ 
+          exit 1
--- a/app-emulation/vmware-converter/files/vmware-converter.rc
+++ b/app-emulation/vmware-converter/files/vmware-converter.rc
@ -0,0 +1,74 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/files/vmware-workstation.rc,v 1.6 2007/11/25 12:50:32 ikelos Exp $
+
+depend() {
+	need localmount
+	use logger net hald
+	after samba
+}
+
+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} -eq -1 ]
+			then
+				ewarn ${line}
+				continue
+			fi
+			case ${line} in
+			*:*)
+				einfon ${line}
+				echo
+				eend 0
+				msgtype=1;;
+			*)
+				ewarn ${line}
+				msgtype=-1
+				waserror=1;;
+			esac
+			continue
+		fi
+
+		# Strip out anything after the <esc> code
+		message=`echo ${line} | sed -e "s/^\(.*\).*$/\1/"`
+		einfon "  ${message}"
+		echo
+
+		echo ${line} | grep -q done
+		status=$?
+		eend ${status}
+
+		if [ ${status} -eq 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-converter/init.d/vmware-converter || \
+		eend 1 "vmware init script not found. Aborting" || return 1
+
+	/etc/vmware-converter/init.d/vmware-converter start | vmware_prettify start
+	return $?
+}
+
+stop() {
+	/etc/vmware-converter/init.d/vmware-converter stop | vmware_prettify stop
+	return $?
+}
--- a/app-emulation/vmware-converter/vmware-converter-4.0.0.146302.ebuild
+++ b/app-emulation/vmware-converter/vmware-converter-4.0.0.146302.ebuild
@ -0,0 +1,104 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-5.5.6.80404.ebuild,v 1.2 2008/04/26 16:29:15 ikelos Exp $
+
+inherit vmware eutils versionator
+
+MY_P="VMware-converter-$(replace_version_separator 3 - $PV)"
+
+DESCRIPTION="Converts a complete PC on your PC without the usual performance overhead of most emulators"
+HOMEPAGE="http://www.vmware.com/download/ws/ws5.html"
+SRC_URI="${MY_P}.tar.gz"
+
+LICENSE="vmware"
+SLOT="0"
+KEYWORDS="-*"
+IUSE="server client"
+RESTRICT="fetch strip"
+
+# vmware-workstation should not use virtual/libc as this is a
+# precompiled binary package thats linked to glibc.
+RDEPEND="sys-libs/glibc
+	amd64? (
+		client? (
+			app-emulation/emul-linux-x86-gtklibs 
+			)
+		)
+	x86? (
+		client? (
+			x11-libs/libXrandr
+			x11-libs/libXcursor
+			x11-libs/libXinerama
+			x11-libs/libXi
+			x11-libs/libXft 
+			)
+		)
+	>=dev-lang/perl-5
+	sys-apps/pciutils"
+
+S=${WORKDIR}/vmware-converter-distrib
+
+RUN_UPDATE="no"
+ANY_ANY=""
+
+dir=/opt/vmware/converter
+Ddir=${D}/${dir}
+
+src_unpack() {
+	vmware_src_unpack
+	cd ${S}
+	rmdir sbin
+
+	sed -i -e "s|##{CONFDIR}##|/etc/vmware-converter|" ${S}/conf/converter-*.xml
+	sed -i -e "s|##{LIBDIR}##|${VMWARE_INSTALL_DIR}/lib|" ${S}/conf/converter-*.xml
+	sed -i -e "s|##{DATADIR}##|/var/lib/vmware-vcenter-converter-standalone|" ${S}/conf/converter-*.xml
+	sed -i -e "s|##{LOGDIR}##|/var/log/vmware-vcenter-converter-standalone|" ${S}/conf/converter-*.xml
+	sed -i -e "s|##{FORCELOCAL}##|false|" ${S}/conf/converter-*.xml
+	sed -i -e "s|##{STANDALONE}##|true|" ${S}/conf/converter-*.xml
+	sed -i -e "s|##{LOGINBOX}##|true|" ${S}/conf/converter-*.xml
+	sed -i -e "s|##{ENABLE_REMOTE_ACCESS}##|true|" ${S}/conf/converter-*.xml
+	sed -i -e "s|##{PROXY_HTTP_PORT}##|80|" ${S}/conf/converter-*.xml
+	sed -i -e "s|##{PROXY_HTTPS_PORT}##|443|" ${S}/conf/converter-*.xml
+}
+
+src_install() {
+	# Sed and install the files in ./conf
+	cd ${S}
+	insinto /etc/${PN}
+	doins etc/icudt38l.dat
+	doins conf/*	
+
+	# mkdir libdir and copy over the common stuff
+
+	cd ${S}/lib
+	dodir "${VMWARE_INSTALL_DIR}/lib"
+	cp -rP common/* "${D}/${VMWARE_INSTALL_DIR}/lib" || die "Failed to copy common files"
+	use server && ( cp -rP server/* "${D}/${VMWARE_INSTALL_DIR}/lib" || die "Failed to copy server files" )
+	use client && ( cp -rP client/* "${D}/${VMWARE_INSTALL_DIR}/lib" || die "Failed to copy client files" )
+
+	# Symlink everything up
+	dodir "${VMWARE_INSTALL_DIR}/bin"
+	for i in ${D}/${VMWARE_INSTALL_DIR}/lib/bin/*;
+	do
+		j=$(basename ${i})
+		dosym "${VMWARE_INSTALL_DIR}/lib/bin/${j}" "${VMWARE_INSTALL_DIR}/bin/${j}"
+	done
+
+	if $(use server);
+	then
+		dodir /etc/${PN}/init.d
+		exeinto /etc/${PN}/init.d
+		doexe ${S}/system_etc/init.d/${PN}
+		newinitd ${FILESDIR}/${PN}.rc ${PN}
+	fi
+
+	dosym /opt/vmware/converter/lib/configurator/pam.d/${PN} /etc/pam.d/${PN}
+
+	keepdir /var/lib/vmware-vcenter-converter-standalone
+
+	# Finally, we run the "questions"
+	vmware_run_questions || die "running questions"
+	
+	use server && ( echo "answer INSTALL_SERVER yes" >> "${D}${config_dir}/locations" )
+	echo "answer ENABLE_REMOTE_ACCESS yes" >> "${D}${config_dir}/locations"
+}
--- a/app-emulation/vmware-dsp/ChangeLog
+++ b/app-emulation/vmware-dsp/ChangeLog
@ -0,0 +1,20 @@
+# ChangeLog for app-emulation/vmware-dsp
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-dsp/ChangeLog,v 1.4 2008/10/05 16:45:56 flameeyes Exp $
+
+  05 Oct 2008; Diego Pettenò <flameeyes@gentoo.org> vmware-dsp-1.3.ebuild:
+  Fix build-time dependencies.
+
+  12 Jul 2007; Chris Gianelloni <wolf31o2@gentoo.org> vmware-dsp-1.3.ebuild:
+  Add another mirror.
+
+  28 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org> vmware-dsp-1.3.ebuild:
+  Already finding my first bug. I guess it helps to test both arts and esd at
+  the same time.
+
+*vmware-dsp-1.3 (28 Sep 2006)
+
+  28 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org> +metadata.xml,
+  +vmware-dsp-1.3.ebuild:
+  Initial import.  Ebuild by me.  Closing bug #97078.
+
--- a/app-emulation/vmware-dsp/Manifest
+++ b/app-emulation/vmware-dsp/Manifest
@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST vmwaredsp-1.3.tar.gz 52412 RMD160 cd82c3acca6d6b2970a2693e5e952ab550d3e7cc SHA1 3784826091536228d92a8b281084d553ca2ec9cb SHA256 cd0eebe8a6a8bbfd12828f5bc6f9d48c9cddd6188912c1ea791e36a9f55ad690
+EBUILD vmware-dsp-1.3.ebuild 2129 RMD160 344c726bcf2e0983f566fd593e371cc642bf6d42 SHA1 06424dfb49095ca938bcc95b33425a205d502d0d SHA256 68d7637adea76ba120e1fdf00fc73fe997feb202b43f2c27f16332694df1b392
+MISC ChangeLog 786 RMD160 1370d39200bb6289e8d6a5ad204b8e534536c5b9 SHA1 d739b81a7bd7d16794bdab1ab6b696d7e0b34f2c SHA256 2c580832706fc14577bb2bbd5db502602c84d0926d5507ac1dad1304ca1c124c
+MISC metadata.xml 339 RMD160 9f4931e525280fd376eb7ac3e42c369acd23a33e SHA1 3948dcc9a9b7dc585f1783e0419b313084a231c0 SHA256 bb60a871a58964feaa59ec824a5d511455054461f0394a57a8c9ca019a0f4593
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkjo70kACgkQAiZjviIA2XgqegCg6bWVhG6/Lc2wg1/AdnUYWBJI
+on0AoNUfRfRgdXH5Zab8zDFbTe2B5xTN
+=QgVx
+-----END PGP SIGNATURE-----
--- a/app-emulation/vmware-dsp/metadata.xml
+++ b/app-emulation/vmware-dsp/metadata.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>vmware</herd>
+<longdescription>
+VMWare Workstation is a virtual machine which can be used to install other operating systems in a virtual environment to run on top of Gentoo.
+</longdescription>
+</pkgmetadata>
--- a/app-emulation/vmware-dsp/vmware-dsp-1.4.1.ebuild
+++ b/app-emulation/vmware-dsp/vmware-dsp-1.4.1.ebuild
@ -0,0 +1,90 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-dsp/vmware-dsp-1.3.ebuild,v 1.5 2008/10/05 16:45:56 flameeyes Exp $
+
+inherit eutils multilib
+
+MY_PN=${PN/-/}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Allows you to use VMware Workstation with ESD and ARTS."
+HOMEPAGE="http://ftp.cvut.cz/vmware/"
+SRC_URI="http://www.sokrates.homelinux.net/~thomas/Private/Soft/vmwaredsp/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="arts esd alsa"
+RESTRICT=""
+
+RDEPEND="sys-libs/glibc
+	amd64? (
+		app-emulation/emul-linux-x86-soundlibs
+		esd? ( media-sound/esound )
+		arts? ( kde-base/arts ) )
+		alsa? ( media-sound/alsa-utils ) )
+	x86? (
+		esd? ( media-sound/esound )
+		arts? ( kde-base/arts )
+		alsa? ( media-sound/alsa-utils ) )"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+dir=/opt/vmware/dsp
+Ddir=${D}/${dir}
+
+src_compile() {
+	cd "${S}"/src
+	if use arts && use esd
+	then
+		einfo "Building both aRts and ESD support."
+	elif use arts
+	then
+		einfo "Building aRts support only."
+		sed -i '/PLUGINS :=/ s/ libvmdsp_esd.so//' 32/Makefile 64/Makefile \
+			|| die "sed failed"
+	else
+		einfo "Building ESD support only."
+		sed -i '/PLUGINS :=/ s/ libvmdsp_arts.so//' 32/Makefile 64/Makefile \
+			|| die "sed failed"
+	fi
+	if use x86
+	then
+		cd 32
+		emake -j1 || die
+	elif has_multilib_profile
+	then
+		emake -j1 || die
+	else
+		cd 64
+		emake -j1 || die
+	fi
+}
+
+src_install() {
+	cd "${S}"
+	if use x86
+	then
+		dolib src/32/libvmdsp*.so || die "Copying libraries"
+	elif has_multilib_profile
+	then
+		exeinto /usr/lib32
+		doexe src/32/libvmdsp*.so || die
+		dolib src/64/libvmdsp*.so || die
+	else
+		src/64/libvmdsp*.so || die
+	fi
+	if use arts
+	then
+		dobin vmwarearts || die
+		make_desktop_entry vmwarearts "VMware Workstation (aRts)" \
+			vmware-workstation.png System
+	fi
+	if use esd
+	then
+		dobin vmwareesd || die
+		make_desktop_entry vmwareesd "VMware Workstation (ESD)" \
+			vmware-workstation.png System
+	fi
+}
--- a/app-emulation/vmware-modules/ChangeLog
+++ b/app-emulation/vmware-modules/ChangeLog
@ -0,0 +1,57 @@
+# ChangeLog for app-emulation/vmware-modules
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  06 Jun 2009; Mario Fetka <mario.fetka@gmail.com>
+  vmware-modules-138.9.ebuild, vmware-modules-169.5.ebuild,
+  vmware-modules-208.2.ebuild:
+  changes for a more general vmware-mod-2.eclass
+
+*vmware-modules-208.2 (02 Jun 2009)
+
+  02 Jun 2009; Mario Fetka <mario.fetka@gmail.com>
+  vmware-modules-138.9.ebuild, vmware-modules-169.5.ebuild,
+  +vmware-modules-208.2.ebuild, metadata.xml:
+  add module for wkst 6.5
+
+  01 Jun 2009; Mario Fetka <mario.fetka@gmail.com>
+  vmware-modules-138.9.ebuild:
+  add warnings patches
+
+*vmware-modules-169.5 (31 May 2009)
+
+  31 May 2009; Mario Fetka <mario.fetka@gmail.com>
+  +vmware-modules-169.5.ebuild:
+  modules for wkst 6.0 / player 2.0
+
+  31 May 2009; Mario Fetka <mario.fetka@gmail.com>
+  vmware-modules-138.9.ebuild:
+  use upstream package as source for modules
+
+  30 May 2009; Mario Fetka <mario.fetka@gmail.com>
+  vmware-modules-138.9.ebuild:
+  drop 2.6.29 support
+
+  30 May 2009; Mario Fetka <mario.fetka@gmail.com>
+  vmware-modules-138.9.ebuild:
+  add warning for kernel ge 2.6.29 about init_mm issue
+
+*vmware-modules-138.9 (29 May 2009)
+
+  29 May 2009; Mario Fetka <mario.fetka@gmail.com>
+  +vmware-modules-138.9.ebuild, +metadata.xml:
+  initial checkin for the new vmware-mod-2 based modules
+
+  24 Mar 2009; Mike Auty <ikelos@gentoo.org>
+  +files/1.0.0.23-kernel-2.6.29.patch, vmware-modules-1.0.0.23.ebuild:
+  Fix compilation for 2.6.29 kernel, many thanks to Michele Schiavo for the
+  patch.
+
+  14 Jan 2009; Mike Auty <ikelos@gentoo.org>
+  files/patches/vmnet/030_all_kernel-2.6.27.patch,
+  vmware-modules-1.0.0.15-r2.ebuild, vmware-modules-1.0.0.23.ebuild:
+  Start a new changelog in the individual directories, since echangelog in
+  the root is broken for git (and I'm using git-svn). Also, sync
+  vmware-modules with the tree, should fix up kernel issues with
+  vmware-modules-1.0.0.15-r2 on kernels <= 2.6.25.
+
--- a/app-emulation/vmware-modules/Manifest
+++ b/app-emulation/vmware-modules/Manifest
@ -0,0 +1,12 @@
+DIST VMware-player-2.0.5-109488.i386.tar.gz 68597946 RMD160 4277dd999081756512f91382dd1245585848bc90 SHA1 5bb6c0c2f9ef46651998a27a435bd176d6305129 SHA256 adcda2151465fb6f21b4579fb63d4badeb1e29a024f982fd7561562a07369955
+DIST VMware-player-2.0.5-109488.x86_64.tar.gz 33383867 RMD160 de53fd58eb3fbe6b868b5f5e691e62943dc7d413 SHA1 d5d79d3beb13caa9f05f01517bc09ac4ba7b4dd1 SHA256 f5e6c53f91d9cdb2eb39442dbb97f1d5edc110c17bfe8cc91f235f0188b658b2
+DIST VMware-server-1.0.9-156507.tar.gz 107164305 RMD160 1ba44b50b1f516eb8f253e475d6b2c7b5eeb8ade SHA1 ba6e7a7b69e312e177d54c8272de25574e3d5ddb SHA256 e1c049328141f6ea77d31b38fa920d2adff5756a063fb38964faefe928cbd94c
+DIST vmware-modules-138.9-genpatches-4.tar.bz2 9800 RMD160 cfdcd75c991dfa65601c7108804d433f48b36381 SHA1 71c1b947957b31944ce7db05e3b0ce7c26767c09 SHA256 8c4169603343b4bc84c2cf50aef59871a8580475c66bdf78809e62fd5cab0097
+DIST vmware-modules-169.5-genpatches-2.tar.bz2 8448 RMD160 25039d36b6eeefe7adac483feb7d212bd69250f5 SHA1 c355632e48ef41e29cdce1c7a87d2ecfd9d465d3 SHA256 aa6109a49a9ba3e8dcbee428a9249da123e94c0d2b61071d76b1bcd11fc13f7c
+DIST vmware-modules-208.2-genpatches-1.tar.bz2 6561 RMD160 77bedf31364900fc8c1550892dca634593ec91c3 SHA1 d201f00c5df7550c1074d76d24440fd6d1d016ec SHA256 cf3e1ecbf03fa562b8630ea3fc6e6c4083093fa83ce67a5e44233b5ae7586430
+DIST vmware-modules-208.2.tar.bz2 480598 RMD160 ad26e45f71c35eb0615a8c609ab2de524140368d SHA1 ab6d5eb19e31f83adc5ce352732539746333b2d7 SHA256 0a31b5a2b49f26a433271e2505879f6a4b713617c6300ec2f6b302c6484de50c
+EBUILD vmware-modules-138.9.ebuild 962 RMD160 ce9ec49dacc6db407f62f7743e84109c09978beb SHA1 70492fc20080a90dadd7e38121da59d219868c74 SHA256 3e60c3944c0174585f36dbee25d72d9ac8203e1cbd6123b22054398261422023
+EBUILD vmware-modules-169.5.ebuild 485 RMD160 0a5cc7874a5bb753f68512274b1ac660532423b6 SHA1 f8c41c4e7fec4eca8735a1027299d38352f02619 SHA256 f091ca4137c753479363b81f478907467784a0d8a15af470e6a6ca4fd7db2036
+EBUILD vmware-modules-208.2.ebuild 253 RMD160 734819cad8db6f735040156ff773450e9a830003 SHA1 c49261fa1823455d44d259de549e819e862998c1 SHA256 ca736dbd716f0305c6b2e41b5eaec41e13bafcbd5ec9d010fd6c4fe014e7febb
+MISC ChangeLog 1993 RMD160 5412fe8174bd5fed7bba74e1ace5592d54e617e8 SHA1 4bf3bae126e4daa91866abdc8ee2499d6c267064 SHA256 8e64598888dd7c291618945135e08a41d0240f5e180d7649ac74285c99af89fc
+MISC metadata.xml 275 RMD160 154f03a8c1609d6def214591fba5fb21fb0e00d2 SHA1 2f417ba75e904dee8931b083e2ddcde63a5e8a41 SHA256 a975784c2f6a76d8f7b75f898bb52392fd2fff9f26bcff162e9cc4c977464cb6
--- a/app-emulation/vmware-modules/metadata.xml
+++ b/app-emulation/vmware-modules/metadata.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>vmware</herd>
+<use>
+        <flag name='init_mm-patch'>Kernel is patched with the init_mm patch !!! unsupported !!!</flag>
+</use>
+</pkgmetadata>
--- a/app-emulation/vmware-modules/vmware-modules-138.9.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-138.9.ebuild
@ -0,0 +1,35 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+GENPATCHES_VER="4"
+VM_SRC_URI="mirror://vmware/software/vmserver/VMware-server-1.0.9-156507.tar.gz"
+VM_MODULE_LIST="vmmon vmnet"
+
+inherit vmware-mod-2
+
+KEYWORDS="~amd64 ~x86"
+IUSE="init_mm-patch"
+
+S="${WORKDIR}"/vmware-server-distrib/lib/modules/source/
+
+pkg_setup() {
+	if kernel_is ge 2 6 25; then
+		CONFIG_CHECK="UNUSED_SYMBOLS"
+	fi
+	if kernel_is ge 2 6 29; then
+		if use init_mm-patch ; then
+			ewarn "starting with kernel version 2.6.29 the deprecated"
+			ewarn "symbole init_mm isn't exported."
+			ewarn "plz recompile your kenel with applied init_mm patch"
+			ewarn "http://www.insecure.ws/2009/04/21/vmware-specific-specific-55x-and-kernel-2629"
+		else
+			ewarn "starting with kernel version 2.6.29 the deprecated"
+			ewarn "symbole init_mm isn't exported."
+			die "kernel not supported!"
+		fi
+	fi
+	vmware-mod-2_pkg_setup
+}
--- a/app-emulation/vmware-modules/vmware-modules-169.5.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-169.5.ebuild
@ -0,0 +1,17 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+GENPATCHES_VER="2"
+VM_SRC_URI="x86? ( mirror://vmware/software/vmplayer/VMware-player-2.0.5-109488.i386.tar.gz )
+	    amd64? ( mirror://vmware/software/vmplayer/VMware-player-2.0.5-109488.x86_64.tar.gz )"
+VM_MODULE_LIST="vmmon vmnet vmblock"
+
+inherit vmware-mod-2
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}"/vmware-player-distrib/lib/modules/source/
--- a/app-emulation/vmware-modules/vmware-modules-208.2.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-208.2.ebuild
@ -0,0 +1,14 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+GENPATCHES_VER="1"
+VM_MODULE_LIST="vmmon vmnet vmblock vmci vsock"
+
+inherit vmware-mod-2
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
--- a/app-emulation/vmware-player/ChangeLog
+++ b/app-emulation/vmware-player/ChangeLog
@ -0,0 +1,25 @@
+# ChangeLog for app-emulation/vmware-player
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*vmware-player-2.0.5_p109488 (02 Jun 2009)
+
+  02 Jun 2009; Mario Fetka <mario.fetka@gmail.com>
+  +vmware-player-2.0.5_p109488.ebuild:
+  add 2.0.5
+
+*vmware-player-1.0.9_p126128 (30 May 2009)
+
+  30 May 2009; Mario Fetka <mario.fetka@gmail.com> +files/90vmware-player,
+  +vmware-player-1.0.9_p126128.ebuild, +files/vmware-player.rc,
+  +files/vmware-player.xml, +metadata.xml:
+  initial checkin based on new eclass
+
+  25 Mar 2009; Mike Auty <ikelos@gentoo.org>
+  vmware-player-2.5.1.126130.ebuild:
+  gtkmm's accessibility is now always enabled (see bug #247249)
+
+  16 Jan 2009; Mike Auty <ikelos@gentoo.org>
+  vmware-player-1.0.9.126128.ebuild, vmware-player-2.5.1.126130.ebuild:
+  Stabilize vmware-player to match the main tree.
+
--- a/app-emulation/vmware-player/Manifest
+++ b/app-emulation/vmware-player/Manifest
@ -0,0 +1,12 @@
+AUX 90vmware-player 91 RMD160 025ff93348f5a838183e4f6108d7030168ca5ed5 SHA1 54c316adaafce41771eb26513c960dabbed61ce9 SHA256 9aee16313163bd9e161e81ef2876d086fb8972489100c4f8f0a4695ff16578f9
+AUX vmware-player.rc 1852 RMD160 e3cc563af38ef690b16bfbdcc0080156af2eab37 SHA1 5436cfd0e75ab842b86826b0abc298a2b9433963 SHA256 ef77428df2608613860cd79683648a45d99657150e7c901d7f449b8df4528fee
+AUX vmware-player.xml 1592 RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e8c SHA1 02db2ee7ca0abb8b8793c9f56d858bb08c1c715f SHA256 56aafee80ad705e8d832f8853c36d763d37b87d1cb132a41c50eb63085ae854d
+DIST VMware-player-1.0.9-126128.tar.gz 38963760 RMD160 ed54df1e097894f11b7bbce8215d1f314df03217 SHA1 701ca338ec52dcb60db26908de8e0b5bfd981fb7 SHA256 3fae981892437ec1804a2171b701ca33000405fbd799fb06112fd70c939d8d75
+DIST VMware-player-2.0.5-109488.i386.tar.gz 68597946 RMD160 4277dd999081756512f91382dd1245585848bc90 SHA1 5bb6c0c2f9ef46651998a27a435bd176d6305129 SHA256 adcda2151465fb6f21b4579fb63d4badeb1e29a024f982fd7561562a07369955
+DIST VMware-player-2.0.5-109488.x86_64.tar.gz 33383867 RMD160 de53fd58eb3fbe6b868b5f5e691e62943dc7d413 SHA1 d5d79d3beb13caa9f05f01517bc09ac4ba7b4dd1 SHA256 f5e6c53f91d9cdb2eb39442dbb97f1d5edc110c17bfe8cc91f235f0188b658b2
+DIST vmware-player-1.0.9-126128-genpatches-1.tar.bz2 2014 RMD160 d61dad8ac174a31f96734e93cfa875111d1c6a91 SHA1 9c89ea50f037546d3998d2a4824403e5b7a9b7db SHA256 c4b47ffddcfcee654d10fe7dcd9d8be8dcc4e794df862c571fceb05612d99c38
+DIST vmware-player-2.0.5-109488-genpatches-4.tar.bz2 2583 RMD160 93bae9fc33a537d0983a8edd9fdfcafdd65500a3 SHA1 56010020e6dbe43ddad62c13ef20fb2df693e534 SHA256 76427724342bc96b7e513364cd1e50366e85b73b6751c764c1cf474babbf0c0f
+EBUILD vmware-player-1.0.9_p126128.ebuild 1883 RMD160 20dc8de24dc22e47a607b71c4047a490b8d9a75a SHA1 d5e6c228932f20b4aa4e452866b72bf90eae150b SHA256 0423058a5ecf881d5b965ebc28c2f8746fe834010f82310f1b3463a3c574d8ff
+EBUILD vmware-player-2.0.5_p109488.ebuild 1954 RMD160 f24212c57b3cfed195d646cb4edbd9508d10c7b2 SHA1 0a41d31accf7ab4d2bb37543596b7bb4af34a1b6 SHA256 f1de2eecedbaec728850717b245c1160071e110a73b19f3b90ce05f8f49cf276
+MISC ChangeLog 855 RMD160 7111383835872ba084f977e4a8c5c41a39fc44d7 SHA1 e73bc6a72f00745b45b430fa5d2bc1784c6fa037 SHA256 ab7562c761782bba5250d5e8be7c76cc2b12d44901821c455d730824fdbf6b38
+MISC metadata.xml 159 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 SHA1 f46b02a39bcd0165558de67ff4256cfc812418a3 SHA256 8581ae1c90a48f50fa0542c7fb28cb8984baaf12f50fa18f33e467081effb215
--- a/app-emulation/vmware-player/files/90vmware-player
+++ b/app-emulation/vmware-player/files/90vmware-player
@ -0,0 +1,3 @@
+PATH=/opt/vmware/player/bin
+ROOTPATH=/opt/vmware/player/bin
+MANPATH=/opt/vmware/player/man
--- a/app-emulation/vmware-player/files/vmware-player.rc
+++ b/app-emulation/vmware-player/files/vmware-player.rc
@ -0,0 +1,86 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/files/vmware-player.rc,v 1.5 2008/04/26 17:36:10 ikelos Exp $
+
+depend() {
+	need localmount
+	use logger net hald
+	after samba
+}
+
+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} -eq -1 ]
+			then
+				ewarn ${line}
+				continue
+			fi
+			case ${line} in
+			*:*)
+				einfon ${line}
+				echo
+				eend 0
+				msgtype=1;;
+			*)
+				ewarn ${line}
+				msgtype=-1
+				waserror=1;;
+			esac
+			continue
+		fi
+
+		# Strip out anything after the <esc> code
+		message=`echo ${line} | sed -e "s/^\(.*\).*$/\1/"`
+		einfon "  ${message}"
+		echo
+
+		echo ${line} | grep -q done
+		status=$?
+		eend ${status}
+
+		if [ ${status} -eq 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
+
+	if modinfo vmblock > /dev/null 2>&1;
+	then
+		ebegin "Loading vmblock for drag and drop support"
+		local result
+		modprobe vmblock || eend 1 "Failed to load vmblock driver"
+		test ! -e /tmp/VMwareDnD && mkdir /tmp/VMwareDnD
+		chmod 1777 /tmp/VMwareDnD
+		mount -t vmblock none /proc/fs/vmblock/mountPoint || eend 1 "Failed to mount the vmblock filesystem"
+		eend 0
+	fi
+
+	/etc/vmware/init.d/vmware start | vmware_prettify start
+	return $?
+}
+
+stop() {
+	umount /proc/fs/vmblock/mountPoint > /dev/null 2>&1
+	/etc/vmware/init.d/vmware stop | vmware_prettify stop
+	return $?
+}
--- a/app-emulation/vmware-player/files/vmware-player.xml
+++ b/app-emulation/vmware-player/files/vmware-player.xml
@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+ <mime-type type="application/x-vmware-vm">
+  <comment xml:lang="en">VMware virtual machine</comment>
+  <magic priority="50">
+   <match type="string" value='config.version = "' offset="0:4096"/>
+  </magic>
+  <glob pattern="*.vmx"/>
+ </mime-type>
+
+ <mime-type type="application/x-vmware-vmdisk">
+  <comment xml:lang="en">VMware virtual disk</comment>
+  <magic priority="50">
+   <match type="string" value="# Disk DescriptorFile" offset="0"/>
+   <match type="string" value="KDMV" offset="0"/>
+  </magic>
+  <glob pattern="*.vmdk"/>
+ </mime-type>
+
+ <mime-type type="application/x-vmware-team">
+  <comment xml:lang="en">VMware team</comment>
+  <magic priority="50">
+   <match type="string" value='&lt;Foundry version="1"&gt;' offset="0">
+    <match type="string" value="&lt;VMTeam&gt;" offset="23:24"/>
+   </match>
+  </magic>
+  <glob pattern="*.vmtm"/>
+ </mime-type>
+
+ <mime-type type="application/x-vmware-snapshot">
+  <comment xml:lang="en">VMware virtual machine snapshot</comment>
+  <magic priority="50">
+   <match type="string" value="\\0xD0\\0xBE\\0xD0\\0xBE" offset="0"/>
+  </magic>
+  <glob pattern="*.vmsn"/>
+ </mime-type>
+
+ <mime-type type="application/x-vmware-vmfoundry">
+  <comment xml:lang="en">VMware virtual machine foundry</comment>
+  <magic priority="50">
+   <match type="string" value='&lt;Foundry version="1"&gt;' offset="0">
+    <match type="string" value="&lt;VM&gt;" offset="23:24"/>
+   </match>
+  </magic>
+  <glob pattern="*.vmxf"/>
+ </mime-type>
+</mime-info>
--- a/app-emulation/vmware-player/metadata.xml
+++ b/app-emulation/vmware-player/metadata.xml
@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>vmware</herd>
+</pkgmetadata>
--- a/app-emulation/vmware-player/vmware-player-1.0.9_p126128.ebuild
+++ b/app-emulation/vmware-player/vmware-player-1.0.9_p126128.ebuild
@ -0,0 +1,71 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+VM_SRC="VMware-player-${PV/_p/-}.tar.gz"
+VM_SRC_EXTRA="genpatches-1"
+
+inherit eutils vmware-1
+
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+DEPEND="${RDEPEND} virtual/os-headers
+	!app-emulation/vmware-workstation"
+# vmware-player should not use virtual/libc as this is a
+# precompiled binary package thats linked to glibc.
+RDEPEND="sys-libs/glibc
+	amd64? (
+		app-emulation/emul-linux-x86-gtklibs )
+	x86? (
+		x11-libs/libXrandr
+		x11-libs/libXcursor
+		x11-libs/libXinerama
+		x11-libs/libXi
+		x11-libs/libXft )
+	>=dev-lang/perl-5
+	!app-emulation/vmware-workstation
+	!app-emulation/vmware-server
+	~app-emulation/vmware-modules-138.9
+	!<app-emulation/vmware-modules-138.9
+	!>app-emulation/vmware-modules-138.9
+	sys-apps/pciutils"
+
+S=${WORKDIR}/vmware-player-distrib
+
+dir=/opt/vmware/player
+Ddir=${D}/${dir}
+
+QA_TEXTRELS_x86="${dir:1}/lib/lib/libgdk-x11-2.0.so.0/libgdk-x11-2.0.so.0"
+QA_EXECSTACK_x86="${dir:1}/bin/vmnet-bridge
+	${dir:1}/bin/vmnet-dhcpd
+	${dir:1}/bin/vmnet-natd
+	${dir:1}/bin/vmnet-netifup
+	${dir:1}/bin/vmnet-sniffer
+	${dir:1}/bin/vmware-ping
+	${dir:1}/lib/bin/vmware-vmx
+	${dir:1}/lib/bin/vmrun
+	${dir:1}/lib/bin/vmplayer
+	${dir:1}/lib/bin-debug/vmware-vmx
+	${dir:1}/lib/lib/libpixops.so.2.0.1/libpixops.so.2.0.1"
+
+QA_TEXTRELS_amd64="${dir:1}/lib/lib/libgdk-x11-2.0.so.0/libgdk-x11-2.0.so.0"
+QA_EXECSTACK_amd64="${dir:1}/bin/vmnet-bridge
+	${dir:1}/bin/vmnet-dhcpd
+	${dir:1}/bin/vmnet-natd
+	${dir:1}/bin/vmnet-netifup
+	${dir:1}/bin/vmnet-sniffer
+	${dir:1}/bin/vmware-ping
+	${dir:1}/lib/bin/vmware-vmx
+	${dir:1}/lib/bin/vmrun
+	${dir:1}/lib/bin/vmplayer
+	${dir:1}/lib/bin-debug/vmware-vmx
+	${dir:1}/lib/lib/libpixops.so.2.0.1/libpixops.so.2.0.1"
+
+src_install() {
+	vmware-1_src_install
+
+	make_desktop_entry vmplayer "VMware Player" ${PN}.png System
+}
--- a/app-emulation/vmware-player/vmware-player-2.0.5_p109488.ebuild
+++ b/app-emulation/vmware-player/vmware-player-2.0.5_p109488.ebuild
@ -0,0 +1,72 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+VM_SRC="VMware-player-${PV/_p/-}.i386.tar.gz"
+VM_SRC64="VMware-player-${PV/_p/-}.x86_64.tar.gz"
+VM_SRC_EXTRA="genpatches-4"
+VM_SRC_EXTRA64="genpatches-4"
+
+inherit eutils vmware-1
+
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+DEPEND="${RDEPEND} virtual/os-headers
+	!app-emulation/vmware-workstation"
+# vmware-player should not use virtual/libc as this is a
+# precompiled binary package thats linked to glibc.
+RDEPEND="sys-libs/glibc
+	x11-libs/libXrandr
+	x11-libs/libXcursor
+	x11-libs/libXinerama
+	x11-libs/libXi
+	x11-libs/libXft
+	>=dev-lang/perl-5
+	!app-emulation/vmware-workstation
+	!app-emulation/vmware-server
+	~app-emulation/vmware-modules-169.5
+	!<app-emulation/vmware-modules-169.5
+	!>app-emulation/vmware-modules-169.5
+	sys-apps/pciutils"
+
+S=${WORKDIR}/vmware-player-distrib
+
+dir=/opt/vmware/player
+Ddir=${D}/${dir}
+
+QA_TEXTRELS_x86="${dir:1}/lib/lib/libgdk-x11-2.0.so.0/libgdk-x11-2.0.so.0"
+QA_EXECSTACK_x86="${dir:1}/bin/vmnet-bridge
+	${dir:1}/bin/vmnet-dhcpd
+	${dir:1}/bin/vmnet-natd
+	${dir:1}/bin/vmnet-netifup
+	${dir:1}/bin/vmnet-sniffer
+	${dir:1}/bin/vmware-ping
+	${dir:1}/lib/bin/vmware-vmx
+	${dir:1}/lib/bin/vmrun
+	${dir:1}/lib/bin/vmplayer
+	${dir:1}/lib/bin-debug/vmware-vmx
+	${dir:1}/lib/lib/libpixops.so.2.0.1/libpixops.so.2.0.1"
+
+QA_TEXTRELS_amd64="${dir:1}/lib/lib/libgdk-x11-2.0.so.0/libgdk-x11-2.0.so.0"
+QA_EXECSTACK_amd64="${dir:1}/bin/vmnet-bridge
+	${dir:1}/bin/vmnet-dhcpd
+	${dir:1}/bin/vmnet-natd
+	${dir:1}/bin/vmnet-netifup
+	${dir:1}/bin/vmnet-sniffer
+	${dir:1}/bin/vmware-ping
+	${dir:1}/lib/bin/vmware-vmx
+	${dir:1}/lib/bin/vmrun
+	${dir:1}/lib/bin/vmplayer
+	${dir:1}/lib/bin-debug/vmware-vmx
+	${dir:1}/lib/lib/libpixops.so.2.0.1/libpixops.so.2.0.1"
+
+src_install() {
+	vmware-1_src_install
+
+	make_desktop_entry vmplayer "VMware Player" ${PN}.png System
+	insinto ${dir}/lib/share
+	newins doc/EULA EULA.txt
+}
--- a/app-emulation/vmware-server-console/ChangeLog
+++ b/app-emulation/vmware-server-console/ChangeLog
@ -0,0 +1,16 @@
+# ChangeLog for app-emulation/vmware-server-console
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*vmware-server-console-1.0.9_p156507 (30 May 2009)
+
+  30 May 2009; Mario Fetka <mario.fetka@gmail.com>
+  +files/90vmware-server-console,
+  +vmware-server-console-1.0.9_p156507.ebuild,
+  +files/vmware-server-console.xml, +metadata.xml:
+  initial checkin based on new eclass
+
+  15 Jan 2009; Mike Auty <ikelos@gentoo.org>
+  vmware-server-console-1.0.8.126538.ebuild:
+  Stabilize vmware-server-console to match the main tree.
+
--- a/app-emulation/vmware-server-console/Manifest
+++ b/app-emulation/vmware-server-console/Manifest
@ -0,0 +1,6 @@
+AUX 90vmware-server-console 76 RMD160 22fed127d20bfb758163443dcbd2879bf1d49be6 SHA1 105e3194c134b752a8d5cef1a23ae621cd835d80 SHA256 ff3abe9d58fd673d8f3d2f7e967aa6db426e3e15b4d868dc1483682357a928b8
+AUX vmware-server-console.xml 1592 RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e8c SHA1 02db2ee7ca0abb8b8793c9f56d858bb08c1c715f SHA256 56aafee80ad705e8d832f8853c36d763d37b87d1cb132a41c50eb63085ae854d
+DIST VMware-server-linux-client-1.0.9-156507.zip 23772932 RMD160 e96e94e4173f4e5fa05ff74ab5637472e1398d4a SHA1 4aa99c8f72f13f1cbbfa21bf35014c386b1156c4 SHA256 c0735562ab900f02ff954b7f907fd0e57f25c3073ec932f0a684460c8ea4b3e7
+EBUILD vmware-server-console-1.0.9_p156507.ebuild 1904 RMD160 9ef4b55ad5a7e559935c4037ffc99ed9d12b4823 SHA1 965198f8ffcf45e87d65896d0f30bf770a70dfd6 SHA256 96fa0636f31020fd1e76234bf0ac16f2da5053edd59822a0e2ef05c46a561911
+MISC ChangeLog 559 RMD160 84901a64678ba0fddf2c1d8c1e03aaf76038d324 SHA1 dd11158de6d42d77554adbc686d8bb41a9157852 SHA256 cb8d6b1d70f12ac92b51ca8ce49c3f771e64dde58987c9d3477220cf51578763
+MISC metadata.xml 159 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 SHA1 f46b02a39bcd0165558de67ff4256cfc812418a3 SHA256 8581ae1c90a48f50fa0542c7fb28cb8984baaf12f50fa18f33e467081effb215
--- a/app-emulation/vmware-server-console/files/90vmware-server-console
+++ b/app-emulation/vmware-server-console/files/90vmware-server-console
@ -0,0 +1,2 @@
+PATH=/opt/vmware/server/console/bin
+ROOTPATH=/opt/vmware/server/console/bin
--- a/app-emulation/vmware-server-console/files/vmware-server-console.xml
+++ b/app-emulation/vmware-server-console/files/vmware-server-console.xml
@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+ <mime-type type="application/x-vmware-vm">
+  <comment xml:lang="en">VMware virtual machine</comment>
+  <magic priority="50">
+   <match type="string" value='config.version = "' offset="0:4096"/>
+  </magic>
+  <glob pattern="*.vmx"/>
+ </mime-type>
+
+ <mime-type type="application/x-vmware-vmdisk">
+  <comment xml:lang="en">VMware virtual disk</comment>
+  <magic priority="50">
+   <match type="string" value="# Disk DescriptorFile" offset="0"/>
+   <match type="string" value="KDMV" offset="0"/>
+  </magic>
+  <glob pattern="*.vmdk"/>
+ </mime-type>
+
+ <mime-type type="application/x-vmware-team">
+  <comment xml:lang="en">VMware team</comment>
+  <magic priority="50">
+   <match type="string" value='&lt;Foundry version="1"&gt;' offset="0">
+    <match type="string" value="&lt;VMTeam&gt;" offset="23:24"/>
+   </match>
+  </magic>
+  <glob pattern="*.vmtm"/>
+ </mime-type>
+
+ <mime-type type="application/x-vmware-snapshot">
+  <comment xml:lang="en">VMware virtual machine snapshot</comment>
+  <magic priority="50">
+   <match type="string" value="\\0xD0\\0xBE\\0xD0\\0xBE" offset="0"/>
+  </magic>
+  <glob pattern="*.vmsn"/>
+ </mime-type>
+
+ <mime-type type="application/x-vmware-vmfoundry">
+  <comment xml:lang="en">VMware virtual machine foundry</comment>
+  <magic priority="50">
+   <match type="string" value='&lt;Foundry version="1"&gt;' offset="0">
+    <match type="string" value="&lt;VM&gt;" offset="23:24"/>
+   </match>
+  </magic>
+  <glob pattern="*.vmxf"/>
+ </mime-type>
+</mime-info>
--- a/app-emulation/vmware-server-console/metadata.xml
+++ b/app-emulation/vmware-server-console/metadata.xml
@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>vmware</herd>
+</pkgmetadata>
--- a/app-emulation/vmware-server-console/vmware-server-console-1.0.9_p156507.ebuild
+++ b/app-emulation/vmware-server-console/vmware-server-console-1.0.9_p156507.ebuild
@ -0,0 +1,76 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server-console/vmware-server-console-1.0.5.80187.ebuild,v 1.4 2008/04/26 15:40:42 ikelos Exp $
+
+EAPI="2"
+
+# 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.
+
+VM_SRC="VMware-server-linux-client-${PV/_p/-}.zip"
+
+inherit eutils vmware-1
+
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+
+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 )
+	x86? ( 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 )
+	>=dev-lang/perl-5
+	!<sys-apps/dbus-0.62"
+
+S="${WORKDIR}/${PN}-distrib"
+
+etcdir="/etc/${PN}"
+
+pkg_setup() {
+	vmware-1_pkg_setup
+	enewgroup "${VMWARE_GROUP}"
+}
+
+src_unpack() {
+	vmware-1_src_unpack
+	cd "${WORKDIR}"
+	unpack ./${PN/vm/VM}-${PV/_p/-}.tar.gz
+}
+
+src_install() {
+	echo 'libdir = "'${VMWARE_INSTALL_DIR}'/lib"' > etc/config
+	vmware-1_src_install
+
+	# Fix an ugly GCC error on start
+	rm -f "${D}${VMWARE_INSTALL_DIR}/lib/lib/libgcc_s.so.1/libgcc_s.so.1"
+	make_desktop_entry ${PN} "VMWare Remote Console" ${PN}.png System
+
+	dodir /usr/bin
+	dosym ${VMWARE_INSTALL_DIR}/bin/${PN} /usr/bin/${PN}
+}
+
+pkg_config() {
+	einfo "Running ${ROOT}${dir}/bin/vmware-config-server-console.pl"
+	"${ROOT}${dir}/bin/vmware-config-server-console.pl"
+}
--- a/app-emulation/vmware-server/ChangeLog
+++ b/app-emulation/vmware-server/ChangeLog
@ -0,0 +1,28 @@
+# ChangeLog for app-emulation/vmware-server
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*vmware-server-1.0.9_p156507 (30 May 2009)
+
+  30 May 2009; Mario Fetka <mario.fetka@gmail.com>
+  +vmware-server-1.0.9_p156507.ebuild,
+  -vmware-server-1.0.9_p156507-r1.ebuild:
+  cleanup ebuild header
+
+*vmware-server-1.0.9_p156507-r1 (30 May 2009)
+
+  30 May 2009; Mario Fetka <mario.fetka@gmail.com>
+  +files/vmware-server-2.rc, +files/90vmware-server,
+  +vmware-server-1.0.9_p156507-r1.ebuild, +files/authorization.xml,
+  +files/vmware-authd, +files/vmware-server.rc, +files/vmware-server.xml,
+  +metadata.xml:
+  initial checkin based on new eclass
+
+  26 Jan 2009; Mike Auty <ikelos@gentoo.org> files/vmware-server-2.rc,
+  vmware-server-2.0.0.122956.ebuild:
+  Remove xinetd requirements and add in a dependency on hal.
+
+  15 Jan 2009; Mike Auty <ikelos@gentoo.org>
+  vmware-server-1.0.8.126538.ebuild:
+  Stabilize vmware-server to match the main tree.
+
--- a/app-emulation/vmware-server/Manifest
+++ b/app-emulation/vmware-server/Manifest
@ -0,0 +1,12 @@
+AUX 90vmware-server 91 RMD160 2a9e2e9d428a06ceac7faec500e6b1423da34b25 SHA1 e090847500dd99d161a46cd361ed2297b3d3ecae SHA256 3175cd9665850cf0d25a96849135c93ab129127370d55572f0137ba3d210e423
+AUX authorization.xml 332 RMD160 f31f4300342a9290634e20187351910d72e7c28d SHA1 28e2b07ed7225c83bef3172d23d4702fe92a3f75 SHA256 a6ce67bb812ca67d26e518da4903cf27338865c0f06beb58d4a8ece6021e1630
+AUX vmware-authd 211 RMD160 1bd60030f6f7bb78c0fd3b6d156498121d4be5d4 SHA1 514538222dc4e665e1d450e1bf9bf1d8e03a2b61 SHA256 3eafe9ac10aeac852faa1fbbccb5c525560e358f69964995c5cfb86c53af6b54
+AUX vmware-server-2.rc 1561 RMD160 ea122e81095807e635626a9a8ff1e445137da2b0 SHA1 50262ff622afe0a8d8eab3ad2599193cd56ad211 SHA256 e4cc1591c0cd8ab6e699d4e346ea69e0a0f4d564bc34ae216027338f74517afd
+AUX vmware-server.rc 1529 RMD160 d6840024f8c7be0a673e5e29660cc75fea9520d8 SHA1 049cf33eb5bac09415f8e2a85f7ecfd0bbc5ab4a SHA256 ef551e4240eea88184c96e286354a53a4983ce80c3332a127767301b42586cb2
+AUX vmware-server.xml 1592 RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e8c SHA1 02db2ee7ca0abb8b8793c9f56d858bb08c1c715f SHA256 56aafee80ad705e8d832f8853c36d763d37b87d1cb132a41c50eb63085ae854d
+DIST VMware-server-1.0.9-156507.tar.gz 107164305 RMD160 1ba44b50b1f516eb8f253e475d6b2c7b5eeb8ade SHA1 ba6e7a7b69e312e177d54c8272de25574e3d5ddb SHA256 e1c049328141f6ea77d31b38fa920d2adff5756a063fb38964faefe928cbd94c
+DIST vmware-server-1.0.9-156507-genpatches-1.tar.bz2 2831 RMD160 ba8abdb18df385cf0566fe2d90a93139628bf4e4 SHA1 0618df489316323362ce8248794109ad6db82778 SHA256 6faf49680f08caa9b2d12ea7225190f40c2ea02f7f308647bc57444ab4978759
+DIST vmware-server-1.0.9-156507-perl-fixed-rpath-libs.tar.bz2 73834 RMD160 7f64627b5b945e8d7dabe39c165a4b66b71fb4d3 SHA1 9d696750ca3ec92b31ca8112fd80dcd832494044 SHA256 c42299dd033187c67b45b739da66583fbd94cdcba745200b89a25ac96cd9364b
+EBUILD vmware-server-1.0.9_p156507.ebuild 2482 RMD160 11c1c93043fde0435b794ecc878c91de46bbe03a SHA1 a8f5396be0ee68a1191a62e0d1777e323f9204c0 SHA256 4a34bcb616c7bc18e8cd605282c96b0d7e9a3bd0ea19217bb0c63b2bbce5f1a0
+MISC ChangeLog 981 RMD160 526a57fca272624bdd2ca39922b58e8b9ebbd8b8 SHA1 12a63f0e10521090166a8f7bec5937ce9e513547 SHA256 a91f1caf0c4cf3aedc53cd1441025bf980bf0b9ec9e989acb320fd7e4155b671
+MISC metadata.xml 159 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 SHA1 f46b02a39bcd0165558de67ff4256cfc812418a3 SHA256 8581ae1c90a48f50fa0542c7fb28cb8984baaf12f50fa18f33e467081effb215
--- a/app-emulation/vmware-server/files/90vmware-server
+++ b/app-emulation/vmware-server/files/90vmware-server
@ -0,0 +1,3 @@
+PATH=/opt/vmware/server/bin
+ROOTPATH=/opt/vmware/server/bin
+MANPATH=/opt/vmware/server/man
--- a/app-emulation/vmware-server/files/authorization.xml
+++ b/app-emulation/vmware-server/files/authorization.xml
@ -0,0 +1,11 @@
+<ConfigRoot>
+  <ACEData id="10">
+    <ACEDataEntity>ha-folder-root</ACEDataEntity>
+    <ACEDataId>10</ACEDataId>
+    <ACEDataIsGroup>true</ACEDataIsGroup>
+    <ACEDataPropagate>true</ACEDataPropagate>
+    <ACEDataRoleId>-1</ACEDataRoleId>
+    <ACEDataUser>vmware</ACEDataUser>
+  </ACEData>
+  <NextAceId>11</NextAceId>
+</ConfigRoot>
--- a/app-emulation/vmware-server/files/vmware-authd
+++ b/app-emulation/vmware-server/files/vmware-authd
@ -0,0 +1,4 @@
+#%PAM-1.0
+auth       required         pam_unix.so shadow nullok
+account    required         pam_listfile.so item=group sense=allow file=/etc/vmware/vmwaregroup onerr=fail
+account    required         pam_unix.so
--- a/app-emulation/vmware-server/files/vmware-server-2.rc
+++ b/app-emulation/vmware-server/files/vmware-server-2.rc
@ -0,0 +1,69 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server/files/vmware-server.rc,v 1.6 2007/09/20 17:13:13 ikelos Exp $
+
+depend() {
+	need localmount hald
+	use logger net
+	after samba
+}
+
+vmware_prettify() {
+	# Yea, the code is ugly but the output is pretty
+	state=$1
+	waserror=0
+	while read line
+	do
+		# Ignore blank lines		
+		[ "${line}" = "" ] && continue
+
+		# Determine what kind of line it is to provide einfo or ewarn etc
+		case ${line} in
+		*Starting\ *)
+			einfo ${line};;
+		*Stopping\ *)
+			einfo ${line};;
+		*VMware\ Virtual\ Infrastructure\ Web\ Access*)
+			# Really nasty hack, because for some reason, vmware-server 2 doesn't say done when it mentions this
+			einfon "  ${line}"
+			echo
+			eend 0;;
+		*)
+			# Strip out anything after the <esc> code
+			message=`echo ${line} | sed -e "s/^\(.*\).*$/\1/"`
+			einfon "  ${message}"
+			echo
+
+			echo ${line} | grep -q done
+			status=$?
+			eend ${status}
+
+			if [ ${status} -ne 0 ]
+			then
+				logger -p local0.err -t vmware-${state} "${line}"
+				waserror=${status}
+			fi
+		esac
+		continue
+
+	done
+	if [ ${waserror} -ne 0 ]
+	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 $?
+}
--- a/app-emulation/vmware-server/files/vmware-server.rc
+++ b/app-emulation/vmware-server/files/vmware-server.rc
@ -0,0 +1,79 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server/files/vmware-server.rc,v 1.6 2007/09/20 17:13:13 ikelos Exp $
+
+depend() {
+	need localmount xinetd
+	use logger net
+	after samba
+}
+
+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} -eq -1 ]
+			then
+				ewarn ${line}
+				continue
+			fi
+			case ${line} in
+			*:*)
+				einfon ${line}
+				echo
+				eend 0
+				msgtype=1;;
+			*Stopping\ VMware\ virtual\ machines*)
+				einfon ${line}
+				echo
+				eend 0
+				msgtype=0;;
+			*)
+				ewarn ${line}
+				msgtype=-1
+				waserror=1;;
+			esac
+			continue
+		fi
+
+		# Strip out anything after the <esc> code
+		message=`echo ${line} | sed -e "s/^\(.*\).*$/\1/"`
+		einfon "  ${message}"
+		echo
+
+		echo ${line} | grep -q done
+		status=$?
+		eend ${status}
+
+		if [ ${status} -eq 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 $?
+}
--- a/app-emulation/vmware-server/files/vmware-server.xml
+++ b/app-emulation/vmware-server/files/vmware-server.xml
@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+ <mime-type type="application/x-vmware-vm">
+  <comment xml:lang="en">VMware virtual machine</comment>
+  <magic priority="50">
+   <match type="string" value='config.version = "' offset="0:4096"/>
+  </magic>
+  <glob pattern="*.vmx"/>
+ </mime-type>
+
+ <mime-type type="application/x-vmware-vmdisk">
+  <comment xml:lang="en">VMware virtual disk</comment>
+  <magic priority="50">
+   <match type="string" value="# Disk DescriptorFile" offset="0"/>
+   <match type="string" value="KDMV" offset="0"/>
+  </magic>
+  <glob pattern="*.vmdk"/>
+ </mime-type>
+
+ <mime-type type="application/x-vmware-team">
+  <comment xml:lang="en">VMware team</comment>
+  <magic priority="50">
+   <match type="string" value='&lt;Foundry version="1"&gt;' offset="0">
+    <match type="string" value="&lt;VMTeam&gt;" offset="23:24"/>
+   </match>
+  </magic>
+  <glob pattern="*.vmtm"/>
+ </mime-type>
+
+ <mime-type type="application/x-vmware-snapshot">
+  <comment xml:lang="en">VMware virtual machine snapshot</comment>
+  <magic priority="50">
+   <match type="string" value="\\0xD0\\0xBE\\0xD0\\0xBE" offset="0"/>
+  </magic>
+  <glob pattern="*.vmsn"/>
+ </mime-type>
+
+ <mime-type type="application/x-vmware-vmfoundry">
+  <comment xml:lang="en">VMware virtual machine foundry</comment>
+  <magic priority="50">
+   <match type="string" value='&lt;Foundry version="1"&gt;' offset="0">
+    <match type="string" value="&lt;VM&gt;" offset="23:24"/>
+   </match>
+  </magic>
+  <glob pattern="*.vmxf"/>
+ </mime-type>
+</mime-info>
--- a/app-emulation/vmware-server/metadata.xml
+++ b/app-emulation/vmware-server/metadata.xml
@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>vmware</herd>
+</pkgmetadata>
--- a/app-emulation/vmware-server/vmware-server-1.0.9_p156507.ebuild
+++ b/app-emulation/vmware-server/vmware-server-1.0.9_p156507.ebuild
@ -0,0 +1,90 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+# 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.
+
+VM_SRC="VMware-server-${PV/_p/-}.tar.gz"
+VM_SRC_EXTRA="perl-fixed-rpath-libs genpatches-1"
+
+inherit eutils vmware-1
+
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+DEPEND=">=sys-libs/glibc-2.3.5
+	>=dev-lang/perl-5
+	sys-apps/pciutils
+	sys-apps/findutils
+	virtual/os-headers"
+# vmware-server 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-baselibs-2.5.5-r3
+		app-emulation/emul-linux-x86-gtklibs )
+	x86? (
+		x11-libs/libX11
+		x11-libs/libXft
+		x11-libs/libXtst
+		x11-libs/libXext
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXrender )
+	>=dev-lang/perl-5
+	!<sys-apps/dbus-0.62
+	!app-emulation/vmware-player
+	!app-emulation/vmware-workstation
+	~app-emulation/vmware-modules-138.9
+	!<app-emulation/vmware-modules-138.9
+	!>app-emulation/vmware-modules-138.9
+	sys-apps/pciutils
+	virtual/pam
+	sys-apps/xinetd"
+
+S=${WORKDIR}/vmware-server-distrib
+
+src_unpack() {
+	vmware-1_src_unpack
+}
+
+src_prepare() {
+	vmware-1_src_prepare
+	# patch the vmware /etc/pam.d file to ensure that only
+	# vmware group members can log in
+	cp "${FILESDIR}/vmware-authd" "${S}/etc/pam.d/vmware-authd"
+}
+
+src_install() {
+	vmware-1_src_install
+
+	# Fix the amd64 emulation pam stuff
+	use amd64 && dosed "s:pam_:/lib32/security/pam_:" ${config_dir}/pam.d/vmware-authd
+	  # Remove libpam on amd64 because it's linked against the wrong paths
+	use amd64 && rm "${D}/opt/vmware/server/lib/lib/libpam.so.0/libpam.so"
+
+	echo "${VMWARE_GROUP}" > "${D}${config_dir}/vmwaregroup"
+
+	dosym /etc/init.d/xinetd ${config_dir}/init.d
+}
+
+pkg_config() {
+	einfo "Running ${ROOT}${dir}/bin/vmware-config.pl"
+	"${ROOT}${dir}/bin/vmware-config.pl"
+}
+
+pkg_postinst() {
+	vmware-1_pkg_postinst
+	elog "Remember by default xinetd only allows connections from localhost"
+	elog "To allow external users access to vmware-server you must edit"
+	elog "    /etc/xinetd.d/vmware-authd"
+	elog "and specify a new 'only_from' line"
+	echo
+	ewarn "VMWare Server also has issues when running on a JFS filesystem.  For more"
+	ewarn "information see http://bugs.gentoo.org/show_bug.cgi?id=122500#c94"
+}
--- a/app-emulation/vmware-view-open-client/ChangeLog
+++ b/app-emulation/vmware-view-open-client/ChangeLog
@ -0,0 +1,15 @@
+# ChangeLog for app-emulation/vmware-view-open-client
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  04 Feb 2009; Mike Auty <ikelos@gentoo.org>
+  vmware-view-open-client-2.1.1.144835.ebuild:
+  Fix up SRC_URI to use variable names whereever possible.
+
+*vmware-view-open-client-2.1.1.144835 (04 Feb 2009)
+
+  04 Feb 2009; Mike Auty <ikelos@gentoo.org>
+  +files/2.1.1.144835-curl_easy_getinfo.patch,
+  +vmware-view-open-client-2.1.1.144835.ebuild:
+  Initial commit, ebuild courtesy of Jeremy Wood from bug 257637.
+
--- a/app-emulation/vmware-view-open-client/Manifest
+++ b/app-emulation/vmware-view-open-client/Manifest
@ -0,0 +1,3 @@
+DIST VMware-view-open-client-source-3.1.0-160969.tar.gz 1573525 RMD160 ca7a1466ea346afac73285380c81d66f80efc9a0 SHA1 cb5f17293e1cd0f3b2955ec768eff1be0ac3f221 SHA256 c9ac59fc447f98d9fb76f8320cdc8e350a46ef64e1345789e030e987b6ebb97a
+EBUILD vmware-view-open-client-3.1.0_p160969.ebuild 804 RMD160 d6ac66722df47d7f3b9eb0ba6cfba685c071bb1d SHA1 61ecd7de13f4953121a785669c79d54d079beac6 SHA256 5006cc4746aab9f766baa4f43a1231f14775967125cea5b40a9df9dc246f95e6
+MISC ChangeLog 550 RMD160 72a2bb1a33370793e540228f7a5a507533da9f75 SHA1 7b004168d7776d75894f6a44535c354a599196cb SHA256 8ed0883454a9a0effce38633a62715e375be7a997180a1f17ba1ab6d5e075090
--- a/app-emulation/vmware-view-open-client/vmware-view-open-client-3.1.0_p160969.ebuild
+++ b/app-emulation/vmware-view-open-client/vmware-view-open-client-3.1.0_p160969.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit eutils
+
+MY_P="${PN/vm/VM}-source-${PV/_p/-}"
+
+DESCRIPTION="Open Source VMware View Client"
+HOMEPAGE="http://code.google.com/p/vmware-view-open-client/"
+SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="ao oss pcsc-lite"
+
+DEPEND=">=x11-libs/gtk+-2.4.0
+		>=dev-libs/libxml2-2.6.0
+		>=net-misc/curl-7.16.0
+		>=dev-libs/openssl-0.9.8
+		>=dev-libs/boost-1.34.1
+		dev-libs/icu
+		ao? ( net-misc/rdesktop[ao] )
+		oss? ( net-misc/rdesktop[oss] )
+		pcsc-lite? ( net-misc/rdesktop[pcsc-lite] )"
+
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+}
--- a/app-emulation/vmware-workstation/ChangeLog
+++ b/app-emulation/vmware-workstation/ChangeLog
@ -0,0 +1,25 @@
+# ChangeLog for app-emulation/vmware-workstation
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  30 May 2009; Mario Fetka <mario.fetka@gmail.com> ChangeLog:
+  cleanup ebuild header
+
+*vmware-workstation-5.5.9_p126128 (30 May 2009)
+
+  30 May 2009; Mario Fetka <mario.fetka@gmail.com>
+  +files/90vmware-workstation, +vmware-workstation-5.5.9_p126128.ebuild,
+  +files/vmware-player.desktop, +files/vmware-workstation.desktop,
+  +files/vmware-workstation.rc, +files/vmware-workstation.xml,
+  +metadata.xml:
+  initial checkin based on new eclass
+
+  25 Mar 2009; Mike Auty <ikelos@gentoo.org>
+  vmware-workstation-6.5.1.126130.ebuild:
+  gtkmm's accessibility is now always enabled (see bug #247249)
+
+  15 Jan 2009; Mike Auty <ikelos@gentoo.org>
+  vmware-workstation-5.5.9.126128.ebuild,
+  vmware-workstation-6.5.1.126130.ebuild:
+  Stabilize vmware-workstation to match the main tree.
+
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@ -0,0 +1,12 @@
+AUX 90vmware-workstation 106 RMD160 471fb03d54bb48c651d4543f1c8ece1bb9b40c0a SHA1 3db7ec2a3b37a84328bf3d481a58b42499ef520b SHA256 c8f7143551f516b901143e60fc74e822ca3d235477d1c2a135bb36cbc639cf1e
+AUX vmware-player.desktop 599 RMD160 a5a9897671da69c4706ba412d9a041edfd13a9b7 SHA1 12af70f7039b19838e298d1949df28b1b8d407a6 SHA256 b967f2e6dba531613498a2dea130f557fc366e869876aa63ba3ae97f5ff59c54
+AUX vmware-workstation.desktop 605 RMD160 256b59a1e52b65279ef38b3dcf52c43a34090807 SHA1 8f8c1fded85070be0532e33f1bdc05425e33bfb1 SHA256 ae2f572200a16a1e1222e282268ae138588c0e7576045a584c1d17f54f379f3e
+AUX vmware-workstation.rc 1862 RMD160 000c71ee5c62edc27d3df3f23286e1fe8490516e SHA1 cf1db60598d0d2fe44260f7387537ec1babf3a52 SHA256 76e6ea8c199a4dced79a75a0346360714941ef192b61e4610c6229e071d64782
+AUX vmware-workstation.xml 1592 RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e8c SHA1 02db2ee7ca0abb8b8793c9f56d858bb08c1c715f SHA256 56aafee80ad705e8d832f8853c36d763d37b87d1cb132a41c50eb63085ae854d
+DIST VMware-workstation-5.5.9-126128.tar.gz 111649803 RMD160 a5a867761d36c9a02821f8dd639a95b8c9ab38bc SHA1 eb8786111a74213ea4ec24636a4ba70b7f5dc741 SHA256 71a062e29480a48647c7323883e4e4b43a9365c1bb70000a23b768647db46444
+DIST vmware-workstation-5.5.9-126128-genpatches-1.tar.bz2 2019 RMD160 0b94bb68ced0d50a8aff99031e76c018f6aac3c1 SHA1 1c8a32379ece35823e83d30fa358fb302ad8fcb7 SHA256 020d0e348c40ef5975ffad4e924d11a6c972070bf1490b6537040a2e61565e41
+DIST vmware-workstation-6.0.5-109488-genpatches-4.tar.bz2 2583 RMD160 93bae9fc33a537d0983a8edd9fdfcafdd65500a3 SHA1 56010020e6dbe43ddad62c13ef20fb2df693e534 SHA256 76427724342bc96b7e513364cd1e50366e85b73b6751c764c1cf474babbf0c0f
+EBUILD vmware-workstation-5.5.9_p126128.ebuild 2408 RMD160 b6c093e4357d0f4e10c65940828b0cfac6aadb08 SHA1 cfd2c7f6361fbae578edcb798904deb61e1bac1f SHA256 53790a4c3de3239a6552fcc216d4d2a3f791c2a88a9f0acae20f98ca9489bb45
+EBUILD vmware-workstation-6.0.5_p109488.ebuild 2434 RMD160 5a8157681d7c70e050bfb0b2ba97746873b8d958 SHA1 48d1dfe4bfb36a831429e1fa6b156e3c02b0af51 SHA256 0d010401aea3ed27e659827b458091ea5d21233db72c6d415e4306e7ca6756d3
+MISC ChangeLog 916 RMD160 68201b84c6fa669c0a27a1bc2f305c0452b2f1f8 SHA1 42e53815f922e07ed65634be33dc6d9be4cc875d SHA256 5c2e5eff814548fcc7f4460007338e3b0d36b6698cec322af23d531e43661f1d
+MISC metadata.xml 159 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 SHA1 f46b02a39bcd0165558de67ff4256cfc812418a3 SHA256 8581ae1c90a48f50fa0542c7fb28cb8984baaf12f50fa18f33e467081effb215
--- a/app-emulation/vmware-workstation/files/90vmware-workstation
+++ b/app-emulation/vmware-workstation/files/90vmware-workstation
@ -0,0 +1,3 @@
+PATH=/opt/vmware/workstation/bin
+ROOTPATH=/opt/vmware/workstation/bin
+MANPATH=/opt/vmware/workstation/man
--- a/app-emulation/vmware-workstation/files/vmware-player.desktop
+++ b/app-emulation/vmware-workstation/files/vmware-player.desktop
@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Name=VMWare Player
+Type=Application
+Comment=Emulate a complete PC on your PC without the usual performance overhead of most emulators
+MimeType=application/x-vmware-vm-legacy;application/x-vmware-team;application/x-vmware-vm-clone;application/x-vmware-vm;application/x-vmware-vm-clone;application/x-vmware-vm;application/x-vmware-vm-clone;application/x-vmware-vm;application/x-vmware-vmdisk;application/x-vmware-team;application/x-vmware-vmfoundry;application/x-vmware-vm;application/x-vmware-snapshot;
+Exec=vmplayer
+TryExec=vmplayer
+Icon=vmware-player
+Categories=System;
--- a/app-emulation/vmware-workstation/files/vmware-workstation.desktop
+++ b/app-emulation/vmware-workstation/files/vmware-workstation.desktop
@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Name=VMWare Workstation
+Type=Application
+Comment=Emulate a complete PC on your PC without the usual performance overhead of most emulators
+MimeType=application/x-vmware-vm-legacy;application/x-vmware-team;application/x-vmware-vm-clone;application/x-vmware-vm;application/x-vmware-vm-clone;application/x-vmware-vm;application/x-vmware-vm-clone;application/x-vmware-vm;application/x-vmware-vmdisk;application/x-vmware-team;application/x-vmware-vmfoundry;application/x-vmware-vm;application/x-vmware-snapshot;
+Exec=vmware
+TryExec=vmware
+Icon=vmware-workstation
+Categories=System;
--- a/app-emulation/vmware-workstation/files/vmware-workstation.rc
+++ b/app-emulation/vmware-workstation/files/vmware-workstation.rc
@ -0,0 +1,86 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/files/vmware-workstation.rc,v 1.6 2007/11/25 12:50:32 ikelos Exp $
+
+depend() {
+	need localmount
+	use logger net hald
+	after samba
+}
+
+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} -eq -1 ]
+			then
+				ewarn ${line}
+				continue
+			fi
+			case ${line} in
+			*:*)
+				einfon ${line}
+				echo
+				eend 0
+				msgtype=1;;
+			*)
+				ewarn ${line}
+				msgtype=-1
+				waserror=1;;
+			esac
+			continue
+		fi
+
+		# Strip out anything after the <esc> code
+		message=`echo ${line} | sed -e "s/^\(.*\).*$/\1/"`
+		einfon "  ${message}"
+		echo
+
+		echo ${line} | grep -q done
+		status=$?
+		eend ${status}
+
+		if [ ${status} -eq 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
+
+	if modinfo vmblock > /dev/null 2>&1;
+	then
+		ebegin "Loading vmblock for drag and drop support"
+		local result
+		modprobe vmblock || eend 1 "Failed to load vmblock driver"
+		test ! -e /tmp/VMwareDnD && mkdir /tmp/VMwareDnD
+		chmod 1777 /tmp/VMwareDnD
+		mount -t vmblock none /proc/fs/vmblock/mountPoint || eend 1 "Failed to mount the vmblock filesystem"
+		eend 0
+	fi
+
+	/etc/vmware/init.d/vmware start | vmware_prettify start
+	return $?
+}
+
+stop() {
+	umount /proc/fs/vmblock/mountPoint > /dev/null 2>&1
+	/etc/vmware/init.d/vmware stop | vmware_prettify stop
+	return $?
+}
--- a/app-emulation/vmware-workstation/files/vmware-workstation.xml
+++ b/app-emulation/vmware-workstation/files/vmware-workstation.xml
@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+ <mime-type type="application/x-vmware-vm">
+  <comment xml:lang="en">VMware virtual machine</comment>
+  <magic priority="50">
+   <match type="string" value='config.version = "' offset="0:4096"/>
+  </magic>
+  <glob pattern="*.vmx"/>
+ </mime-type>
+
+ <mime-type type="application/x-vmware-vmdisk">
+  <comment xml:lang="en">VMware virtual disk</comment>
+  <magic priority="50">
+   <match type="string" value="# Disk DescriptorFile" offset="0"/>
+   <match type="string" value="KDMV" offset="0"/>
+  </magic>
+  <glob pattern="*.vmdk"/>
+ </mime-type>
+
+ <mime-type type="application/x-vmware-team">
+  <comment xml:lang="en">VMware team</comment>
+  <magic priority="50">
+   <match type="string" value='&lt;Foundry version="1"&gt;' offset="0">
+    <match type="string" value="&lt;VMTeam&gt;" offset="23:24"/>
+   </match>
+  </magic>
+  <glob pattern="*.vmtm"/>
+ </mime-type>
+
+ <mime-type type="application/x-vmware-snapshot">
+  <comment xml:lang="en">VMware virtual machine snapshot</comment>
+  <magic priority="50">
+   <match type="string" value="\\0xD0\\0xBE\\0xD0\\0xBE" offset="0"/>
+  </magic>
+  <glob pattern="*.vmsn"/>
+ </mime-type>
+
+ <mime-type type="application/x-vmware-vmfoundry">
+  <comment xml:lang="en">VMware virtual machine foundry</comment>
+  <magic priority="50">
+   <match type="string" value='&lt;Foundry version="1"&gt;' offset="0">
+    <match type="string" value="&lt;VM&gt;" offset="23:24"/>
+   </match>
+  </magic>
+  <glob pattern="*.vmxf"/>
+ </mime-type>
+</mime-info>
--- a/app-emulation/vmware-workstation/metadata.xml
+++ b/app-emulation/vmware-workstation/metadata.xml
@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>vmware</herd>
+</pkgmetadata>
--- a/app-emulation/vmware-workstation/vmware-workstation-5.5.9_p126128.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-5.5.9_p126128.ebuild
@ -0,0 +1,86 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+VM_SRC="VMware-workstation-${PV/_p/-}.tar.gz"
+VM_SRC_EXTRA="genpatches-1"
+
+inherit vmware-1 eutils
+
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+# vmware-workstation should not use virtual/libc as this is a
+# precompiled binary package thats linked to glibc.
+RDEPEND="sys-libs/glibc
+	amd64? (
+		app-emulation/emul-linux-x86-gtklibs )
+	x86? (
+		x11-libs/libXrandr
+		x11-libs/libXcursor
+		x11-libs/libXinerama
+		x11-libs/libXi
+		x11-libs/libXft )
+	!app-emulation/vmware-player
+	!app-emulation/vmware-server
+	~app-emulation/vmware-modules-138.9
+	!<app-emulation/vmware-modules-138.9
+	!>app-emulation/vmware-modules-138.9
+	>=dev-lang/perl-5
+	sys-apps/pciutils"
+
+S=${WORKDIR}/vmware-distrib
+
+dir=/opt/vmware/workstation
+Ddir=${D}/${dir}
+
+QA_TEXTRELS_x86="${dir:1}/lib/lib/libgdk-x11-2.0.so.0/libgdk-x11-2.0.so.0"
+QA_EXECSTACK_x86="${dir:1}/bin/vmnet-bridge
+	${dir:1}/bin/vmnet-dhcpd
+	${dir:1}/bin/vmnet-natd
+	${dir:1}/bin/vmnet-netifup
+	${dir:1}/bin/vmnet-sniffer
+	${dir:1}/bin/vmware-loop
+	${dir:1}/bin/vmware-ping
+	${dir:1}/bin/vmware-vdiskmanager
+	${dir:1}/lib/bin/vmware
+	${dir:1}/lib/bin/vmware-vmx
+	${dir:1}/lib/bin/vmrun
+	${dir:1}/lib/bin/vmplayer
+	${dir:1}/lib/bin-debug/vmware-vmx
+	${dir:1}/lib/lib/libpixops.so.2.0.1/libpixops.so.2.0.1"
+
+QA_TEXTRELS_amd64="${dir:1}/lib/lib/libgdk-x11-2.0.so.0/libgdk-x11-2.0.so.0"
+QA_EXECSTACK_amd64="${dir:1}/bin/vmnet-bridge
+	${dir:1}/bin/vmnet-dhcpd
+	${dir:1}/bin/vmnet-natd
+	${dir:1}/bin/vmnet-netifup
+	${dir:1}/bin/vmnet-sniffer
+	${dir:1}/bin/vmware-loop
+	${dir:1}/bin/vmware-ping
+	${dir:1}/bin/vmware-vdiskmanager
+	${dir:1}/lib/bin/vmware
+	${dir:1}/lib/bin/vmware-vmx
+	${dir:1}/lib/bin/vmrun
+	${dir:1}/lib/bin/vmplayer
+	${dir:1}/lib/bin-debug/vmware-vmx
+	${dir:1}/lib/lib/libpixops.so.2.0.1/libpixops.so.2.0.1"
+
+src_install() {
+	vmware-1_src_install
+
+	doicon lib/share/pixmaps/vmware-player.png
+	# Fix an ugly GCC error on start
+	rm -f "${Ddir}lib/lib/libgcc_s.so.1/libgcc_s.so.1"
+	make_desktop_entry vmware "VMWare Workstation" ${PN}.png System
+	make_desktop_entry vmplayer "VMWare Player" vmware-player.png System
+}
+
+pkg_postinst() {
+	vmware-1_pkg_postinst
+	ewarn "Vmware Workstation has issues on systems with hal installed but"
+	ewarn "not running. If you experience trouble with VMware loading, try"
+	ewarn "starting the hal daemon."
+}
--- a/eclass/vmware-1.eclass
+++ b/eclass/vmware-1.eclass
@ -0,0 +1,439 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# By default this eclasses wants eapi 2 which might be redefinable to newer
+# versions.
+case ${EAPI:-0} in
+        2) : ;;
+        *) die "No way! EAPI other than 2 is not supported for now." ;;
+esac
+
+# This eclass is for all vmware-1-* ebuilds in the tree and should contain all
+# of the common components across the multiple packages.
+
+# Only one package per "product" is allowed to be installed at any given time.
+
+inherit pax-utils eutils
+
+EXPORT_FUNCTIONS pkg_preinst pkg_postinst pkg_setup src_prepare src_install src_unpack pkg_postrm pkg_nofetch
+
+vmware-1_determine_product() {
+	# Set the product category, and the category options
+	shortname=$(echo ${PN} | cut -d- -f2-)
+	case "${shortname}" in
+		workstation|server|player)
+			product="vmware"
+			config_program="vmware-config.pl"
+			;;
+		server-console|esx-console|gsx-console)
+			product="vmware-console"
+			config_program="vmware-config-console.pl"
+			;;
+		*)
+			product="unknown"
+			;;
+	esac
+	config_dir="/etc/${product}"
+
+	# Set per package options
+	case "${shortname}" in
+		workstation)
+			FULL_NAME="Workstation"
+			SRC_URI_ROOT="mirror://vmware/software/wkst/"
+			HOMEPAGE="http://www.vmware.com/download/ws/"
+			RESTRICT="fetch strip"
+			;;
+		player)
+			FULL_NAME="Player"
+			SRC_URI_ROOT="mirror://vmware/software/vmplayer/"
+			HOMEPAGE="http://www.vmware.com/download/player/"
+			;;
+		converter)
+			FULL_NAME="Converter"
+			config_dir="/etc/${PN}"
+			;;
+		server)
+			FULL_NAME="Server"
+			SRC_URI_ROOT="mirror://vmware/software/vmserver/"
+			HOMEPAGE="http://www.vmware.com/download/server/"
+			;;
+		server-console)
+			FULL_NAME="Server Console"
+			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}"
+			;;
+		esx-console)
+			FULL_NAME="ESX Console"
+			;;
+	esac
+}
+
+# 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
+
+# scan for genpatches and if also amd64 packages are present then put the package into x86
+if [[ -n "${VM_SRC_EXTRA}" ]]
+then
+	for a in ${VM_SRC_EXTRA}
+	do
+		if [[ -n  ${VM_SRC_EXTRA64} ]]
+		then
+			SRC_URI="${SRC_URI} x86? ( http://ftp.mars.arge.at/vmware/${P/_p/-}-${a}.tar.bz2 )"
+		else
+			SRC_URI="${SRC_URI} http://ftp.mars.arge.at/vmware/${P/_p/-}-${a}.tar.bz2"
+		fi
+	done
+fi
+
+# now also add the amd64 packages
+if [[ -n "${VM_SRC_EXTRA64}" ]]
+then
+	for a in ${VM_SRC_EXTRA64}
+	do
+		SRC_URI="${SRC_URI} amd64? ( http://ftp.mars.arge.at/vmware/${P/_p/-}-${a}.tar.bz2 )"
+	done
+fi
+
+DESCRIPTION="VMware ${FULL_NAME} for Linux"
+LICENSE="vmware"
+RESTRICT="strip mirror"
+SLOT="0"
+DEPEND="x11-misc/shared-mime-info"
+
+vmware-1_determine_product
+
+export VMWARE_GROUP=${VMWARE_GROUP:-vmware}
+export VMWARE_INSTALL_DIR=/opt/${PN//-//}
+
+vmware-1_create_initd() {
+	dodir "${config_dir}"/init.d/rc{0,1,2,3,4,5,6}.d
+	# 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 "${config_dir}"/init.d/rc{0,1,2,3,4,5,6}.d
+}
+
+vmware-1_run_questions() {
+	# Questions:
+	einfo "Adding answers to ${config_dir}/locations"
+	locations="${D}${config_dir}/locations"
+	echo "answer BINDIR ${VMWARE_INSTALL_DIR}/bin" >> ${locations}
+	echo "answer LIBDIR ${VMWARE_INSTALL_DIR}/lib" >> ${locations}
+	echo "answer MANDIR ${VMWARE_INSTALL_DIR}/man" >> ${locations}
+	echo "answer DOCDIR ${VMWARE_INSTALL_DIR}/doc" >> ${locations}
+	if [ "${product}" == "vmware" ]
+	then
+		echo "answer SBINDIR ${VMWARE_INSTALL_DIR}/sbin" >> ${locations}
+		echo "answer RUN_CONFIGURATOR no" >> ${locations}
+		echo "answer INITDIR ${config_dir}/init.d" >> ${locations}
+		echo "answer INITSCRIPTSDIR ${config_dir}/init.d" >> ${locations}
+	fi
+}
+
+
+vmware-1_pkg_setup() {
+	[ -z "${product}" ] && vmware-1_determine_product
+}
+
+vmware-1_src_unpack() {
+	[[ -e ${DISTDIR}/${VM_SRC} ]] && unpack ${VM_SRC}
+	[[ -e ${DISTDIR}/${VM_SRC64} ]] && unpack ${VM_SRC64}
+	if [ -n "${VM_SRC_EXTRA}" ]
+	then
+		for a in ${VM_SRC_EXTRA}
+		do
+			unpack ${P/_p/-}-${a}.tar.bz2
+		done
+	fi
+	if [ -n "${VM_SRC_EXTRA64}" ]
+	then
+		for a in ${VM_SRC_EXTRA64}
+		do
+			unpack ${P/_p/-}-${a}.tar.bz2
+		done
+	fi
+}
+
+vmware-1_src_prepare() {
+	[[ -e lib/bin/vmware ]] && \
+		chmod 755 lib/bin/vmware
+	[[ -e bin/vmnet-bridge ]] && \
+		chmod 755 bin/vmnet-bridge
+	[[ -e lib/bin/vmware-vmx ]] && \
+		chmod 755 lib/bin/vmware-vmx
+	[[ -e lib/bin-debug/vmware-vmx ]] && \
+		chmod 755 lib/bin-debug/vmware-vmx
+
+	# Remove PAX MPROTECT flag from all applicable files in /bin, /sbin for
+	# the vmware package only (since modules, tools and console should not
+	# need to generate code on the fly in memory).
+	[[ "${product}" == "vmware" ]] && pax-mark -m \
+	$(list-paxables ${S}/{bin{,-debug},sbin}/{vmware-serverd,vmware-vmx})
+
+	# Run through any patches that might need to be applied
+	cd "${S}"
+	if [[ -d "${WORKDIR}/patches" ]]
+	then
+		EPATCH_FORCE="yes"
+		EPATCH_SUFFIX="patch"
+		epatch "${WORKDIR}"/patches
+	fi
+}
+
+vmware-1_src_install() {
+	# We won't want any perl scripts from VMware once we've finally got all
+	# of the configuration done, but for now, they're necessary.
+	#rm -f bin/*.pl
+
+	# As backwards as this seems, we're installing our icons first.
+	if [[ -e lib/share/icons/48x48/apps/${PN}.png ]]
+	then
+		doicon lib/share/icons/48x48/apps/${PN}.png
+	elif [[ -e doc/icon48x48.png ]]
+	then
+		newicon doc/icon48x48.png ${PN}.png
+	elif [[ -e "${DISTDIR}/${product}.png" ]]
+	then
+		newicon "${DISTDIR}"/${product}.png ${PN}.png
+	fi
+
+	# 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 "${S}"/lib/modules/binary
+	# We also don't need to keep the icons around, or do we?
+	#rm -rf ${S}/lib/share/icons
+
+	# Just like any good monkey, we install the documentation and man pages.
+	[[ -d doc ]] && dodoc doc/*
+	if [[ -d man ]]
+	then
+		cd man
+		for x in *
+		do
+			doman ${x}/* || die "doman"
+		done
+	fi
+	cd "${S}"
+
+	# We loop through our directories and copy everything to our system.
+	for x in bin lib sbin
+	do
+		if [[ -e "${S}/${x}" ]]
+		then
+			dodir "${VMWARE_INSTALL_DIR}"/${x}
+			cp -pPR "${S}"/${x}/* "${D}""${VMWARE_INSTALL_DIR}"/${x} \
+				|| die "copying ${x}"
+		fi
+	done
+
+	# If we have an /etc directory, we copy it.
+	if [[ -e "${S}/etc" ]]
+	then
+		dodir "${config_dir}"
+		cp -pPR "${S}"/etc/* "${D}""${config_dir}"
+		fowners root:${VMWARE_GROUP} "${config_dir}"
+		fperms 770 "${config_dir}"
+	fi
+
+	# If we have any helper files, we install them.  First, we check for an
+	# init script.
+	if [[ -e "${FILESDIR}/${PN}.rc" ]]
+	then
+		newinitd "${FILESDIR}"/${PN}.rc ${product} || die "newinitd"
+	fi
+	# Then we check for an environment file.
+	if [[ -e "${FILESDIR}/90${PN}" ]]
+	then
+		doenvd "${FILESDIR}"/90${PN} || die "doenvd"
+	fi
+	# Last, we check for any mime files.
+	if [[ -e "${FILESDIR}/${PN}.xml" ]]
+	then
+		insinto /usr/share/mime/packages
+		doins "${FILESDIR}"/${PN}.xml || die "mimetypes"
+	fi
+
+	# Blame bug #91191 for this one.
+	if [[ -e doc/EULA ]]
+	then
+		insinto "${VMWARE_INSTALL_DIR}"/doc
+		doins doc/EULA || die "copying EULA"
+	fi
+
+	# Do we have vmware-ping/vmware-vmx?  If so, make them setuid.
+	for p in /bin/vmware-ping /lib/bin/vmware-vmx /lib/bin-debug/vmware-vmx /lib/bin/vmware-vmx-debug /sbin/vmware-authd;
+	do
+		if [ -x "${D}${VMWARE_INSTALL_DIR}${p}" ]
+		then
+			fowners root:${VMWARE_GROUP} "${VMWARE_INSTALL_DIR}"${p}
+			fperms 4750 "${VMWARE_INSTALL_DIR}"${p}
+		fi
+	done
+
+	# This removed the user/group warnings
+	# But also broke vmware-server with FEATURES="userpriv" since it removes
+	# the set-UID bit
+	#chown -R root:${VMWARE_GROUP} ${D} || die
+
+	# We like desktop icons.
+	# TODO: Fix up the icon creation, across the board.
+	#make_desktop_entry ${PN} "VMware ${FULL_NAME}" ${PN}.png
+
+	# We like symlinks for console users.
+	# TODO: Fix up the symlink creation, across the board.
+	# dosym ${VMWARE_INSTALL_DIR}/bin/${PN} /usr/bin/${PN}
+
+	# TODO: Replace this junk
+	# Everything after this point will hopefully go away once we can rid
+	# ourselves of the evil perl configuration scripts.
+
+	if [ "${product}" == "vmware" ]
+	then
+
+		# We have to create a bunch of rc directories for the init script
+		vmware-1_create_initd || die "creating rc directories"
+
+		# Now, we copy in our services.sh file
+		exeinto "${config_dir}"/init.d
+		newexe installer/services.sh ${product} || die "services.sh"
+
+		# Set the name
+		dosed "s:%LONGNAME%:Vmware ${FULL_NAME}:" \
+			"${config_dir}"/init.d/${product}
+		[ "${shortname}" == "server" ] && dosed "s:%SHORTNAME%:wgs:" \
+			"${config_dir}"/init.d/${product}
+	fi
+
+	# Finally, we run the "questions"
+	vmware-1_run_questions || die "running questions"
+}
+
+vmware-1_pkg_preinst() {
+	# This is run here due to bug #143150
+	[ -z "${product}" ] && vmware-1_determine_product
+
+	# This must be done after the install to get the mtimes on each file
+	# right.
+
+	#Note: it's a bit weird to use ${D} in a preinst script but it should work
+	#(drobbins, 1 Feb 2002)
+
+	einfo "Generating ${config_dir}/locations file."
+	d=`echo ${D} | wc -c`
+	for x in `find ${D}${VMWARE_INSTALL_DIR} ${D}${config_dir}` ; do
+		x="`echo ${x} | cut -c ${d}-`"
+		if [ -d "${D}/${x}" ] ; then
+			echo "directory ${x}" >> "${D}${config_dir}"/locations
+		else
+			echo -n "file ${x}" >> "${D}${config_dir}"/locations
+			if [ "${x}" == "${config_dir}/locations" ] ; then
+				echo "" >> "${D}${config_dir}"/locations
+			elif [ "${x}" == "${config_dir}/not_configured" ] ; then
+				echo "" >> "${D}${config_dir}"/locations
+			else
+				echo -n " " >> "${D}${config_dir}"/locations
+				find ${D}${x} -printf %T@ >> "${D}${config_dir}"/locations
+				echo "" >> "${D}${config_dir}"/locations
+			fi
+		fi
+	done
+}
+
+vmware-1_pkg_postinst() {
+	update-mime-database /usr/share/mime
+	[[ -d "${config_dir}" ]] && chown -R root:${VMWARE_GROUP} ${config_dir}
+
+	# 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 ${config_dir}/locations"
+	for x in "${config_dir}"/._cfg????_locations ; do
+		if [ -f $x ] ; then
+			cat $x >> "${config_dir}"/locations
+			rm $x
+		fi
+	done
+
+	echo
+	elog "You need to run "
+	elog "    ${VMWARE_INSTALL_DIR}/bin/${config_program}"
+	elog "to complete the install."
+	echo
+	einfo "For VMware Add-Ons just visit"
+	einfo "http://www.vmware.com/download/downloadaddons.html"
+	echo
+	if [ "${PN}" == "vmware-player" ]
+	then
+		elog "After configuring, run vmplayer to launch"
+	else
+		elog "After configuring, run ${PN} to launch"
+	fi
+	echo
+	if [ "${product}" == "vmware" ]
+	then
+		elog "Also note that when you reboot you should run:"
+		elog "    /etc/init.d/${product} start"
+		elog "before trying to run ${product}.  Or you could just add it to"
+		elog "the default runlevel:"
+		elog "    rc-update add ${product} default"
+		echo
+		ewarn "VMWare allows for the potential of overwriting files as root.  Only"
+		ewarn "give VMWare access to trusted individuals."
+		echo
+	fi
+	ewarn "Remember, in order to run VMware ${FULL_NAME}, you have to"
+	ewarn "be in the '${VMWARE_GROUP}' group."
+	echo
+}
+
+vmware-1_pkg_postrm() {
+	[ -z "${product}" ] && vmware-1_determine_product
+	local product_extras
+	if [ "${product}" == "vmware" ]
+	then
+		product_extras=" and /etc/init.d/${product}"
+	fi
+	if ! has_version app-emulation/${PN}; then
+		echo
+		elog "To remove all traces of ${product} you will need to remove the files"
+		elog "in ${config_dir}${product_extras}."
+		elog "If the vmware-modules package is installed, you may no longer need it."
+		echo
+	fi
+}
+
+vmware-1_pkg_nofetch() {
+	einfo "This files require you to register at www.vmware.com"
+	einfo "Please download following files:"
+	if [ -n "${VM_SRC64}" ]
+	then
+		einfo " - ${VM_SRC64} from ${HOMEPAGE}"
+	else
+		einfo " - ${VM_SRC} from ${HOMEPAGE}"
+	fi
+	if [ -n "${VM_SRC_EXTRA}" ]
+	then
+		for a in ${VM_SRC_EXTRA}
+		do
+			einfo " - http://ftp.mars.arge.at/vmware/${P/_p/-}-${a}.tar.bz2"
+		done
+	fi
+	if [ -n "${VM_SRC_EXTRA64}" ]
+	then
+		for a in ${VM_SRC_EXTRA64}
+		do
+			einfo " - http://ftp.mars.arge.at/vmware/${P/_p/-}-${a}.tar.bz2"
+		done
+	fi
+	einfo "and place them in ${DISTDIR}"
+}
+
--- a/eclass/vmware-2.eclass
+++ b/eclass/vmware-2.eclass
@ -0,0 +1,416 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# This eclass is for all vmware-2-* ebuilds in the tree and should contain all
+# of the common components across the multiple packages.
+
+# Only one package per "product" is allowed to be installed at any given time.
+
+inherit pax-utils eutils
+
+EXPORT_FUNCTIONS pkg_preinst pkg_postinst pkg_setup src_install src_unpack pkg_postrm
+
+DEPEND="x11-misc/shared-mime-info"
+
+export ANY_ANY="vmware-any-any-update115"
+#export TOOLS_ANY="vmware-tools-any-update1"
+export VMWARE_GROUP=${VMWARE_GROUP:-vmware}
+export VMWARE_INSTALL_DIR=/opt/${PN//-//}
+
+vmware-2_create_initd() {
+	dodir "${config_dir}"/init.d/rc{0,1,2,3,4,5,6}.d
+	# 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 "${config_dir}"/init.d/rc{0,1,2,3,4,5,6}.d
+}
+
+vmware-2_run_questions() {
+	vmware-2_determine_product
+	# Questions:
+	einfo "Adding answers to ${config_dir}/locations"
+	locations="${D}${config_dir}/locations"
+	echo "answer BINDIR ${VMWARE_INSTALL_DIR}/bin" >> ${locations}
+	echo "answer LIBDIR ${VMWARE_INSTALL_DIR}/lib" >> ${locations}
+	echo "answer MANDIR ${VMWARE_INSTALL_DIR}/man" >> ${locations}
+	echo "answer DOCDIR ${VMWARE_INSTALL_DIR}/doc" >> ${locations}
+	if [ "${product}" == "vmware" -o "${product}" == "vmware-tools" ]
+	then
+		echo "answer SBINDIR ${VMWARE_INSTALL_DIR}/sbin" >> ${locations}
+		echo "answer RUN_CONFIGURATOR no" >> ${locations}
+		echo "answer INITDIR ${config_dir}/init.d" >> ${locations}
+		echo "answer INITSCRIPTSDIR ${config_dir}/init.d" >> ${locations}
+	fi
+}
+
+vmware-2_determine_product() {
+	# Set the product category, and the category options
+	shortname=$(echo ${PN} | cut -d- -f2-)
+	case "${shortname}" in
+		workstation|server|player)
+			product="vmware"
+			config_program="vmware-config.pl"
+			;;
+		server-console|esx-console|gsx-console)
+			product="vmware-console"
+			config_program="vmware-config-console.pl"
+			;;
+		vm-tools)
+			product="vmware-tools"
+			config_program="vmware-config-tools.pl"
+			;;
+		*)
+			product="unknown"
+			;;
+	esac
+	config_dir="/etc/${product}"
+
+	# Set per package options
+	case "${shortname}" in
+		workstation)
+			FULL_NAME="Workstation"
+			;;
+		player)
+			FULL_NAME="Player"
+			;;
+		converter)
+			FULL_NAME="Converter"
+			config_dir="/etc/${PN}"
+			;;
+		server)
+			FULL_NAME="Server"
+			;;
+		server-console)
+			FULL_NAME="Server Console"
+			config_program="vmware-config-server-console.pl"
+			config_dir="/etc/${PN}"
+			;;
+		esx-console)
+			FULL_NAME="ESX Console"
+			;;
+	esac
+}
+
+vmware-2_pkg_setup() {
+	vmware-2_determine_product
+}
+
+vmware-2_src_unpack() {
+	vmware-2_determine_product
+	case "${product}" in
+		vmware-tools)
+			# We grab our tarball from "CD"
+			einfo "You will need ${TARBALL} from the VMware installation."
+			einfo "Select VM->Install VMware Tools from VMware's menu."
+			cdrom_get_cds ${TARBALL}
+			;;
+	esac
+	# If there is anything to unpack, at all, then we should be using MY_P.
+	if [[ -n "${MY_P}" ]]
+	then
+		if [[ -e "${CDROM_ROOT}"/${MY_P}.tar.gz ]]
+		then
+			tar xzf "${CDROM_ROOT}"/${MY_P}.tar.gz
+		else
+			unpack "${MY_P}".tar.gz
+		fi
+
+		if [[ -n "${ANY_ANY}" ]]
+		then
+			unpack "${ANY_ANY}".tar.gz
+			# Move the relevant ANY_ANY files now, so that they can be patched later...
+			mv -f "${ANY_ANY}"/services.sh "${S}"/installer/services.sh
+			# We should be able to get rid of this eventually,
+			# since we'll be using vmware-modules in future...
+			[[ "${product}" == "vmware" ]] && \
+				mv -f "${ANY_ANY}"/*.tar "${S}"/lib/modules/source
+			[[ -e lib/bin/vmware ]] && \
+				chmod 755 lib/bin/vmware
+			[[ -e bin/vmnet-bridge ]] && \
+				chmod 755 bin/vmnet-bridge
+			[[ -e lib/bin/vmware-vmx ]] && \
+				chmod 755 lib/bin/vmware-vmx
+			[[ -e lib/bin-debug/vmware-vmx ]] && \
+				chmod 755 lib/bin-debug/vmware-vmx
+			if [[ "${RUN_UPDATE}" == "yes" ]]
+			then
+				cd "${S}"/"${ANY_ANY}"
+				./update vmware ../lib/bin/vmware || die
+				./update bridge ../bin/vmnet-bridge || die
+				./update vmx ../lib/bin/vmware-vmx || die
+				./update vmxdebug ../lib/bin-debug/vmware-vmx || die
+			fi
+		fi
+
+		# Remove PAX MPROTECT flag from all applicable files in /bin, /sbin for
+		# the vmware package only (since modules, tools and console should not
+		# need to generate code on the fly in memory).
+		[[ "${product}" == "vmware" ]] && pax-mark -m \
+		$(list-paxables ${S}/{bin{,-debug},sbin}/{vmware-serverd,vmware-vmx})
+
+		# Run through any patches that might need to be applied
+		cd "${S}"
+		if [[ -d "${FILESDIR}/${PV}" ]]
+		then
+			EPATCH_SUFFIX="patch"
+			epatch "${FILESDIR}"/${PV}
+		fi
+		if [[ -n "${PATCHES}" ]]
+		then
+			for patch in ${PATCHES}
+			do
+				epatch "${FILESDIR}"/${patch}
+			done
+		fi
+		# Unpack our new libs
+		for a in ${A}
+		do
+			case ${a} in
+				vmware-libssl.so.0.9.7l.tar.bz2)
+					unpack vmware-libssl.so.0.9.7l.tar.bz2
+					;;
+				vmware-libcrypto.so.0.9.7l.tar.bz2)
+					unpack vmware-libcrypto.so.0.9.7l.tar.bz2
+					;;
+			esac
+		done
+	fi
+}
+
+vmware-2_src_install() {
+	# We won't want any perl scripts from VMware once we've finally got all
+	# of the configuration done, but for now, they're necessary.
+	#rm -f bin/*.pl
+
+	# As backwards as this seems, we're installing our icons first.
+	if [[ -e lib/share/icons/48x48/apps/${PN}.png ]]
+	then
+		doicon lib/share/icons/48x48/apps/${PN}.png
+	elif [[ -e doc/icon48x48.png ]]
+	then
+		newicon doc/icon48x48.png ${PN}.png
+	elif [[ -e "${DISTDIR}/${product}.png" ]]
+	then
+		newicon "${DISTDIR}"/${product}.png ${PN}.png
+	fi
+
+	# 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 "${S}"/lib/modules/binary
+	# We also don't need to keep the icons around, or do we?
+	#rm -rf ${S}/lib/share/icons
+
+	# Just like any good monkey, we install the documentation and man pages.
+	[[ -d doc ]] && dodoc doc/*
+	if [[ -d man ]]
+	then
+		cd man
+		for x in *
+		do
+			doman ${x}/* || die "doman"
+		done
+	fi
+	cd "${S}"
+
+	# We remove the shipped libssl for bug #148682
+	if [ -d "${S}"/libssl.so.0.9.7 ]
+	then
+		rm -rf "${S}"/lib/lib/libssl.so.0.9.7
+		# Now, we move in our own
+		cp -pPR "${S}"/libssl.so.0.9.7 "${S}"/lib/lib
+	fi
+	# We remove the shipped libcrypto for bug #148682
+	if [ -d "${S}"/libcrypto.so.0.9.7 ]
+	then
+		rm -rf "${S}"/lib/lib/libcrypto.so.0.9.7
+		# Now, we move in our own
+		cp -pPR "${S}"/libcrypto.so.0.9.7 "${S}"/lib/lib
+	fi
+
+	# We loop through our directories and copy everything to our system.
+	for x in bin lib sbin
+	do
+		if [[ -e "${S}/${x}" ]]
+		then
+			dodir "${VMWARE_INSTALL_DIR}"/${x}
+			cp -pPR "${S}"/${x}/* "${D}""${VMWARE_INSTALL_DIR}"/${x} \
+				|| die "copying ${x}"
+		fi
+	done
+
+	# If we have an /etc directory, we copy it.
+	if [[ -e "${S}/etc" ]]
+	then
+		dodir "${config_dir}"
+		cp -pPR "${S}"/etc/* "${D}""${config_dir}"
+		fowners root:${VMWARE_GROUP} "${config_dir}"
+		fperms 770 "${config_dir}"
+	fi
+
+	# If we have any helper files, we install them.  First, we check for an
+	# init script.
+	if [[ -e "${FILESDIR}/${PN}.rc" ]]
+	then
+		newinitd "${FILESDIR}"/${PN}.rc ${product} || die "newinitd"
+	fi
+	# Then we check for an environment file.
+	if [[ -e "${FILESDIR}/90${PN}" ]]
+	then
+		doenvd "${FILESDIR}"/90${PN} || die "doenvd"
+	fi
+	# Last, we check for any mime files.
+	if [[ -e "${FILESDIR}/${PN}.xml" ]]
+	then
+		insinto /usr/share/mime/packages
+		doins "${FILESDIR}"/${PN}.xml || die "mimetypes"
+	fi
+
+	# Blame bug #91191 for this one.
+	if [[ -e doc/EULA ]]
+	then
+		insinto "${VMWARE_INSTALL_DIR}"/doc
+		doins doc/EULA || die "copying EULA"
+	fi
+
+	# Do we have vmware-ping/vmware-vmx?  If so, make them setuid.
+	for p in /bin/vmware-ping /lib/bin/vmware-vmx /lib/bin-debug/vmware-vmx /lib/bin/vmware-vmx-debug /sbin/vmware-authd;
+	do
+		if [ -x "${D}${VMWARE_INSTALL_DIR}${p}" ]
+		then
+			fowners root:${VMWARE_GROUP} "${VMWARE_INSTALL_DIR}"${p}
+			fperms 4750 "${VMWARE_INSTALL_DIR}"${p}
+		fi
+	done
+
+	# This removed the user/group warnings
+	# But also broke vmware-server with FEATURES="userpriv" since it removes
+	# the set-UID bit
+	#chown -R root:${VMWARE_GROUP} ${D} || die
+
+	# We like desktop icons.
+	# TODO: Fix up the icon creation, across the board.
+	#make_desktop_entry ${PN} "VMware ${FULL_NAME}" ${PN}.png
+
+	# We like symlinks for console users.
+	# TODO: Fix up the symlink creation, across the board.
+	# dosym ${VMWARE_INSTALL_DIR}/bin/${PN} /usr/bin/${PN}
+
+	# TODO: Replace this junk
+	# Everything after this point will hopefully go away once we can rid
+	# ourselves of the evil perl configuration scripts.
+
+	if [ "${product}" == "vmware" -o "${product}" == "vmware-tools" ]
+	then
+
+		# We have to create a bunch of rc directories for the init script
+		vmware-2_create_initd || die "creating rc directories"
+
+		# Now, we copy in our services.sh file
+		exeinto "${config_dir}"/init.d
+		newexe installer/services.sh ${product} || die "services.sh"
+
+		# Set the name
+		dosed "s:%LONGNAME%:Vmware ${FULL_NAME}:" \
+			"${config_dir}"/init.d/${product}
+		[ "${shortname}" == "server" ] && dosed "s:%SHORTNAME%:wgs:" \
+			"${config_dir}"/init.d/${product}
+	fi
+
+	# Finally, we run the "questions"
+	vmware-2_run_questions || die "running questions"
+}
+
+vmware-2_pkg_preinst() {
+	# This is run here due to bug #143150
+	[ -z "${product}" ] && vmware-2_determine_product
+
+	# This must be done after the install to get the mtimes on each file
+	# right.
+
+	#Note: it's a bit weird to use ${D} in a preinst script but it should work
+	#(drobbins, 1 Feb 2002)
+
+	einfo "Generating ${config_dir}/locations file."
+	d=`echo ${D} | wc -c`
+	for x in `find ${D}${VMWARE_INSTALL_DIR} ${D}${config_dir}` ; do
+		x="`echo ${x} | cut -c ${d}-`"
+		if [ -d "${D}/${x}" ] ; then
+			echo "directory ${x}" >> "${D}${config_dir}"/locations
+		else
+			echo -n "file ${x}" >> "${D}${config_dir}"/locations
+			if [ "${x}" == "${config_dir}/locations" ] ; then
+				echo "" >> "${D}${config_dir}"/locations
+			elif [ "${x}" == "${config_dir}/not_configured" ] ; then
+				echo "" >> "${D}${config_dir}"/locations
+			else
+				echo -n " " >> "${D}${config_dir}"/locations
+				find ${D}${x} -printf %T@ >> "${D}${config_dir}"/locations
+				echo "" >> "${D}${config_dir}"/locations
+			fi
+		fi
+	done
+}
+
+vmware-2_pkg_postinst() {
+	update-mime-database /usr/share/mime
+	[[ -d "${config_dir}" ]] && chown -R root:${VMWARE_GROUP} ${config_dir}
+
+	# 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 ${config_dir}/locations"
+	for x in "${config_dir}"/._cfg????_locations ; do
+		if [ -f $x ] ; then
+			cat $x >> "${config_dir}"/locations
+			rm $x
+		fi
+	done
+
+	echo
+	elog "You need to run "
+	elog "    ${VMWARE_INSTALL_DIR}/bin/${config_program}"
+	elog "to complete the install."
+	echo
+	einfo "For VMware Add-Ons just visit"
+	einfo "http://www.vmware.com/download/downloadaddons.html"
+	echo
+	if [ "${PN}" == "vmware-player" ]
+	then
+		elog "After configuring, run vmplayer to launch"
+	else
+		elog "After configuring, run ${PN} to launch"
+	fi
+	echo
+	if [ "${product}" == "vmware" -o "${product}" == "vmware-tools" ]
+	then
+		elog "Also note that when you reboot you should run:"
+		elog "    /etc/init.d/${product} start"
+		elog "before trying to run ${product}.  Or you could just add it to"
+		elog "the default runlevel:"
+		elog "    rc-update add ${product} default"
+		echo
+		ewarn "VMWare allows for the potential of overwriting files as root.  Only"
+		ewarn "give VMWare access to trusted individuals."
+		echo
+	fi
+	ewarn "Remember, in order to run VMware ${FULL_NAME}, you have to"
+	ewarn "be in the '${VMWARE_GROUP}' group."
+	echo
+}
+
+vmware-2_pkg_postrm() {
+	[ -z "${product}" ] && vmware-2_determine_product
+	local product_extras
+	if [ "${product}" == "vmware" ]
+	then
+		product_extras=" and /etc/init.d/${product}"
+	fi
+	if ! has_version app-emulation/${PN}; then
+		echo
+		elog "To remove all traces of ${product} you will need to remove the files"
+		elog "in ${config_dir}${product_extras}."
+		elog "If the vmware-modules package is installed, you may no longer need it."
+		echo
+	fi
+}
--- a/eclass/vmware-mod-2.eclass
+++ b/eclass/vmware-mod-2.eclass
@ -0,0 +1,167 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# By default this eclasses wants eapi 2 which might be redefinable to newer
+# versions.
+case ${EAPI:-0} in
+	2) : ;;
+	*) die "No way! EAPI other than 2 is not supported for now." ;;
+esac
+
+inherit eutils linux-mod versionator
+
+DESCRIPTION="Modules for Vmware Programs"
+LICENSE="GPL-2"
+
+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 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
+		# !!! dont put them into its own package !!!
+		# this check is a candidad for removal when the last old package is removed
+		if [[ "$(get_major_version)" -ge "208" ]]; then
+			VM_SRC_URI="http://ftp.mars.arge.at/vmware/${P}.tar.bz2"
+		else
+			LICENSE="vmware"
+		fi
+		HOMEPAGE="http://www.vmware.com/"
+		;;
+	open-vm-modules)
+		# the split into SRC and S is required for compile
+		# the sources of the modules are spread across the package
+		VM_SRC_URI="mirror://sourceforge/open-vm-tools/open-vm-tools-${PV/_p/-}.tar.gz"
+		HOMEPAGE="http://open-vm-tools.sourceforge.net/"
+		SRC="${WORKDIR}"/open-vm-tools-${PV/_p/-}
+		S="${SRC}/modules/linux"
+		;;
+	*)
+		eerror "unknown modules package"
+	;;
+esac
+
+# check if we need a pachset
+if [[ -n  ${GENPATCHES_VER} ]]; then
+	GEN_SRC_URI="http://ftp.mars.arge.at/vmware/${P}-genpatches-${GENPATCHES_VER}.tar.bz2"
+else
+	GEN_SRC_URI=""
+fi
+
+SRC_URI="${VM_SRC_URI} ${GEN_SRC_URI}"
+SLOT="0"
+
+EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_compile src_install
+
+VMWARE_GROUP="vmware"
+
+vmware-mod-2_pkg_setup() {
+	linux-mod_pkg_setup
+	# standard build target
+	BUILD_TARGETS="auto-build HEADER_DIR=${KERNEL_DIR}/include BUILD_DIR=${KV_OUT_DIR}"
+
+	case ${PN} in
+		vmware-modules)
+			if [[ -n "${VM_MODULE_LIST}" ]]; then
+				for mod in ${VM_MODULE_LIST}; do
+					MODULE_NAMES="${MODULE_NAMES} ${mod}(vmware:${S}/${mod}-only)"
+				done
+			else
+				eerror "Buggy package plz specify VM_MODULE_LIST"
+			fi
+			;;
+		open-vm-modules)
+			# extend the build target for open-vm-modules
+			BUILD_TARGETS="${BUILD_TARGETS} OVT_SOURCE_DIR=${SRC}"
+			if [[ -n "${VM_MODULE_LIST}" ]]; then
+				for mod in ${VM_MODULE_LIST}; do
+					# modules should go into right directory
+					# this should some day be extended for the fs modules vmblock & vmhgfs and pvscsi
+					if [ "${mod}" == "vmxnet" -o "${mod}" == "vmxnet3" ];
+					then
+						MODTARGET="net"
+					else
+						MODTARGET="openvmtools"
+					fi
+					MODULE_NAMES="${MODULE_NAMES} ${mod}(${MODTARGET}:${S}/${mod})"
+				done
+			else
+				eerror "Buggy package plz specify VM_MODULE_LIST"
+			fi
+			;;
+		*)
+			eerror "unknown modules package"
+		;;
+	esac
+}
+
+vmware-mod-2_src_unpack() {
+	case ${PN} in
+		vmware-modules)
+			unpack ${A}
+			cd "${S}"
+			for mod in ${VM_MODULE_LIST}; do
+				unpack ./${mod}.tar
+			done
+			;;
+		open-vm-modules)
+			unpack ${A}
+			;;
+		*)
+			eerror "unknown modules package"
+		;;
+	esac
+
+}
+
+vmware-mod-2_src_prepare() {
+	case ${PN} in
+		vmware-modules)
+			for mod in ${VM_MODULE_LIST}; do
+				convert_to_m "${S}"/${mod}-only/Makefile
+			done
+			;;
+		open-vm-modules)
+			for mod in ${VM_MODULE_LIST}; do
+				convert_to_m "${S}"/${mod}/Makefile
+			done
+			;;
+		*)
+			eerror "unknown modules package"
+		;;
+	esac
+
+	if [[ -e "${WORKDIR}/patches" ]]; then
+		cd "${S}"
+		EPATCH_FORCE="yes"
+		EPATCH_SUFFIX="patch"
+		epatch "${WORKDIR}"/patches
+	fi
+}
+
+vmware-mod-2_src_compile() {
+	linux-mod_src_compile
+}
+
+
+vmware-mod-2_src_install() {
+	case ${PN} in
+		vmware-modules)
+			dodir /etc/udev/rules.d
+				for mod in ${VM_MODULE_LIST}; do
+					echo 'KERNEL=="'$mod'*", GROUP="'$VMWARE_GROUP'" MODE=660' >> "${D}/etc/udev/rules.d/60-vmware.rules" || die
+				done
+			;;
+		open-vm-modules)
+			einfo "no udev rules required"
+			;;
+		*)
+			eerror "unknown modules package"
+		;;
+	esac
+
+	linux-mod_src_install
+}