version bump. bug 290702

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

13 files changed, 217 insertions, 228 deletions

diff --git a/app-emulation/vmware-server/ChangeLog b/app-emulation/vmware-server/ChangeLog
index 3bdf96b6e77b..6a457c5f44ec 100644
--- a/app-emulation/vmware-server/ChangeLog
+++ b/app-emulation/vmware-server/ChangeLog
@@ -1,6 +1,22 @@
 # 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.59 2009/09/22 17:58:50 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server/ChangeLog,v 1.60 2009/10/29 13:24:13 vadimk Exp $
+
+*vmware-server-2.0.2.203138 (29 Oct 2009)
+
+  29 Oct 2009; Vadim Kuznetsov vadimk@gentoo.org
+  +files/2.0.2.203138/000_all_initd-location.patch,
+  +files/2.0.2.203138/001_all_fix-permissions.patch,
+  +files/2.0.2.203138/002_all_pagebreak-detection-fix.patch,
+  +files/2.0.2.203138/004_all_do-not-build-modules.patch,
+  +files/2.0.2.203138/007_all_use-modprobe-over-insmod.patch,
+  +files/2.0.2.203138/009_all_init.d-modules-warning.patch,
+  +files/2.0.2.203138/011_all_legit-modules-only.patch,
+  -vmware-server-2.0.1.156745.ebuild, -vmware-server-2.0.1.156745-r1.ebuild,
+  +vmware-server-2.0.2.203138.ebuild,
+  +files/2.0.2.203138/012_all_rc-config.patch,
+  -vmware-server-2.0.1.156745-r2.ebuild:
+  version bump. Bug 290702
 
 *vmware-server-2.0.1.156745-r3 (22 Sep 2009)
 
diff --git a/app-emulation/vmware-server/Manifest b/app-emulation/vmware-server/Manifest
index d6bde211428a..1c1f2d1d55b6 100644
--- a/app-emulation/vmware-server/Manifest
+++ b/app-emulation/vmware-server/Manifest
@@ -6,6 +6,14 @@ AUX 2.0.1.156745/007_all_use-modprobe-over-insmod.patch 343 RMD160 ef4007c98c834
 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 2.0.1.156745/012_all_rc-config.patch 867 RMD160 b88448d21d361468c2e30863abf2dfac3b71c10e SHA1 5cd66235af794a57e5d982ffb93122999666dbc0 SHA256 a1ef415a5d036efb5846d80a1b0475d56c2bc2f608a4099bd04a1445ace22761
+AUX 2.0.2.203138/000_all_initd-location.patch 1259 RMD160 edced247443fc535e5a6b98404153e970721e5aa SHA1 9a36424152bc38aba53c66cea983a41f0b23baff SHA256 5e163e7232a260ea6bff570180756807f9587ab5cf836c9c293d7162d788c062
+AUX 2.0.2.203138/001_all_fix-permissions.patch 702 RMD160 9d77ba6ff6cba0b9ee529777870470028c687f22 SHA1 863278b6cfadca04ae539bc858731658074ed01e SHA256 8f5fac381a2eda0f1da8a521fcb0ef17b139bf5b8b926425946534e802ce8307
+AUX 2.0.2.203138/002_all_pagebreak-detection-fix.patch 800 RMD160 f21a51e552d025a5120519d6dcd41efc3835a432 SHA1 06133c332b6b1f57476b1154de108a9dfc35435d SHA256 d327d7cb2166b9ef4c8c286568c3a7eb64542212164d58b8a7a3c5e51e19ed6d
+AUX 2.0.2.203138/004_all_do-not-build-modules.patch 553 RMD160 6dd19e4a7626f97354f4cb1725aeba306d72e113 SHA1 7b949213c10681026eb22fe6a6e96af482931e2c SHA256 39884f9af3d85883b06beb6678ad12e5fed32bded8a039b49c680336011425ec
+AUX 2.0.2.203138/007_all_use-modprobe-over-insmod.patch 343 RMD160 ef4007c98c8342e00fe8e04c76f08f0901a6539a SHA1 62d4a5ee744c36fa59b44e4382338760e67e88e1 SHA256 68cb51ad4ea3a24faa1101c3a72cd17f61fcdb901af5fa93a9eeaad5b6c9383d
+AUX 2.0.2.203138/009_all_init.d-modules-warning.patch 965 RMD160 3a98d59bb591aa6498a7dca9751f441b430c6288 SHA1 5b6b1c1330d1108bb769107c73fdc43c1fe46be5 SHA256 dbeb12905d75f06be519cc99e6e0c070b6e08e34cdb813c518b09a04b55876fb
+AUX 2.0.2.203138/011_all_legit-modules-only.patch 535 RMD160 de7fa6a29bf9f7e6670de53fd2dfdc842ec7a097 SHA1 9bd34078eeb012cec94eaac4ab9d899ad4244ca1 SHA256 ed15e9e237bf69dc5ef7803db53011d06b84525d5df6754afa54290d1677f794
+AUX 2.0.2.203138/012_all_rc-config.patch 867 RMD160 b88448d21d361468c2e30863abf2dfac3b71c10e SHA1 5cd66235af794a57e5d982ffb93122999666dbc0 SHA256 a1ef415a5d036efb5846d80a1b0475d56c2bc2f608a4099bd04a1445ace22761
 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
