Bump vmware-server and add in version 2.

Package-Manager: portage-2.2_rc33/cvs/Linux i686

13 files changed, 451 insertions, 6 deletions

diff --git a/app-emulation/vmware-server/ChangeLog b/app-emulation/vmware-server/ChangeLog
index 8bdbd3b907f3..32ff7adba925 100644
--- a/app-emulation/vmware-server/ChangeLog
+++ b/app-emulation/vmware-server/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for app-emulation/vmware-server
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server/ChangeLog,v 1.51 2009/02/22 23:20:19 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server/ChangeLog,v 1.52 2009/05/09 21:55:16 ikelos Exp $
+
+*vmware-server-2.0.1.156745 (09 May 2009)
+*vmware-server-1.0.9.156507 (09 May 2009)
+
+  09 May 2009; Mike Auty <ikelos@gentoo.org> +files/vmware-server-2.rc,
+  +files/2.0.1.156745/000_all_initd-location.patch,
+  +files/2.0.1.156745/001_all_fix-permissions.patch,
+  +files/2.0.1.156745/002_all_pagebreak-detection-fix.patch,
+  +files/2.0.1.156745/004_all_do-not-build-modules.patch,
+  +files/2.0.1.156745/007_all_use-modprobe-over-insmod.patch,
+  +vmware-server-2.0.1.156745.ebuild,
+  +files/2.0.1.156745/009_all_init.d-modules-warning.patch,
+  +files/2.0.1.156745/011_all_legit-modules-only.patch,
+  +vmware-server-1.0.9.156507.ebuild, +files/authorization.xml:
+  Bump vmware-server and add in version 2.
 
   22 Feb 2009; Mike Auty <ikelos@gentoo.org>
   -vmware-server-1.0.5.80187.ebuild, -vmware-server-1.0.6.91891.ebuild,
diff --git a/app-emulation/vmware-server/Manifest b/app-emulation/vmware-server/Manifest
index 5e64c3354042..24dd373cca89 100644
--- a/app-emulation/vmware-server/Manifest
+++ b/app-emulation/vmware-server/Manifest
@@ -1,7 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 2.0.1.156745/000_all_initd-location.patch 1259 RMD160 edced247443fc535e5a6b98404153e970721e5aa SHA1 9a36424152bc38aba53c66cea983a41f0b23baff SHA256 5e163e7232a260ea6bff570180756807f9587ab5cf836c9c293d7162d788c062
+AUX 2.0.1.156745/001_all_fix-permissions.patch 702 RMD160 9d77ba6ff6cba0b9ee529777870470028c687f22 SHA1 863278b6cfadca04ae539bc858731658074ed01e SHA256 8f5fac381a2eda0f1da8a521fcb0ef17b139bf5b8b926425946534e802ce8307
+AUX 2.0.1.156745/002_all_pagebreak-detection-fix.patch 800 RMD160 f21a51e552d025a5120519d6dcd41efc3835a432 SHA1 06133c332b6b1f57476b1154de108a9dfc35435d SHA256 d327d7cb2166b9ef4c8c286568c3a7eb64542212164d58b8a7a3c5e51e19ed6d
+AUX 2.0.1.156745/004_all_do-not-build-modules.patch 553 RMD160 6dd19e4a7626f97354f4cb1725aeba306d72e113 SHA1 7b949213c10681026eb22fe6a6e96af482931e2c SHA256 39884f9af3d85883b06beb6678ad12e5fed32bded8a039b49c680336011425ec
+AUX 2.0.1.156745/007_all_use-modprobe-over-insmod.patch 343 RMD160 ef4007c98c8342e00fe8e04c76f08f0901a6539a SHA1 62d4a5ee744c36fa59b44e4382338760e67e88e1 SHA256 68cb51ad4ea3a24faa1101c3a72cd17f61fcdb901af5fa93a9eeaad5b6c9383d
+AUX 2.0.1.156745/009_all_init.d-modules-warning.patch 965 RMD160 3a98d59bb591aa6498a7dca9751f441b430c6288 SHA1 5b6b1c1330d1108bb769107c73fdc43c1fe46be5 SHA256 dbeb12905d75f06be519cc99e6e0c070b6e08e34cdb813c518b09a04b55876fb
+AUX 2.0.1.156745/011_all_legit-modules-only.patch 535 RMD160 de7fa6a29bf9f7e6670de53fd2dfdc842ec7a097 SHA1 9bd34078eeb012cec94eaac4ab9d899ad4244ca1 SHA256 ed15e9e237bf69dc5ef7803db53011d06b84525d5df6754afa54290d1677f794
 AUX 90vmware-server 91 RMD160 2a9e2e9d428a06ceac7faec500e6b1423da34b25 SHA1 e090847500dd99d161a46cd361ed2297b3d3ecae SHA256 3175cd9665850cf0d25a96849135c93ab129127370d55572f0137ba3d210e423
