version bump. bug 290702

(Portage version: 2.2_rc46/cvs/Linux x86_64)

12 files changed, 205 insertions, 224 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/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