Make sure the patches are in place (bug 246252).

Package-Manager: portage-2.2_rc13/cvs/Linux 2.6.27-gentoo-r1 i686

3 files changed, 82 insertions, 4 deletions

diff --git a/app-emulation/vmware-player/Manifest b/app-emulation/vmware-player/Manifest
index dac592e6978c..17ace6f09bcc 100644
--- a/app-emulation/vmware-player/Manifest
+++ b/app-emulation/vmware-player/Manifest
@@ -59,12 +59,12 @@ EBUILD vmware-player-1.0.9.126128.ebuild 2652 RMD160 d2b167c4846468fb97920a9ec83
 EBUILD vmware-player-2.0.4.93057.ebuild 2914 RMD160 38b491d7971f49e4951e0577ac5099040a20f062 SHA1 3ab9c59a08da0a6098697f1c9a9583c1232197cb SHA256 5999086a5dba2aaccaad7ea1960e1265363617447d448dfd4a952ee12b472eb0
 EBUILD vmware-player-2.0.5.109488.ebuild 2915 RMD160 407d9960e3386dedec63426418a02d7e9368dc94 SHA1 038f6a5caf2a919ecbcf116a9aba95090982f675 SHA256 fdda217060c60496007919180afb12df98b1a4e2bc8553915de62415eb6d9199
 EBUILD vmware-player-2.5.0.118166.ebuild 5133 RMD160 6d131d8639902c01a76aa63cb17ec7335913dbaa SHA1 6793babe40521abcc28650a3ae7e609efa4688e7 SHA256 21d592ea361357b4a4673557f44c0d93b43b790d4d445e6b01cf33f10217c814
-MISC ChangeLog 19989 RMD160 cfff22ab2e3c7a456729a79bdca998396f4c4cd6 SHA1 16e6d7d0fba6a0d5f7e0c6559cd7eb3d4ccd9d80 SHA256 14bb4e13f4f149420ae948df88e831d94bdd5d65f90a889a1025d29f3f37c105
+MISC ChangeLog 20185 RMD160 ddd2e1bfbd8e109a073021c8c99aae58dba8ec71 SHA1 ff39daf71cf8ad5bf2b1585c2ae40fc280f30af0 SHA256 956809f1af1f7fe77c9186b23a1172fa0e2b05f85b58fcde34adaec335be4caf
 MISC metadata.xml 159 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 SHA1 f46b02a39bcd0165558de67ff4256cfc812418a3 SHA256 8581ae1c90a48f50fa0542c7fb28cb8984baaf12f50fa18f33e467081effb215
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkkXWXYACgkQu7rWomwgFXo+nwCeMN5U6cOPM/sLhC57wIRnLC2/
-nZMAnjnMwGqq1tsZnyInSXhKQwFlzyCA
-=xHXK
+iEYEARECAAYFAkkYD68ACgkQu7rWomwgFXpzDwCeNoZyRrmPRBagcL4Aql9eSPWr
+d9EAn0BGi/Gl6x61J+10U79kMUu0dhLn
+=OHRQ
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/vmware-player/files/2.5.0.118166/vmware-player-extras.py.patch b/app-emulation/vmware-player/files/2.5.0.118166/vmware-player-extras.py.patch
new file mode 100644
index 000000000000..eb9e723058cb
--- /dev/null
+++ b/app-emulation/vmware-player/files/2.5.0.118166/vmware-player-extras.py.patch
@@ -0,0 +1,14 @@
+diff --git a/vmware-player-extras.py b/vmware-player-extras.py
+index 21595b1..e8adf08 100644
+--- a/vmware-player-extras.py
++++ b/vmware-player-extras.py
+@@ -6,7 +6,8 @@ VMware Player Extras component installer.
+ 
+ DEST = LIBDIR/'vmware'
+ SETTINGS = { 'vmware.fullpath': BINDIR/'vmware', }
+-CONF = DEST/'setup/vmware-config'
++import os
++CONF = path(os.environ['WORKDIR'])/'vmware-config.sh'
+ 
+ 
+ class PlayerExtras(Installer):
diff --git a/app-emulation/vmware-player/files/2.5.0.118166/vmware-player.py.patch b/app-emulation/vmware-player/files/2.5.0.118166/vmware-player.py.patch
new file mode 100644
index 000000000000..49306c33f42e
--- /dev/null
+++ b/app-emulation/vmware-player/files/2.5.0.118166/vmware-player.py.patch
@@ -0,0 +1,64 @@
+diff --git a/vmware-player.py b/vmware-player.py
+index bee22df..d06cca9 100644
+--- a/vmware-player.py
++++ b/vmware-player.py
+@@ -6,7 +6,8 @@ VMware Player component installer.
+ 
+ GCONF_DEFAULTS = 'xml:readwrite:/etc/gconf/gconf.xml.defaults'
+ DEST = LIBDIR/'vmware'
+-CONFIG = DEST/'setup/vmware-config'
++import os
++CONFIG = path(os.environ['WORKDIR'])/'vmware-config.sh'
+ CUPSLIBDIR = LIBDIR/'cups'
+ # XXX: LIBDIR should be properly calculated, to make this cleaner
+ if (PREFIX/'lib64/cups').exists():
+@@ -84,12 +85,12 @@ class Player(Installer):
+       ret, kvers = output('uname', '-r')
+       kvers = kvers.strip()
+       modules = ('vmmon', 'vmnet', 'vmblock', 'vmci', 'vsock')
+-      base = path('/lib/modules/%s/misc' % kvers)
++      base = path('/this/path/doesnt/exist/lib/modules/%s/misc' % kvers)
+ 
+       for module in modules:
+          for ext in ('o', 'ko'):
+             mod = '%s.%s' % (module, ext)
+-            (base/mod).remove(ignore_errors=True)
++            # (base/mod).remove(ignore_errors=True)
+ 
+    def PreUninstall(self, old, new, upgrade):
+       script = INITSCRIPTDIR/'vmware'
+@@ -156,8 +157,8 @@ class Player(Installer):
+    def PostTransactionInstall(self, old, new, upgrade):
+       if ENV.get('VMWARE_SKIP_MODULES'):
+          log.info('Skipping kernel module installation')
+-      elif run(BINDIR/'vmware-modconfig', '--console', '--install-all') == 0:
+-         log.info('Successfully installed kernel modules')
++      # elif run(BINDIR/'vmware-modconfig', '--console', '--install-all') == 0:
++      #    log.info('Successfully installed kernel modules')
+       else:
+          log.info('Unable to install kernel modules')
+ 
+@@ -189,8 +190,8 @@ class Player(Installer):
+          for handler in ('vm', 'vms'):
+             for gconfType, key, value in settings:
+                key = key % handler
+-               run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
+-                   '--type', gconfType, '--set', key, value)
++               # run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
++               #     '--type', gconfType, '--set', key, value)
+ 
+          # Instruct all gconfd daemons to reload.
+          run('killall', '-HUP', 'gconfd-2')
+@@ -200,9 +201,9 @@ class Player(Installer):
+    def _deconfigureVMStreamingHandlers(self):
+       """ Deconfigures the handlers for vm:// and vms:// used for VM streaming"""
+       def deconfigureGConf():
+-         for handler in ('vm', 'vms'):
+-            run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
+-                '--recursive-unset', '/desktop/gnome/url-handlers/%s' % handler)
++         # for handler in ('vm', 'vms'):
++         #    run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
++         #       '--recursive-unset', '/desktop/gnome/url-handlers/%s' % handler)
+ 
+          # Instruct all gconfd daemons to reload.
+          run('killall', '-HUP', 'gconfd-2')