+AUX authorization.xml 332 RMD160 f31f4300342a9290634e20187351910d72e7c28d SHA1 28e2b07ed7225c83bef3172d23d4702fe92a3f75 SHA256 a6ce67bb812ca67d26e518da4903cf27338865c0f06beb58d4a8ece6021e1630
 AUX general/001_all_no-desktop-icon.patch 1131 RMD160 3ab69d825994cc3bb177143d27091fc292cec46a SHA1 14264460c8500f1ead267059e2b9b9a5dc8c057f SHA256 b4055370b0092e71a2b2b0f27edeb7bc063ad265f95ab4530e52c3ab3167ad62
 AUX general/002_all_allow-write-access-to-config.patch 647 RMD160 0f25f7dd60dfcb5a72b1f7b9cf344d6f431143a9 SHA1 cabd3dd071ef62d4c70f52d1a3e02334ec7f3a73 SHA256 41492cde60da6d449c0f427ac7bd65598838ec17ac0e3a5f545feeb1d29ea391
 AUX general/004_all_do-not-build-modules.patch 589 RMD160 b2153579c65a232de9c2e6dbd9bbe108d85f95e5 SHA1 394a67a30f1f29084836183303641915ce982bfd SHA256 916754b0616ea330490b9572be1a9216bb7dd441ba328b1e01e777b29fac4e1e
@@ -11,17 +19,23 @@ AUX general/007_all_use-modprobe-over-insmod.patch 445 RMD160 186ab443a733276a70
 AUX general/008_all_dhcpd-conf-location.patch 382 RMD160 6b0c1a3571fb0d7bc537930d9a77fb4d960aa104 SHA1 344da932ea8652d85028d4f17a3a66afd90c01b7 SHA256 577454af27bc9107220055f9d8b93b40e31650c205d31d5a351c5a1ecc16d658
 AUX general/009_all_init.d-modules-warning.patch 991 RMD160 6205e976db47cd3361b5eca8593414d411a2ab8d SHA1 3742749baa606a57d447931f0af791696a49e660 SHA256 5fbc9f101abb3816a732f64a75e90ce7fcb6783c3cd7bae521d8785e88634498
 AUX vmware-authd 211 RMD160 1bd60030f6f7bb78c0fd3b6d156498121d4be5d4 SHA1 514538222dc4e665e1d450e1bf9bf1d8e03a2b61 SHA256 3eafe9ac10aeac852faa1fbbccb5c525560e358f69964995c5cfb86c53af6b54
+AUX vmware-server-2.rc 1563 RMD160 8b3affded1b0d2f63c443f236ff1f113bc8c167f SHA1 19110aa398760c17efac9c50636b8c603518f46d SHA256 b81b4df190b21184b1d9200c69f8eb536e0adb3fe5d0fd3442150490ca70a1f3
 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.8-126538.tar.gz 107047809 RMD160 9a1bb74accd2b3e8a84933f9676eb2cd2b1783c9 SHA1 5745503d49b8eef5a93530cbf38fc0a908ef5409 SHA256 03fb55d0088fb0867bb4697ace7535d6038bab52b948e874180a122893656d0c
