Version bump to 5.5.6.80404 for bug #213548.

(Portage version: 2.1.4.4)

8 files changed, 221 insertions, 1 deletions

diff --git a/app-emulation/vmware-workstation/ChangeLog b/app-emulation/vmware-workstation/ChangeLog
index f4d873bc74f0..b8a11246dd0b 100644
--- a/app-emulation/vmware-workstation/ChangeLog
+++ b/app-emulation/vmware-workstation/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for app-emulation/vmware-workstation
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.173 2008/03/22 09:39:38 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.174 2008/04/04 01:44:06 wolf31o2 Exp $
+
+*vmware-workstation-5.5.6.80404 (04 Apr 2008)
+
+  04 Apr 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/5.5.6.80404/000_all_initd-location.patch,
+  +files/5.5.6.80404/001_all_fix-permissions.patch,
+  +files/5.5.6.80404/002_all_pagebreak-detection-fix.patch,
+  +files/5.5.6.80404/004_all_do-not-build-modules.patch,
+  +files/5.5.6.80404/007_all_use-modprobe-over-insmod.patch,
+  +files/5.5.6.80404/009_all_init.d-modules-warning.patch,
+  +vmware-workstation-5.5.6.80404.ebuild:
+  Version bump to 5.5.6.80404 for bug #213548.
 
 *vmware-workstation-6.0.3.80004 (22 Mar 2008)
 
diff --git a/app-emulation/vmware-workstation/files/5.5.6.80404/000_all_initd-location.patch b/app-emulation/vmware-workstation/files/5.5.6.80404/000_all_initd-location.patch
new file mode 100644
index 000000000000..1d864f7e0dd7
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/5.5.6.80404/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";
+   }
+ 
diff --git a/app-emulation/vmware-workstation/files/5.5.6.80404/001_all_fix-permissions.patch b/app-emulation/vmware-workstation/files/5.5.6.80404/001_all_fix-permissions.patch
new file mode 100644
index 000000000000..e646b7b2da5c
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/5.5.6.80404/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';
diff --git a/app-emulation/vmware-workstation/files/5.5.6.80404/002_all_pagebreak-detection-fix.patch b/app-emulation/vmware-workstation/files/5.5.6.80404/002_all_pagebreak-detection-fix.patch
new file mode 100644
index 000000000000..fd3fc76ca679
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/5.5.6.80404/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-workstation/files/5.5.6.80404/004_all_do-not-build-modules.patch b/app-emulation/vmware-workstation/files/5.5.6.80404/004_all_do-not-build-modules.patch
new file mode 100644
index 000000000000..cec3b3ee4c1d
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/5.5.6.80404/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
diff --git a/app-emulation/vmware-workstation/files/5.5.6.80404/007_all_use-modprobe-over-insmod.patch b/app-emulation/vmware-workstation/files/5.5.6.80404/007_all_use-modprobe-over-insmod.patch
new file mode 100644
index 000000000000..c29a87e8f226
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/5.5.6.80404/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 -f "$1" || exit 1
+    exit 0
+ }
+ 
diff --git a/app-emulation/vmware-workstation/files/5.5.6.80404/009_all_init.d-modules-warning.patch b/app-emulation/vmware-workstation/files/5.5.6.80404/009_all_init.d-modules-warning.patch
new file mode 100644
index 000000000000..4eab043af8dc
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/5.5.6.80404/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
diff --git a/app-emulation/vmware-workstation/vmware-workstation-5.5.6.80404.ebuild b/app-emulation/vmware-workstation/vmware-workstation-5.5.6.80404.ebuild
new file mode 100644
index 000000000000..79621457fbf9
--- /dev/null
+++ b/app-emulation/vmware-workstation/vmware-workstation-5.5.6.80404.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2008 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.1 2008/04/04 01:44:06 wolf31o2 Exp $
+
+inherit vmware eutils versionator
+
+MY_P="VMware-workstation-$(replace_version_separator 3 - $PV)"
+
+DESCRIPTION="Emulate 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="mirror://vmware/software/wkst/${MY_P}.tar.gz
+	http://download.softpedia.ro/linux/${MY_P}.tar.gz
+	http://platan.vc.cvut.cz/ftp/pub/vmware/${ANY_ANY}.tar.gz
+	http://platan.vc.cvut.cz/ftp/pub/vmware/obsolete/${ANY_ANY}.tar.gz
+	http://ftp.cvut.cz/vmware/${ANY_ANY}.tar.gz
+	http://ftp.cvut.cz/vmware/obsolete/${ANY_ANY}.tar.gz
+	http://knihovny.cvut.cz/ftp/pub/vmware/${ANY_ANY}.tar.gz
+	http://knihovny.cvut.cz/ftp/pub/vmware/obsolete/${ANY_ANY}.tar.gz"
+
+LICENSE="vmware"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+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? (
+		app-emulation/emul-linux-x86-gtklibs )
+	x86? (
+		x11-libs/libXrandr
+		x11-libs/libXcursor
+		x11-libs/libXinerama
+		x11-libs/libXi
+		virtual/xft )
+	!app-emulation/vmware-player
+	!app-emulation/vmware-server
+	~app-emulation/vmware-modules-1.0.0.15
+	!<app-emulation/vmware-modules-1.0.0.15
+	!>=app-emulation/vmware-modules-1.0.0.16
+	>=dev-lang/perl-5
+	sys-apps/pciutils"
+
+S=${WORKDIR}/vmware-distrib
+
+RUN_UPDATE="no"
+
+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_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_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."
+}