@@ -24,12 +32,12 @@ DIST VMware-server-1.0.8-126538.tar.gz 107047809 RMD160 9a1bb74accd2b3e8a84933f9
 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-2.0.2-203138.i386.tar.gz 506047036 RMD160 3119bf56e1ef9c63dfcb969d951cd78bd9c667e1 SHA1 2917c8d4e521cb9af186be8fcaf2043b1a516a6c SHA256 b4779515e2a8ecc4d768c07f9264aeb94e45986262626a3a557466e77f371662
+DIST VMware-server-2.0.2-203138.x86_64.tar.gz 474415801 RMD160 0778f78122ee6b701543df5885ad1e8d3325fb82 SHA1 b65d3d46dc947fc7995bda354c4947afabd23474 SHA256 a1230f43f6b668a751e9ce2c9d2f6a2c75e4d4cea88f583901f67dbd67412e25
 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
 EBUILD vmware-server-1.0.9.156507.ebuild 2998 RMD160 6c64f54a06ac8ff7ffff4add799f534b2abce555 SHA1 0a310a44856f154bf2e5211563f2d070550544e5 SHA256 b6ed4e3216ca58fc6d9c82c8e3395ab0729aea1bfcffc3b4ee51c51e2f5d3b7f
-EBUILD vmware-server-2.0.1.156745-r1.ebuild 2799 RMD160 30c6d30bc70b6871b2dd53b64d6f3023976b0c35 SHA1 658434a9c02ef1d9c4662b8ccb193b048e081675 SHA256 b13140796f0a88af05a1cb24e8c5248c6e18d331cadf3dc76032565dfe14ea00
-EBUILD vmware-server-2.0.1.156745-r2.ebuild 9047 RMD160 b52cde9c709ccb3a552a586a4c0d4bdb1188e46e SHA1 af829d26ac609c232a30e07934a5b04670867df4 SHA256 1d274882b0d3afcbbddafd28016e05ff8ba3efb810851ed461f77c9924cf242e
 EBUILD vmware-server-2.0.1.156745-r3.ebuild 9220 RMD160 b84398bd555554299d68cc3d8132e68e2af56273 SHA1 ec9d06920034c90d7dd7aafacffdceebe16e174f SHA256 b820295641e63046d9f1f9981b3ab131dadb237e493e5ac68cd12bc5f5f91175
-EBUILD vmware-server-2.0.1.156745.ebuild 2796 RMD160 c26aac86392b7f94605425a4c497dda153c1d4c3 SHA1 35192867e3da224200a1fd69a2d0dac0c1288c9e SHA256 daf6974b3936487c219ba669acaa1e2a82f661696b92fc909f8e98401dc650c9
-MISC ChangeLog 10971 RMD160 3a6988ccab365711fc02b541210de8240dc3fba3 SHA1 b817550c3f543d2b762bf05fa6adff7418920b2e SHA256 93172fe030579a89a0c2df16ed477c4b2954f392e6d3788377703b27e30972f7
+EBUILD vmware-server-2.0.2.203138.ebuild 9534 RMD160 88024bb43004d6629f5b2ea873c2f46a90fdef7f SHA1 10556b7052d0e4e891219039798ba520283c5063 SHA256 b93f18d9850626c4427cff7b7b39fe82a65983f7ca52a4517fda65bc690dd950
+MISC ChangeLog 11696 RMD160 ed325e0e8e75725bc9a5665ff359c944e921f6a5 SHA1 8ca09804a66e71ad603e98744923019ed28a1b77 SHA256 1fe417b9d6bca9e919e00d85bcbc00eb7b5803a37ae48aead0ce78aab11fb84c
 MISC metadata.xml 451 RMD160 34ad07edf6d4f6d9b00b8c0ea197fa8ddad2397b SHA1 7983215b3da6bbfb2e5c167b33b0625a5a31280d SHA256 b64b12ed17797856c0f950540b92f134ca8ffafd40eabafb4ef90c889e16a3e3
