Adding patch by Georgi Georgiev <chutz@gg3.net> to export more paths to LD_LIBRARY_PATH when executing VMware and closing bug #59035.

(Portage version: 2.0.51.19)

5 files changed, 43 insertions, 87 deletions

diff --git a/app-emulation/vmware-workstation/ChangeLog b/app-emulation/vmware-workstation/ChangeLog
index f522c1093a54..f138820ce639 100644
--- a/app-emulation/vmware-workstation/ChangeLog
+++ b/app-emulation/vmware-workstation/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-emulation/vmware-workstation
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.81 2005/04/08 23:41:14 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.82 2005/04/09 12:29:47 wolf31o2 Exp $
+
+*vmware-workstation-4.5.2.8848-r6 (09 Apr 2005)
+
+  09 Apr 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/vmware-workstation-4.5.2.8848-librarypath.patch,
+  -files/vmware-26kern-init-gentoo.patch,
+  -vmware-workstation-4.5.2.8848-r5.ebuild,
+  +vmware-workstation-4.5.2.8848-r6.ebuild:
+  Adding patch by Georgi Georgiev <chutz@gg3.net> to export more paths to
+  LD_LIBRARY_PATH when executing VMware and closing bug #59035.
 
   08 Apr 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   vmware-workstation-4.5.2.8848-r5.ebuild:
diff --git a/app-emulation/vmware-workstation/files/digest-vmware-workstation-4.5.2.8848-r5 b/app-emulation/vmware-workstation/files/digest-vmware-workstation-4.5.2.8848-r6
index a5e0f6bb657f..a5e0f6bb657f 100644
--- a/app-emulation/vmware-workstation/files/digest-vmware-workstation-4.5.2.8848-r5
+++ b/app-emulation/vmware-workstation/files/digest-vmware-workstation-4.5.2.8848-r6
diff --git a/app-emulation/vmware-workstation/files/vmware-26kern-init-gentoo.patch b/app-emulation/vmware-workstation/files/vmware-26kern-init-gentoo.patch
deleted file mode 100644
index d9e0f8d7464d..000000000000
--- a/app-emulation/vmware-workstation/files/vmware-26kern-init-gentoo.patch
+++ /dev/null
@@ -1,85 +0,0 @@
---- installer/services.sh	2003-10-02 08:00:37.000000000 +0900
-+++ installer/services.sh	2003-12-20 01:12:19.835868864 +0900
-@@ -632,11 +632,12 @@
- 
- # Start the virtual machine parallel port kernel service
- vmware_start_vmppuser() {
--   if ! grep -q ' parport_release[^'$'\t'']*$' /proc/ksyms; then
-+   test -f /proc/ksyms && ksyms=/proc/ksyms || ksyms=/proc/kallsyms
-+   if ! grep -q ' parport_release[^'$'\t'']*$' $ksyms; then
-      # parport support is not built in the kernel
-      /sbin/modprobe parport || exit 1
-    fi
--   if ! grep -q ' parport_pc_[^'$'\t'']*$' /proc/ksyms; then
-+   if ! grep -q ' parport_pc_[^'$'\t'']*$' $ksyms; then
-      # parport_pc support is not built in the kernel
-      /sbin/modprobe parport_pc || exit 1
-    fi
---- bin/vmware-config.pl	2003-10-02 08:00:36.000000000 +0900
-+++ bin/vmware-config.pl	2003-12-20 01:11:05.144216413 +0900
-@@ -513,6 +513,7 @@
- my $cConnectSocketDir = '/var/run/vmware';
- my $machine = 'host';
- my $os = 'host';
-+my $ksyms = -f '/proc/ksyms' ? ' /proc/ksyms' : ' /proc/kallsyms';
- if (vmware_product() eq 'server') {
-   $machine = 'machine';
-   $os = "Console OS";
-@@ -2211,7 +2212,7 @@
-       $gSystem{'smp'} = (direct_command(shell_string($gHelper{'uname'})
-                                         . ' -v') =~ / SMP /) ? 'yes' : 'no';
-       $gSystem{'versioned'} = (direct_command(shell_string($gHelper{'grep'}) . ' '
--        . shell_string('^[0-9a-fA-F]\{8\} Using_Versions') . ' /proc/ksyms')
-+        . shell_string('^[0-9a-fA-F]\{8\} Using_Versions') . $ksyms)
-           eq '') ? 'no' : 'yes';
-     }
- 
-@@ -2224,7 +2225,7 @@
- 
-       @fields = split(' ', direct_command(
-         shell_string($gHelper{'grep'}) . ' '
--        . shell_string('^[0-9a-fA-F]\{8\} printk') . ' /proc/ksyms'));
-+        . shell_string('^[0-9a-fA-F]\{8\} printk') . $ksyms));
-       if (defined($fields[0])) {
-         my $first;
- 
-@@ -2248,7 +2249,7 @@
-     # Linux kernel build bug
-     $gSystem{'build_bug'} = (direct_command(shell_string($gHelper{'grep'}) . ' '
-       . shell_string('^[0-9a-fA-F]\{8\} __global_cli_R__ver___global_cli')
--      . ' /proc/ksyms') eq '') ? 'no' : 'yes';
-+      . $ksyms) eq '') ? 'no' : 'yes';
-   }
- 
-   # Warning, the return after the end of the if statement
-@@ -2287,10 +2288,10 @@
-   if ($gSystem{'version_integer'} < kernel_version_integer(2, 1, 0)) {
-     if (   (direct_command(shell_string($gHelper{'grep'}) . ' '
-                            . shell_string('^[0-9a-fA-F]\{8\} misc_register')
--                           . ' /proc/ksyms') eq '')
-+                           . $ksyms) eq '')
-         || (direct_command(shell_string($gHelper{'grep'}) . ' '
-                            . shell_string('^[0-9a-fA-F]\{8\} misc_deregister')
--                           . ' /proc/ksyms') eq '')) {
-+                           . $ksyms) eq '')) {
-       error('You are running a Linux kernel version '
-             . $gSystem{'version_utsclean'} . ' that was not built with the '
-             . 'CONFIG_UMISC configuration parameter set.  '
-@@ -2886,7 +2887,7 @@
-     # make sure it is loaded before beginning our tests
-     if (direct_command(shell_string($gHelper{'grep'}) . '  '
-                        . shell_string(' parport_release[^' . "\t" . ']*$')
--                       . ' /proc/ksyms') eq '') {
-+                       . $ksyms) eq '') {
-       # This comment fixes emacs's broken syntax highlighting
-       # parport support is not built in the kernel
-       if (system(shell_string($gHelper{'modprobe'})
-@@ -2908,7 +2909,7 @@
-     # make sure it is loaded before beginning our tests
-     if (direct_command(shell_string($gHelper{'grep'}) . '  '
-                        . shell_string(' parport_pc_[^' . "\t" . ']*$')
--                       . ' /proc/ksyms') eq '') {
-+                       . $ksyms) eq '') {
-       # This comment fixes emacs's broken syntax highlighting
-       # parport_pc support is not built in the kernel
-       if (system(shell_string($gHelper{'modprobe'})
diff --git a/app-emulation/vmware-workstation/files/vmware-workstation-4.5.2.8848-librarypath.patch b/app-emulation/vmware-workstation/files/vmware-workstation-4.5.2.8848-librarypath.patch
new file mode 100644
index 000000000000..a1eb4cbb94f7
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/vmware-workstation-4.5.2.8848-librarypath.patch
@@ -0,0 +1,28 @@
+--- vmware/bin/vmware	2004-12-02 07:12:26.268618096 +0900
++++ vmware/bin/vmware	2004-12-02 07:34:31.684433747 +0900
+@@ -169,15 +169,23 @@
+    local lib
+    local dummy
+    local status
++   local newpath
+ 
+    path=''
+    while read -r lib dummy status; do
+       if [ "$status" = 'not found' ]; then
++         newpath="$vm_db_answer_LIBDIR"'/lib/'"$lib"
+          if [ "$path" = '' ]; then
+-            path="$vm_db_answer_LIBDIR"'/lib/'"$lib"
++	    path="$newpath"
+          else
+-            path="$path"':'"$vm_db_answer_LIBDIR"'/lib/'"$lib"
++            path="$path"':'"$newpath"
+          fi
++	 for x in "$newpath/"*.so; do
++	    if [ -f "$x" ]
++	    then
++	       path="$path"':'`LD_LIBRARY_PATH="$path" LANGUAGE=C LANG=C ldd "$x" | vm_append_libs`
++            fi
++         done
+       fi
+    done
+ 
diff --git a/app-emulation/vmware-workstation/vmware-workstation-4.5.2.8848-r5.ebuild b/app-emulation/vmware-workstation/vmware-workstation-4.5.2.8848-r6.ebuild
index 59da389ab51a..27e108039bfb 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-4.5.2.8848-r5.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-4.5.2.8848-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-4.5.2.8848-r5.ebuild,v 1.5 2005/04/08 23:41:14 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-4.5.2.8848-r6.ebuild,v 1.1 2005/04/09 12:29:47 wolf31o2 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
@@ -49,6 +49,9 @@ Ddir=${D}/${dir}
 src_unpack() {
 	unpack ${NP}.tar.gz
 	cd ${S}
+	# Patch to resolve problems with VMware finding its distributed libraries.
+	# Patch submitted to bug #59035 by Georgi Georgiev <chutz@gg3.net>
+	epatch ${FILESDIR}/${P}-librarypath.patch
 	unpack ${ANY_ANY}.tar.gz
 	mv -f ${ANY_ANY}/*.tar ${S}/lib/modules/source/
 	cd ${S}/${ANY_ANY}