+DIST VMware-server-1.0.9-156507.tar.gz 107164305 RMD160 1ba44b50b1f516eb8f253e475d6b2c7b5eeb8ade SHA1 ba6e7a7b69e312e177d54c8272de25574e3d5ddb SHA256 e1c049328141f6ea77d31b38fa920d2adff5756a063fb38964faefe928cbd94c
+DIST VMware-server-2.0.1-156745.i386.tar.gz 489222157 RMD160 5c2cbb13c8ce39d905c5f8071c26df274963e87e SHA1 2cdffb408fad4cd29551eb353ef1875b650f1110 SHA256 5532393b04e9196212234e65010da5e22357f129cc0ab135d25c564ae21d8222
+DIST VMware-server-2.0.1-156745.x86_64.tar.gz 457559901 RMD160 71ce6f19285c5869947fc0673184ae93dd5c0266 SHA1 1a9f383b02ca2b261be5f2a8757b462e57eee77e SHA256 b3792ce14eb9439f06d0e0836ff2018d48779ef0ad5282a141d7f18f2aebd6f8
 DIST vmware-server-perl-fixed-rpath-libs.tar.bz2 73834 RMD160 7f64627b5b945e8d7dabe39c165a4b66b71fb4d3 SHA1 9d696750ca3ec92b31ca8112fd80dcd832494044 SHA256 c42299dd033187c67b45b739da66583fbd94cdcba745200b89a25ac96cd9364b
 EBUILD vmware-server-1.0.8.126538.ebuild 2998 RMD160 f44db390c4e54dccf78f77d59b3aa430bc412ef9 SHA1 db86c3ab21c6cf2dbf603383a7fe98f6998f8789 SHA256 b92b97bea08c999656cf5c39a0838d2f6903b4ef36308406bd153144e1af3b25