diff --git a/app-emulation/vmware-server/files/2.0.2.203138/000_all_initd-location.patch b/app-emulation/vmware-server/files/2.0.2.203138/000_all_initd-location.patch
new file mode 100644
index 000000000000..77146c3b163d
--- /dev/null
+++ b/app-emulation/vmware-server/files/2.0.2.203138/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.2.203138/001_all_fix-permissions.patch b/app-emulation/vmware-server/files/2.0.2.203138/001_all_fix-permissions.patch
new file mode 100644
index 000000000000..605e358d51d1
--- /dev/null
+++ b/app-emulation/vmware-server/files/2.0.2.203138/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.2.203138/002_all_pagebreak-detection-fix.patch b/app-emulation/vmware-server/files/2.0.2.203138/002_all_pagebreak-detection-fix.patch
new file mode 100644
index 000000000000..fd3fc76ca679
--- /dev/null
+++ b/app-emulation/vmware-server/files/2.0.2.203138/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.2.203138/004_all_do-not-build-modules.patch b/app-emulation/vmware-server/files/2.0.2.203138/004_all_do-not-build-modules.patch
new file mode 100644
index 000000000000..35fe16bb280c
--- /dev/null
+++ b/app-emulation/vmware-server/files/2.0.2.203138/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.2.203138/007_all_use-modprobe-over-insmod.patch b/app-emulation/vmware-server/files/2.0.2.203138/007_all_use-modprobe-over-insmod.patch
new file mode 100644
index 000000000000..42fc20afeb1c
--- /dev/null
+++ b/app-emulation/vmware-server/files/2.0.2.203138/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.2.203138/009_all_init.d-modules-warning.patch b/app-emulation/vmware-server/files/2.0.2.203138/009_all_init.d-modules-warning.patch
new file mode 100644
index 000000000000..dc57efbfe162
--- /dev/null
+++ b/app-emulation/vmware-server/files/2.0.2.203138/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.2.203138/011_all_legit-modules-only.patch b/app-emulation/vmware-server/files/2.0.2.203138/011_all_legit-modules-only.patch
new file mode 100644
index 000000000000..cbfa05b97fcc
--- /dev/null
+++ b/app-emulation/vmware-server/files/2.0.2.203138/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/2.0.2.203138/012_all_rc-config.patch b/app-emulation/vmware-server/files/2.0.2.203138/012_all_rc-config.patch
new file mode 100644
index 000000000000..f3bc2b36c97c
--- /dev/null
+++ b/app-emulation/vmware-server/files/2.0.2.203138/012_all_rc-config.patch
@@ -0,0 +1,25 @@
+--- bin.old/vmware-config.pl	2009-07-02 17:56:08.873568674 -0400
++++ bin/vmware-config.pl	2009-07-02 17:56:59.000000000 -0400
+@@ -1341,6 +1341,14 @@
+       }
+    }
+ 
++   # Try using Genoot's rc-config
++   if ($gHelper{'rc-config'} ne '') {
++   	if(0 == system(shell_string($gHelper{'rc-config'}) . ' add '
++			. $service . ' default')) {
++		return;
++	}
++   }
++
+    # Set up vmware to start/stop at run levels 2, 3 and 5
+    link_runlevel(2, $service, $S_level, $K_level);
+    link_runlevel(3, $service, $S_level, $K_level);
+@@ -2552,6 +2560,7 @@
+   }
+   $gHelper{'insserv'} = internal_which('insserv');
+   $gHelper{'chkconfig'} = internal_which('/sbin/chkconfig');
++  $gHelper{'rc-config'} = internal_which('/usr/bin/rc-config');
+   if (vmware_product() eq 'server' &&
+       $gHelper{'chkconfig'} eq '') {
+          error('No initscript installer found.' . "\n\n");
diff --git a/app-emulation/vmware-server/vmware-server-2.0.1.156745-r1.ebuild b/app-emulation/vmware-server/vmware-server-2.0.1.156745-r1.ebuild
deleted file mode 100644
index 87639ad6e815..000000000000
--- a/app-emulation/vmware-server/vmware-server-2.0.1.156745-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# 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-r1.ebuild,v 1.1 2009/06/14 15:43:35 vadimk 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.24
-	!<app-emulation/vmware-modules-1.0.0.24
-	!>=app-emulation/vmware-modules-1.0.0.25
-	"
-
-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"
-
-	sed -i -e "s:/sbin/lsmod:/bin/lsmod:" "${D}"/etc/vmware/init.d/vmware
-	sed -i -e "s:/sbin/lsmod:/bin/lsmod:" "${D}"/opt/vmware/server/lib/net-services.sh
-}
-
-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
deleted file mode 100644
index d142e54fa675..000000000000
--- a/app-emulation/vmware-server/vmware-server-2.0.1.156745.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# 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.2 2009/06/09 15:35:04 vadimk 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"
-
-	sed -i -e "s:/sbin/lsmod:/bin/lsmod:" "${D}"/etc/vmware/init.d/vmware
-	sed -i -e "s:/sbin/lsmod:/bin/lsmod:" "${D}"/opt/vmware/server/lib/net-services.sh
-}
-
-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-r2.ebuild b/app-emulation/vmware-server/vmware-server-2.0.2.203138.ebuild
index 12c67a980189..47153a13b5f7 100644
--- a/app-emulation/vmware-server/vmware-server-2.0.1.156745-r2.ebuild
+++ b/app-emulation/vmware-server/vmware-server-2.0.2.203138.ebuild
@@ -1,6 +1,6 @@
 # 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-r2.ebuild,v 1.2 2009/07/08 20:17:28 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server/vmware-server-2.0.2.203138.ebuild,v 1.1 2009/10/29 13:24:13 vadimk 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
@@ -15,17 +15,19 @@ MY_PN="VMware-server-${MY_PV}"
 
 DESCRIPTION="VMware Server for Linux"
 HOMEPAGE="http://www.vmware.com/"
+DOWNLOAD_URL="http://downloads.vmware.com/d/info/datacenter_downloads/vmware_server/2_0"
 SRC_URI=" x86? ( mirror://vmware/software/vmserver/${MY_PN}.i386.tar.gz )
-		amd64? ( mirror://vmware/software/vmserver/${MY_PN}.x86_64.tar.gz ) "
+	  amd64? ( mirror://vmware/software/vmserver/${MY_PN}.x86_64.tar.gz ) "
 
 LICENSE="vmware"
 IUSE=""
 SLOT="0"
 KEYWORDS="-* ~x86 ~amd64"
-RESTRICT="strip"
+RESTRICT="fetch strip"
 
-CDEPEND=">=sys-libs/glibc-2.3.5
+CDEPEND="
 	>=dev-lang/perl-5
+	>=sys-libs/glibc-2.3.5
 	sys-apps/pciutils"
 DEPEND="${CDEPEND}
 	sys-apps/findutils
@@ -34,28 +36,26 @@ DEPEND="${CDEPEND}
 # vmware-server should not use virtual/libc as this is a
 # precompiled binary package thats linked to glibc.
 RDEPEND="${CDEPEND}
-	dev-libs/libxml2
+	~app-emulation/vmware-modules-1.0.0.24
 	dev-libs/glib
+	dev-libs/libxml2
+	sys-apps/hal
+	sys-fs/fuse
+	sys-libs/zlib
+	virtual/pam
 	x11-libs/libICE
 	x11-libs/libSM
-	x11-libs/libXft
 	x11-libs/libX11
 	x11-libs/libXau
 	x11-libs/libXdmcp
 	x11-libs/libXext
+	x11-libs/libXft
 	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.24
-	!<app-emulation/vmware-modules-1.0.0.24
-	!>=app-emulation/vmware-modules-1.0.0.25
 	"
 
 PDEPEND="app-emulation/vmware-vix"
@@ -70,6 +70,18 @@ pkg_setup() {
 	fi
 }
 
+pkg_nofetch() {
+	if use x86; then
+		MY_P="${MY_PN}.i386"
+	elif use amd64; then
+		MY_P="${MY_PN}.x86_64"
+	fi
+
+	einfo "Please download the ${MY_P}.bundle from"
+	einfo "${DOWNLOAD_URL}"
+	einfo "and place it in ${DISTDIR}"
+}
+
 src_prepare() {
 	VMWARE_GROUP=${VMWARE_GROUP:-vmware}
 	VMWARE_INSTALL_DIR=/opt/${PN//-//}
@@ -125,6 +137,11 @@ src_install() {
 		fi
 	done
 
+	# Bug 282213
+	mv "${D}"/"${VMWARE_INSTALL_DIR}"/lib/lib/libpng12.so.0/libpng12.so.0 \
+	   "${D}"/"${VMWARE_INSTALL_DIR}"/lib/lib/libpng12.so.0/libpng12.so.0.old
+	dosym /usr/lib/libpng12.so.0 "${VMWARE_INSTALL_DIR}"/lib/lib/libpng12.so.0/libpng12.so.0
+
 	# If we have an /etc directory, we copy it.
 	if [[ -e "${S}/etc" ]]
 	then