-MISC ChangeLog 9053 RMD160 df8a44f6f498d172fc31920df886b9a61305d120 SHA1 1fe7f1e55d21c1ae9992be03c4a7ff54b57d2338 SHA256 b387bd6ec9f0a68e8f3c1f01bdef76adf38c835970142a370dc30fb61f922904
+EBUILD vmware-server-1.0.9.156507.ebuild 3000 RMD160 fdc85d1654f1de07ab0c8b9eb7701a8dbd1d4a6e SHA1 ae46834bfc88886c5ea5a7675512a8ffe08e6c4c SHA256 f5f55f2fa35b2e1455db958df173a4ea2540f2a92ec05372eeafa4a514e88023
+EBUILD vmware-server-2.0.1.156745.ebuild 2640 RMD160 e5b29cb458a8190c9400469d2c18bc230aab7d1f SHA1 51b1a2cc6eba817210d7e537fe9d409573bba3db SHA256 67fe82aa98977becf34f45502f4a6dd3d9e99dee3d0661ea06cf38fc0271c97a
+MISC ChangeLog 9758 RMD160 ed905cc1eb9f391432665bb41f5f890948467e07 SHA1 56cc3ce133db30d4e6bb06e7ba755a027b8e43fb SHA256 3cfe4ab36b4ebe98375e43f10b0322ee83f704dd3366a6cccd6132c99c640861
 MISC metadata.xml 159 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 SHA1 f46b02a39bcd0165558de67ff4256cfc812418a3 SHA256 8581ae1c90a48f50fa0542c7fb28cb8984baaf12f50fa18f33e467081effb215
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkmh3cAACgkQu7rWomwgFXrFQACeOSKLRmSxhdlSc8EMyVpjpKrE
-BjcAn2btCrlicdDHd89pbULNR6pv1XQw
-=zFWi
+iEYEARECAAYFAkoF+9cACgkQu7rWomwgFXojbACgiBCLELzeUAKh2LV/OL8VgRhV
+UxgAoLYvP60csjDJwuX1ashKoYyGUOc2
+=nClh
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/vmware-server/files/2.0.1.156745/000_all_initd-location.patch b/app-emulation/vmware-server/files/2.0.1.156745/000_all_initd-location.patch
new file mode 100644
index 000000000000..77146c3b163d
--- /dev/null
+++ b/app-emulation/vmware-server/files/2.0.1.156745/000_all_initd-location.patch
@@ -0,0 +1,32 @@
+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	2007-12-02 11:40:41.000000000 +0000
++++ vmware-server-distrib/bin/vmware-config.pl	2007-12-02 11:43:29.000000000 +0000
+@@ -10162,7 +10162,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");
+          }
+@@ -10212,8 +10212,8 @@
+  
+   if (isDesktopProduct()) {
+     build_vmblock();
+-    createMimePackageFile();
+-    configureDesktopFiles();
++    # createMimePackageFile();
++    # configureDesktopFiles();
+     if (vmware_binary() ne "vmplayer") {
+       configure_eclipse_plugin();
+     }
+@@ -10283,7 +10283,7 @@
+   db_save();
+   # Then start VMware's services
+   if (!$gOption{'skip-stop-start'}) {
+-    system(shell_string(db_get_answer('INITSCRIPTSDIR') . '/vmware') . ' start');
++    system(shell_string('/etc/init.d' . '/vmware') . ' start');
+     print "\n";
+   }
+ 
diff --git a/app-emulation/vmware-server/files/2.0.1.156745/001_all_fix-permissions.patch b/app-emulation/vmware-server/files/2.0.1.156745/001_all_fix-permissions.patch
new file mode 100644
index 000000000000..605e358d51d1
--- /dev/null
+++ b/app-emulation/vmware-server/files/2.0.1.156745/001_all_fix-permissions.patch
@@ -0,0 +1,15 @@
+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	2007-12-02 11:16:42.000000000 +0000
++++ vmware-server-distrib/bin/vmware-config.pl	2007-12-02 11:25:36.000000000 +0000
+@@ -9097,7 +9097,10 @@
+     error('Unable to write configuration file "' . $name . '".' . "\n\n");
+   }
+   db_add_file($name, $cFlagTimestamp | $cFlagConfig);
+-  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';
diff --git a/app-emulation/vmware-server/files/2.0.1.156745/002_all_pagebreak-detection-fix.patch b/app-emulation/vmware-server/files/2.0.1.156745/002_all_pagebreak-detection-fix.patch
new file mode 100644
index 000000000000..fd3fc76ca679
--- /dev/null
+++ b/app-emulation/vmware-server/files/2.0.1.156745/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') {
diff --git a/app-emulation/vmware-server/files/2.0.1.156745/004_all_do-not-build-modules.patch b/app-emulation/vmware-server/files/2.0.1.156745/004_all_do-not-build-modules.patch
new file mode 100644
index 000000000000..35fe16bb280c
--- /dev/null
+++ b/app-emulation/vmware-server/files/2.0.1.156745/004_all_do-not-build-modules.patch
@@ -0,0 +1,26 @@
+diff --git a/bin/vmware-config.pl b/bin/vmware-config.pl
+index 363f9cb..7ffc212 100755
+--- a/bin/vmware-config.pl
++++ b/bin/vmware-config.pl
+@@ -10404,16 +10404,16 @@ sub main {
+   }
+ 
+   if (vmware_product() ne 'server') {
+-    configure_mon();
+-    configure_vmci();
+-    configure_vsock();
+-    configure_pp();
++    #configure_mon();
++    #configure_vmci();
++    #configure_vsock();
++    #configure_pp();
+ 
+     if (vmware_product() eq 'wgs') {
+ 	configure_net();
+     }
+ 
+-    build_vmnet();
++    #build_vmnet();
+   }
+ 
+   if (isDesktopProduct()) {
diff --git a/app-emulation/vmware-server/files/2.0.1.156745/007_all_use-modprobe-over-insmod.patch b/app-emulation/vmware-server/files/2.0.1.156745/007_all_use-modprobe-over-insmod.patch
new file mode 100644
index 000000000000..42fc20afeb1c
--- /dev/null
+++ b/app-emulation/vmware-server/files/2.0.1.156745/007_all_use-modprobe-over-insmod.patch
@@ -0,0 +1,13 @@
+diff --git a/installer/services.sh b/installer/services.sh
+index 402ad79..2fb53ab 100755
+--- a/installer/services.sh
++++ b/installer/services.sh
+@@ -755,7 +755,7 @@ vmware_run_vimsh_cmd() {
+ }
+ 
+ vmware_load_module() {
+-   /sbin/insmod -s -f "/lib/modules/`uname -r`/misc/$1.o" || exit 1
++   /sbin/modprobe -s "$1" || exit 1
+    return 0
+ }
+ 
diff --git a/app-emulation/vmware-server/files/2.0.1.156745/009_all_init.d-modules-warning.patch b/app-emulation/vmware-server/files/2.0.1.156745/009_all_init.d-modules-warning.patch
new file mode 100644
index 000000000000..dc57efbfe162
--- /dev/null
+++ b/app-emulation/vmware-server/files/2.0.1.156745/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	2007-12-02 12:08:09.000000000 +0000
++++ vmware-server-distrib/installer/services.sh	2007-12-02 12:12:08.000000000 +0000
+@@ -823,8 +823,13 @@
+ check_configured() {
+    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
diff --git a/app-emulation/vmware-server/files/2.0.1.156745/011_all_legit-modules-only.patch b/app-emulation/vmware-server/files/2.0.1.156745/011_all_legit-modules-only.patch
new file mode 100644
index 000000000000..cbfa05b97fcc
--- /dev/null
+++ b/app-emulation/vmware-server/files/2.0.1.156745/011_all_legit-modules-only.patch
@@ -0,0 +1,13 @@
+diff --git a/bin/vmware-config.pl b/bin/vmware-config.pl
+index bb9d04f..458a14b 100755
+--- a/bin/vmware-config.pl
++++ b/bin/vmware-config.pl
+@@ -10315,7 +10315,7 @@ sub main {
+ 
+    if ($gOption{'tools-switch'} == 0) {
+       my @modules = non_vmware_modules_installed();
+-      if (scalar(@modules) > 0) {
++      if (scalar(@modules) < 0) {
+          my $osVersion = direct_command(shell_string($gHelper{'uname'}) . ' -r');
+          chomp($osVersion);
+          error("The following VMware kernel modules have been found on your " .
diff --git a/app-emulation/vmware-server/files/authorization.xml b/app-emulation/vmware-server/files/authorization.xml
new file mode 100644
index 000000000000..c335f5928d05
--- /dev/null
+++ 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>
diff --git a/app-emulation/vmware-server/files/vmware-server-2.rc b/app-emulation/vmware-server/files/vmware-server-2.rc
new file mode 100755
index 000000000000..ad8b70b49c41
--- /dev/null
+++ 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-2.rc,v 1.1 2009/05/09 21:55:17 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 $?
+}
diff --git a/app-emulation/vmware-server/vmware-server-1.0.9.156507.ebuild b/app-emulation/vmware-server/vmware-server-1.0.9.156507.ebuild
new file mode 100644
index 000000000000..3e95fe942a4e
--- /dev/null
+++ b/app-emulation/vmware-server/vmware-server-1.0.9.156507.ebuild
@@ -0,0 +1,101 @@
+# 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/vmware-server-1.0.9.156507.ebuild,v 1.1 2009/05/09 21:55:16 ikelos Exp $
+
+# Unlike many other binary packages the user doesn't need to agree to a licence
+# to download VMWare. The agreeing to a licence is part of the configure step
+# which the user must run manually.
+
+inherit eutils versionator vmware
+
+MY_PV=$(replace_version_separator 3 '-' )
+MY_P="VMware-server-${MY_PV}"
+
+DESCRIPTION="VMware Server for Linux"
+HOMEPAGE="http://www.vmware.com/"
+SRC_URI="mirror://vmware/software/vmserver/${MY_P}.tar.gz
+	http://dev.gentoo.org/~ikelos/devoverlay-distfiles/${PN}-perl-fixed-rpath-libs.tar.bz2
+	mirror://gentoo/${PN}-perl-fixed-rpath-libs.tar.bz2"
+
+LICENSE="vmware"
+IUSE=""
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="strip"
+
+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 )
+	!amd64? (
+		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-1.0.0.15
+	!<app-emulation/vmware-modules-1.0.0.15
+	!>=app-emulation/vmware-modules-1.0.0.16
+	sys-apps/pciutils
+	virtual/pam
+	sys-apps/xinetd"
+
+S=${WORKDIR}/vmware-server-distrib
+
+RUN_UPDATE="no"
+ANY_ANY=""
+PATCHES="general"
+
+src_unpack() {
+	EPATCH_SUFFIX="patch"
+	vmware_src_unpack
+	#cd "${WORKDIR}"
+	#unpack ${PN}-perl-fixed-rpath-libs.tar.bz2
+
+	# 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_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_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"
+}
diff --git a/app-emulation/vmware-server/vmware-server-2.0.1.156745.ebuild b/app-emulation/vmware-server/vmware-server-2.0.1.156745.ebuild
new file mode 100644
index 000000000000..43279c8621bd
--- /dev/null
+++ b/app-emulation/vmware-server/vmware-server-2.0.1.156745.ebuild
@@ -0,0 +1,102 @@
+# 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/vmware-server-2.0.1.156745.ebuild,v 1.1 2009/05/09 21:55:16 ikelos Exp $
+
+# Unlike many other binary packages the user doesn't need to agree to a licence
+# to download VMWare. The agreeing to a licence is part of the configure step
+# which the user must run manually.
+
+inherit eutils versionator vmware
+
+MY_PV=$(replace_version_separator 3 '-' )
+# MY_PV="e.x.p-$(get_version_component_range 4)"
+MY_PN="VMware-server-${MY_PV}"
+
+DESCRIPTION="VMware Server for Linux"
+HOMEPAGE="http://www.vmware.com/"
+SRC_URI="
+	x86? (
+		mirror://vmware/software/vmserver/${MY_PN}.i386.tar.gz
+		http://download.softpedia.ro/linux/${MY_PN}.i386.tar.gz )
+	amd64? (
+		mirror://vmware/software/vmserver/${MY_PN}.x86_64.tar.gz
+		http://download.softpedia.ro/linux/${MY_PN}.x86_64.tar.gz )
+	"
+
+LICENSE="vmware"
+IUSE=""
+SLOT="0"
+KEYWORDS="-* ~x86 ~amd64"
+RESTRICT="strip"
+
+CDEPEND=">=sys-libs/glibc-2.3.5
+	>=dev-lang/perl-5
+	sys-apps/pciutils"
+DEPEND="${CDEPEND}
+	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="${CDEPEND}
+	dev-libs/libxml2
+	dev-libs/glib
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXft
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXt
+	x11-libs/libXtst
+	x11-misc/xdg-utils
+	sys-fs/fuse
+	sys-apps/hal
+	sys-libs/zlib
+	virtual/pam
+	!<sys-apps/dbus-0.62
+	!app-emulation/vmware-player
+	!app-emulation/vmware-workstation
+	~app-emulation/vmware-modules-1.0.0.23
+	!<app-emulation/vmware-modules-1.0.0.23
+	!>=app-emulation/vmware-modules-1.0.0.24
+	"
+
+S=${WORKDIR}/vmware-server-distrib
+
+ANY_ANY=""
+RUN_UPDATE="no"
+
+pkg_setup() {
+	if use x86; then
+		MY_P="${MY_PN}.i386"
+	elif use amd64; then
+		MY_P="${MY_PN}.x86_64"
+	fi
+
+	vmware_pkg_setup
+}
+
+src_install() {
+	vmware_src_install
+
+	newinitd "${FILESDIR}/vmware-server-2.rc" vmware
+	insinto /etc/vmware/hostd
+	doins "${FILESDIR}/authorization.xml"
+}
+
+pkg_config() {
+	einfo "Running ${ROOT}${dir}/bin/vmware-config.pl"
+	"${ROOT}${dir}/bin/vmware-config.pl"
+}
+
+pkg_postinst() {
+	vmware_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"
+}