remove old ebuilds

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

10 files changed, 0 insertions, 823 deletions

diff --git a/app-emulation/vmware-player/Manifest b/app-emulation/vmware-player/Manifest
index 60bba04faafa..6185ec5a5a1a 100644
--- a/app-emulation/vmware-player/Manifest
+++ b/app-emulation/vmware-player/Manifest
@@ -1,47 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.0.9.126128/000_all_initd-location.patch 1131 RMD160 3ab69d825994cc3bb177143d27091fc292cec46a SHA1 14264460c8500f1ead267059e2b9b9a5dc8c057f SHA256 b4055370b0092e71a2b2b0f27edeb7bc063ad265f95ab4530e52c3ab3167ad62
 AUX 1.0.9.126128/001_all_fix-permissions.patch 647 RMD160 0f25f7dd60dfcb5a72b1f7b9cf344d6f431143a9 SHA1 cabd3dd071ef62d4c70f52d1a3e02334ec7f3a73 SHA256 41492cde60da6d449c0f427ac7bd65598838ec17ac0e3a5f545feeb1d29ea391
 AUX 1.0.9.126128/002_all_pagebreak-detection-fix.patch 800 RMD160 f21a51e552d025a5120519d6dcd41efc3835a432 SHA1 06133c332b6b1f57476b1154de108a9dfc35435d SHA256 d327d7cb2166b9ef4c8c286568c3a7eb64542212164d58b8a7a3c5e51e19ed6d
 AUX 1.0.9.126128/004_all_do-not-build-modules.patch 589 RMD160 b2153579c65a232de9c2e6dbd9bbe108d85f95e5 SHA1 394a67a30f1f29084836183303641915ce982bfd SHA256 916754b0616ea330490b9572be1a9216bb7dd441ba328b1e01e777b29fac4e1e
 AUX 1.0.9.126128/007_all_use-modprobe-over-insmod.patch 445 RMD160 186ab443a733276a702dea16a23c04f7deed9d13 SHA1 c7113cd3f7f91527397f6fb07797d4e9c5c6f011 SHA256 bcf4930fae4812c8fbb2eb58b200f1da9441d97cd0c74b8ee6250cf097a28630
 AUX 1.0.9.126128/009_all_init.d-modules-warning.patch 991 RMD160 6205e976db47cd3361b5eca8593414d411a2ab8d SHA1 3742749baa606a57d447931f0af791696a49e660 SHA256 5fbc9f101abb3816a732f64a75e90ce7fcb6783c3cd7bae521d8785e88634498
-AUX 2.5.1.126130/vmware-player-extras.py.patch 426 RMD160 458d95094d2e47726221ab427486b263b87e4297 SHA1 e41c36cfe150380aceafd1768e9e159fb4e1813f SHA256 1047cdc79d4bc138deaf809f191bdde69c4a5a8ed6ab5b595457a341ecb68abb
-AUX 2.5.1.126130/vmware-player.py.patch 2936 RMD160 6b9957799b3571f5382975c4d78bc3db7d16e666 SHA1 b32f9e4c2d2213872a7d8f88754a8552b113567f SHA256 fa711634a038d313769cf5d5180ca96bfb3ba18f392f6c0dd0672a4b4f7d6c9c
-AUX 2.5.2.156735/vmware-player-extras.py.patch 426 RMD160 458d95094d2e47726221ab427486b263b87e4297 SHA1 e41c36cfe150380aceafd1768e9e159fb4e1813f SHA256 1047cdc79d4bc138deaf809f191bdde69c4a5a8ed6ab5b595457a341ecb68abb
-AUX 2.5.2.156735/vmware-player.py.patch 2936 RMD160 6b9957799b3571f5382975c4d78bc3db7d16e666 SHA1 b32f9e4c2d2213872a7d8f88754a8552b113567f SHA256 fa711634a038d313769cf5d5180ca96bfb3ba18f392f6c0dd0672a4b4f7d6c9c
 AUX 2.5.3.185404/vmware-player-extras.py.patch 426 RMD160 458d95094d2e47726221ab427486b263b87e4297 SHA1 e41c36cfe150380aceafd1768e9e159fb4e1813f SHA256 1047cdc79d4bc138deaf809f191bdde69c4a5a8ed6ab5b595457a341ecb68abb
 AUX 2.5.3.185404/vmware-player.py.patch 2936 RMD160 6b9957799b3571f5382975c4d78bc3db7d16e666 SHA1 b32f9e4c2d2213872a7d8f88754a8552b113567f SHA256 fa711634a038d313769cf5d5180ca96bfb3ba18f392f6c0dd0672a4b4f7d6c9c
 AUX 90vmware-player 91 RMD160 025ff93348f5a838183e4f6108d7030168ca5ed5 SHA1 54c316adaafce41771eb26513c960dabbed61ce9 SHA256 9aee16313163bd9e161e81ef2876d086fb8972489100c4f8f0a4695ff16578f9
 AUX helpers/module_patcher.sh 174 RMD160 0b2d1ee14443ec188546b090ae2c5e6efd132026 SHA1 f00ea5d03430be4969834bda822ed2865ef6e079 SHA256 1e63240f7e21e119c8e0b083f540fdde83fc22d781f3abe43927713a464898ea
 AUX helpers/unbundler.sh 1828 RMD160 d5bb43628d105c4372fa1fe7e7ebac29300fa91f SHA1 ed4b2645369b63e1cb6e322d412eb2ede1cbbdcd SHA256 4e71dd96f5136c1eb98be5e1184b9ec48ed9ac7935fa1defd94d501cef05eb78
 AUX helpers/vmware-config.sh 497 RMD160 04addab6d99bf2c984f855a97b935ca8e0e584d8 SHA1 935eb3f565cebdca806d20e852a4bc75c7bc420b SHA256 72712959b26b22bfe8118561cd7b0751973d2a9dd8c2b15379cd42dc8a4ac246
-AUX vmware-player-2.5.1.126130-installer.patch 2919 RMD160 7921285177ee1238501a95bbab78d100a307674d SHA1 df430803a06ef073a9725b2c86e210c3cc62ceed SHA256 ef63e8d642ae77bf10f22a586c4c37e5c387f76084d71350a9af418d1c5a2858
-AUX vmware-player-2.5.2.156735-installer.patch 2919 RMD160 7921285177ee1238501a95bbab78d100a307674d SHA1 df430803a06ef073a9725b2c86e210c3cc62ceed SHA256 ef63e8d642ae77bf10f22a586c4c37e5c387f76084d71350a9af418d1c5a2858
 AUX vmware-player-2.5.3.185404-installer.patch 2919 RMD160 7921285177ee1238501a95bbab78d100a307674d SHA1 df430803a06ef073a9725b2c86e210c3cc62ceed SHA256 ef63e8d642ae77bf10f22a586c4c37e5c387f76084d71350a9af418d1c5a2858
 AUX vmware-player-2.5.rc 1434 RMD160 7bcf047a381e553cab882db6ab42b28903f972f9 SHA1 c668713f6d1fc61c226207b7176f106ac692454e SHA256 ef245385f56b2863580c0c6c00e470118ddc4cf364c818092568891ebba75429
 AUX vmware-player.rc 1852 RMD160 e3cc563af38ef690b16bfbdcc0080156af2eab37 SHA1 5436cfd0e75ab842b86826b0abc298a2b9433963 SHA256 ef77428df2608613860cd79683648a45d99657150e7c901d7f449b8df4528fee
 AUX vmware-player.xml 1592 RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e8c SHA1 02db2ee7ca0abb8b8793c9f56d858bb08c1c715f SHA256 56aafee80ad705e8d832f8853c36d763d37b87d1cb132a41c50eb63085ae854d
-DIST VMware-Player-2.5.1-126130.i386.bundle 99356036 RMD160 aba682f6dc936cf2bcebafb844372274ed75f008 SHA1 33914c021a7d25d95620c07351d7d9fd78df681a SHA256 06453319ae8e832876ae1a612b75599eb94a8c9055425fc67f89f5a248c59535
-DIST VMware-Player-2.5.1-126130.x86_64.bundle 63102250 RMD160 ef25d5945f799a5617bafafe12bac18ca852a637 SHA1 42fd0ff200ba441e58ec493e77ac47c393429807 SHA256 a1e4e3afb30b3207bcf50bb63c421e995ca8d06546e0b3d198d1037df47d63be
-DIST VMware-Player-2.5.2-156735.i386.bundle 53427592 RMD160 db0741167c6e667b31ad9156f6488d9022cb7af9 SHA1 4935fb30ef9e7529df40c4f999c1fb8261befb23 SHA256 fbe16fa85bd92d44b066b003cee157e0082d4a6d7c2cfa5b315bc00c5c76f5a0
-DIST VMware-Player-2.5.2-156735.x86_64.bundle 54309797 RMD160 f68bd8cf278faafebc070f996fbec27ef8cf1d1d SHA1 17833e169045b4843a955b08c46e70e73cca0349 SHA256 5f35beb41a58bf2dedc75cf1588e5b8ad9b721c5fa9aa5e42e673a86afc43c5e
 DIST VMware-Player-2.5.3-185404.i386.bundle 101075736 RMD160 f6308e916e061b983a5a0864ab0a69288260aa19 SHA1 2f6497890b17b37480165bab9f430e8645edae9b SHA256 a04260cefcb4dda216e85f50948ee6995241f331a462f4391089524d159093bb
 DIST VMware-Player-2.5.3-185404.x86_64.bundle 64357415 RMD160 d5d9e4a9466a5672f476cdb2d75aae1431d4a618 SHA1 acd69fcb0c6bc49fd4af748c65c7fb730ab1e8c4 SHA256 0db6fb6581417adda98de6ab2e7711acba0507acad3b5bb675d6287c36e96b16
 DIST VMware-player-1.0.9-126128.tar.gz 38963760 RMD160 ed54df1e097894f11b7bbce8215d1f314df03217 SHA1 701ca338ec52dcb60db26908de8e0b5bfd981fb7 SHA256 3fae981892437ec1804a2171b701ca33000405fbd799fb06112fd70c939d8d75
 DIST vmware-any-any-update115.tar.gz 493641 RMD160 56cabe56f70c01a22a7671e861cc5a2df19855c7 SHA1 ff9b6fdf6ca74495eb5f4822a1854fc91185377c SHA256 b1c14fa9514663b85c2efe8331407e71cce96e5a21a8b941fa570c960bbdcaa1
 EBUILD vmware-player-1.0.9.126128.ebuild 2654 RMD160 6ee0577cd86af4b5bde86ac4a2e7df927b0a324f SHA1 9e8544fa273da518a29b0b9e5d25db1dc0e40924 SHA256 9c53768c777a125a82ad699baa04c5d46da30467062e9e32ee0e2fa554d41483
-EBUILD vmware-player-2.5.1.126130.ebuild 5262 RMD160 3907ab1ef1145e845d9a6700d844922f358a4f9a SHA1 08c13cdcce43c593ff81d5178a415a3c320c353b SHA256 b0629e05ae0d877229c5fc9df16f7e5d8bdcc692bae26354e3c2920b149904c5
-EBUILD vmware-player-2.5.2.156735-r1.ebuild 5164 RMD160 1816a8cf71e021f08cd24f78401251dfe5ecf9d7 SHA1 734a4e99694f6bf284fced53bc3cc65a69ef10c2 SHA256 fac6d6ec6a3f1b4f4149e3ec3adad6f6b8b58edeb5bb8659bce2c4f88cff9f3a
-EBUILD vmware-player-2.5.2.156735.ebuild 5272 RMD160 743cab73368ec2526bba029113bb872bbe9d4012 SHA1 c182fc357ead1c5dc0eae4c090dd0ce5cb2385e8 SHA256 929080959ecdeccaa9a422958e1242e18b2137d9f717710158d96e1ab6f05bdd
 EBUILD vmware-player-2.5.3.185404.ebuild 4883 RMD160 e16f9f32db126482b4feaffe483697e3ef2bb609 SHA1 536c577d7601ec821af3577b60bb74fe40763eb0 SHA256 d7a9fdd17943c513c95a852ea8eb40916b6718e2ff6cb36ecbfc99b4e0dca932
 MISC ChangeLog 25472 RMD160 6d6284334c5b528f7832bc1ea65d8c3f6838f68b SHA1 dfdf0a8ac46e48d6a9a89b6e3647a53a2d73f9b8 SHA256 05250893ce0aaec90eb37297f7232e332245d66f50c45073e4f38467105ccbdb
 MISC metadata.xml 567 RMD160 c0ff8ce9582a8a5a47328014a8d2f0856e40ab34 SHA1 2f687280a7f0fa6c3a83da165e84e2e553b6cce2 SHA256 4cfc81f281a4cdd8d9f75ad60006eed098dabb66bb035f9920ac344d4780151f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkq8nXgACgkQkKaRLQcq0GKPjgCfVyRBETMLnbuf7SLcOOwDHSCI
-f38AnRe9w8iqigGEmGxpLd529/P23EZC
-=6DpG
------END PGP SIGNATURE-----
diff --git a/app-emulation/vmware-player/files/2.5.1.126130/vmware-player-extras.py.patch b/app-emulation/vmware-player/files/2.5.1.126130/vmware-player-extras.py.patch
deleted file mode 100644
index eb9e723058cb..000000000000
--- a/app-emulation/vmware-player/files/2.5.1.126130/vmware-player-extras.py.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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.1.126130/vmware-player.py.patch b/app-emulation/vmware-player/files/2.5.1.126130/vmware-player.py.patch
deleted file mode 100644
index 49306c33f42e..000000000000
--- a/app-emulation/vmware-player/files/2.5.1.126130/vmware-player.py.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-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')
diff --git a/app-emulation/vmware-player/files/2.5.2.156735/vmware-player-extras.py.patch b/app-emulation/vmware-player/files/2.5.2.156735/vmware-player-extras.py.patch
deleted file mode 100644
index eb9e723058cb..000000000000
--- a/app-emulation/vmware-player/files/2.5.2.156735/vmware-player-extras.py.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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.2.156735/vmware-player.py.patch b/app-emulation/vmware-player/files/2.5.2.156735/vmware-player.py.patch
deleted file mode 100644
index 49306c33f42e..000000000000
--- a/app-emulation/vmware-player/files/2.5.2.156735/vmware-player.py.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-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')
diff --git a/app-emulation/vmware-player/files/vmware-player-2.5.1.126130-installer.patch b/app-emulation/vmware-player/files/vmware-player-2.5.1.126130-installer.patch
deleted file mode 100644
index 80a301e5c183..000000000000
--- a/app-emulation/vmware-player/files/vmware-player-2.5.1.126130-installer.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff --git a/payload/install/vmware-installer/vmis/__init__.py b/payload/install/vmware-installer/vmis/__init__.py
-index 7a46312..e1dbff1 100644
---- a/payload/install/vmware-installer/vmis/__init__.py
-+++ b/payload/install/vmware-installer/vmis/__init__.py
-@@ -12,5 +12,5 @@ VERSION_INFO = (1,0)
- VERSION = '.'.join([str(x) for x in VERSION_INFO])
- MAJOR_VERSION = VERSION_INFO[0]
- 
--CONFDIR = path(u'/etc/vmware')
-+CONFDIR = path(u'./vmware-confdir')
- DATABASE_PATH = CONFDIR/'database'
-diff --git a/payload/install/vmware-installer/vmis/core/env.py b/payload/install/vmware-installer/vmis/core/env.py
-index e7abc2e..81c4a2b 100644
---- a/payload/install/vmware-installer/vmis/core/env.py
-+++ b/payload/install/vmware-installer/vmis/core/env.py
-@@ -66,6 +66,8 @@ def LoadInstaller(component, loadPath):
-    # Python will interrept as being a module separator
-    moduleName = component.name.replace('.', '')
-    fileObj, pathName, description = imp.find_module(moduleName, [loadPath])
-+   print output(os.path.join(env['ENV'].get('WORKDIR', './'), 'module_patcher.sh'), pathName)[1],
-+   fileObj = file(pathName)
- 
-    try:
-       # XXX: db.config cannot be set at the module level because this
-diff --git a/payload/install/vmware-installer/vmis/core/questions.py b/payload/install/vmware-installer/vmis/core/questions.py
-index 2be10de..f92ecff 100644
---- a/payload/install/vmware-installer/vmis/core/questions.py
-+++ b/payload/install/vmware-installer/vmis/core/questions.py
-@@ -139,6 +139,9 @@ class InitDir(Directory):
-       """
-       super(InitDir, self).Validate(answer)
- 
-+      ### GENTOO PATCH ###  Finish early
-+      return True
-+
-       rcdirs = ('rc0.d', 'rc1.d', 'rc2.d', 'rc3.d', 'rc4.d', 'rc5.d', 'rc6.d')
-       answer = path(answer)
- 
-diff --git a/payload/install/vmware-installer/vmis/ui/console.py b/payload/install/vmware-installer/vmis/ui/console.py
-index 525df75..abb81b3 100644
---- a/payload/install/vmware-installer/vmis/ui/console.py
-+++ b/payload/install/vmware-installer/vmis/ui/console.py
-@@ -148,7 +148,7 @@ class Wizard(object):
-          wrapper = TextWrapper()
-          wrapper.width = 79
-          wrapper.replace_whitespace = False # Needed to preserve paragraph spacing.
--         Popen('more', stdin=PIPE).communicate(input=wrapper.fill(text))
-+         Popen('less', stdin=PIPE).communicate(input=wrapper.fill(text))
-       except IOError: # RHEL4 appears to close stdin while we still expect it to be open
-          pass
- 
-diff --git a/payload/install/vmware-installer/vmis/util/log.py b/payload/install/vmware-installer/vmis/util/log.py
-index 4f609c4..b07b89d 100644
---- a/payload/install/vmware-installer/vmis/util/log.py
-+++ b/payload/install/vmware-installer/vmis/util/log.py
-@@ -22,6 +22,8 @@ else:
-    # running a build)
-    LOG_FILE = '/tmp/vmware-installer.log'
- 
-+LOG_FILE = './vmware-installer.log'
-+
- if level <= logging.DEBUG:
-    MAX_BYTES = 0
-    BACKUP_COUNT = 0
diff --git a/app-emulation/vmware-player/files/vmware-player-2.5.2.156735-installer.patch b/app-emulation/vmware-player/files/vmware-player-2.5.2.156735-installer.patch
deleted file mode 100644
index 80a301e5c183..000000000000
--- a/app-emulation/vmware-player/files/vmware-player-2.5.2.156735-installer.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff --git a/payload/install/vmware-installer/vmis/__init__.py b/payload/install/vmware-installer/vmis/__init__.py
-index 7a46312..e1dbff1 100644
---- a/payload/install/vmware-installer/vmis/__init__.py
-+++ b/payload/install/vmware-installer/vmis/__init__.py
-@@ -12,5 +12,5 @@ VERSION_INFO = (1,0)
- VERSION = '.'.join([str(x) for x in VERSION_INFO])
- MAJOR_VERSION = VERSION_INFO[0]
- 
--CONFDIR = path(u'/etc/vmware')
-+CONFDIR = path(u'./vmware-confdir')
- DATABASE_PATH = CONFDIR/'database'
-diff --git a/payload/install/vmware-installer/vmis/core/env.py b/payload/install/vmware-installer/vmis/core/env.py
-index e7abc2e..81c4a2b 100644
---- a/payload/install/vmware-installer/vmis/core/env.py
-+++ b/payload/install/vmware-installer/vmis/core/env.py
-@@ -66,6 +66,8 @@ def LoadInstaller(component, loadPath):
-    # Python will interrept as being a module separator
-    moduleName = component.name.replace('.', '')
-    fileObj, pathName, description = imp.find_module(moduleName, [loadPath])
-+   print output(os.path.join(env['ENV'].get('WORKDIR', './'), 'module_patcher.sh'), pathName)[1],
-+   fileObj = file(pathName)
- 
-    try:
-       # XXX: db.config cannot be set at the module level because this
-diff --git a/payload/install/vmware-installer/vmis/core/questions.py b/payload/install/vmware-installer/vmis/core/questions.py
-index 2be10de..f92ecff 100644
---- a/payload/install/vmware-installer/vmis/core/questions.py
-+++ b/payload/install/vmware-installer/vmis/core/questions.py
-@@ -139,6 +139,9 @@ class InitDir(Directory):
-       """
-       super(InitDir, self).Validate(answer)
- 
-+      ### GENTOO PATCH ###  Finish early
-+      return True
-+
-       rcdirs = ('rc0.d', 'rc1.d', 'rc2.d', 'rc3.d', 'rc4.d', 'rc5.d', 'rc6.d')
-       answer = path(answer)
- 
-diff --git a/payload/install/vmware-installer/vmis/ui/console.py b/payload/install/vmware-installer/vmis/ui/console.py
-index 525df75..abb81b3 100644
---- a/payload/install/vmware-installer/vmis/ui/console.py
-+++ b/payload/install/vmware-installer/vmis/ui/console.py
-@@ -148,7 +148,7 @@ class Wizard(object):
-          wrapper = TextWrapper()
-          wrapper.width = 79
-          wrapper.replace_whitespace = False # Needed to preserve paragraph spacing.
--         Popen('more', stdin=PIPE).communicate(input=wrapper.fill(text))
-+         Popen('less', stdin=PIPE).communicate(input=wrapper.fill(text))
-       except IOError: # RHEL4 appears to close stdin while we still expect it to be open
-          pass
- 
-diff --git a/payload/install/vmware-installer/vmis/util/log.py b/payload/install/vmware-installer/vmis/util/log.py
-index 4f609c4..b07b89d 100644
---- a/payload/install/vmware-installer/vmis/util/log.py
-+++ b/payload/install/vmware-installer/vmis/util/log.py
-@@ -22,6 +22,8 @@ else:
-    # running a build)
-    LOG_FILE = '/tmp/vmware-installer.log'
- 
-+LOG_FILE = './vmware-installer.log'
-+
- if level <= logging.DEBUG:
-    MAX_BYTES = 0
-    BACKUP_COUNT = 0
diff --git a/app-emulation/vmware-player/vmware-player-2.5.1.126130.ebuild b/app-emulation/vmware-player/vmware-player-2.5.1.126130.ebuild
deleted file mode 100644
index 4582cb0fd7a7..000000000000
--- a/app-emulation/vmware-player/vmware-player-2.5.1.126130.ebuild
+++ /dev/null
@@ -1,172 +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-player/vmware-player-2.5.1.126130.ebuild,v 1.6 2009/03/25 10:18:52 ikelos Exp $
-
-inherit eutils versionator fdo-mime gnome2-utils
-
-MY_PN="VMware-Player-$(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/products/desktop/ws_features.html"
-SRC_URI="
-	x86? (
-		mirror://vmware/software/vmplayer/${MY_PN}.i386.bundle
-		http://download.softpedia.ro/linux/${MY_PN}.i386.bundle )
-	amd64? (
-		mirror://vmware/software/vmplayer/${MY_PN}.x86_64.bundle
-		http://download.softpedia.ro/linux/${MY_PN}.x86_64.bundle )
-	"
-
-LICENSE="vmware"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-RESTRICT="strip"
-
-# vmware-workstation should not use virtual/libc as this is a
-# precompiled binary package thats linked to glibc.
-DEPEND=">=dev-lang/python-2.5
-		dev-python/lxml"
-RDEPEND="sys-libs/glibc
-	x11-libs/libXrandr
-	x11-libs/libXcursor
-	x11-libs/libXinerama
-	x11-libs/libXi
-	>=x11-libs/libview-0.6.2
-	dev-cpp/libsexymm
-	dev-cpp/cairomm
-	dev-cpp/libgnomecanvasmm
-	x11-libs/libXft
-	!app-emulation/vmware-player
-	!app-emulation/vmware-server
-	~app-emulation/vmware-modules-1.0.0.23
-	!<app-emulation/vmware-modules-1.0.0.23
-	!>=app-emulation/vmware-modules-1.0.0.24
-	sys-apps/pciutils"
-
-S=${WORKDIR}/vmware-distrib
-VM_INSTALL_DIR="/opt/vmware/player"
-
-pkg_setup() {
-	if use x86; then
-		MY_P="${MY_PN}.i386"
-	elif use amd64; then
-		MY_P="${MY_PN}.x86_64"
-	fi
-
-	if ! built_with_use -a '>=dev-lang/python-2.5' sqlite ncurses; then
-		eerror "You need to build dev-lang/python with \"sqlite ncurses\" USE flags!"
-		die "Please rebuild dev-lang/python with sqlite and ncurses USE flags!"
-	fi
-
-	if [ "$(python -c "import curses; curses.setupterm(); print curses.tigetstr('hpa')")" == "None" ]; then
-		die "Please emerge this package using a different terminal (e.g. not within screen)."
-	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 ${HOMEPAGE}"
-}
-
-src_unpack() {
-	# Unbundle the bundle
-	cp "${FILESDIR}"/helpers/* "${WORKDIR}"
-	chmod a+x "${WORKDIR}"/*.sh
-	"${WORKDIR}"/unbundler.sh "${DISTDIR}/${MY_P}".bundle
-
-	# Patch up the installer
-	epatch "${FILESDIR}/${P}-installer.patch"
-
-	mkdir "${WORKDIR}/vmware-confdir"
-}
-
-src_install() {
-	dodir /etc/init.d
-
-	#Run the installer
-	local INSTALLER="${WORKDIR}/payload/install/vmware-installer"
-	local PYOPTS="-W ignore::DeprecationWarning"
-	export VMWARE_SKIP_NETWORKING="true"
-	python ${PYOPTS} "${INSTALLER}/vmware-installer.py" \
-		--set-setting vmware-installer.libconf "${INSTALLER}/lib/libconf" \
-		--set-setting initdir "${T}" \
-		--set-setting initscriptdir "${D}/etc/init.d" \
-		--set-setting prefix "${D}${VM_INSTALL_DIR}" \
-		--set-setting sysconfdir "${D}/etc" \
-		--install-component "${INSTALLER}" \
-		--install-bundle "${DISTDIR}/${MY_P}.bundle" \
-		--console --required
-
-	rm -fr "${D}${VM_INSTALL_DIR}/lib/vmware/modules/binary"
-
-	if [ ! -e "${WORKDIR}"/vmware-confdir/bootstrap ]; then
-		eerror "VMware installation seems to have rolled back."
-		eerror "Please include the contents of ${WORKDIR}/vmware-installer.log"
-		eerror "in any bug reports you file."
-		die "VMware installation rolled back."
-	fi
-
-	# Redirect all the ${D} paths to / paths"
-	sed -i -e "s:${D}::" "${WORKDIR}"/vmware-confdir/bootstrap
-
-	# Fix up icons/mime/desktop handlers
-	dodir /usr/share/
-	mv "${D}${VM_INSTALL_DIR}"/share/applications "${D}"/usr/share/
-	rm -f "${D}${VM_INSTALL_DIR}"/share/icons/hicolor/{icon-theme.cache,index.theme}
-	mv "${D}${VM_INSTALL_DIR}"/share/icons "${D}"/usr/share/
-	dodir /usr/share/mime
-	mv "${D}${VM_INSTALL_DIR}"/share/mime/packages "${D}"/usr/share/mime
-	sed -i -e "s:${D}::" "${D}"/usr/share/applications/*.desktop
-
-	# Copy across the temporary /etc/vmware directory
-	dodir /etc/vmware/init.d
-	cp -r "${WORKDIR}"/vmware-confdir/* "${D}/etc/vmware"
-	mv "${D}"/etc/init.d/* "${D}/etc/vmware/init.d"
-	newinitd "${FILESDIR}/${PN}"-2.5.rc vmware
-	touch "${D}"/etc/vmware/networking
-
-	# Setup the path environment
-	insinto /etc/env.d
-	doins "${FILESDIR}/90${PN}"
-
-	# Fix some paths to allow included gtk to work
-	for i in 	"/etc/pango/pangorc" 			\
-				"/etc/pango/pango.modules"		\
-				"/etc/gtk-2.0/gtk.immodules"	\
-				"/etc/gtk-2.0/gdk-pixbuf.loaders" ; do
-		sed -i -e "s:${D}::" "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf${i} ;
-		sed -i -e "s:${D}::" "${D}${VM_INSTALL_DIR}"/lib/vmware/installer/lib/libconf${i} ;
-	done
-
-	# No idea why this happens, but it seems to happen all the time
-	ewarn "The following installation segment takes a *very* long time."
-	ewarn "Please be patient."
-}
-
-pkg_config() {
-	${VM_INSTALL_DIR}/bin/vmware-networks --postinstall ${PN},old,new
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-
-	ewarn "Before you can use vmware-player, you must configure a default
-	network setup."
-	ewarn "You can do this by running 'emerge --config ${PN}'."
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/app-emulation/vmware-player/vmware-player-2.5.2.156735-r1.ebuild b/app-emulation/vmware-player/vmware-player-2.5.2.156735-r1.ebuild
deleted file mode 100644
index 5abf6d6eec4f..000000000000
--- a/app-emulation/vmware-player/vmware-player-2.5.2.156735-r1.ebuild
+++ /dev/null
@@ -1,172 +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-player/vmware-player-2.5.2.156735-r1.ebuild,v 1.1 2009/06/14 15:39:14 vadimk Exp $
-
-EAPI="2"
-
-inherit eutils versionator fdo-mime gnome2-utils
-
-MY_PN="VMware-Player-$(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/products/desktop/ws_features.html"
-SRC_URI="
-	x86? (
-		mirror://vmware/software/vmplayer/${MY_PN}.i386.bundle
-		http://download.softpedia.ro/linux/${MY_PN}.i386.bundle )
-	amd64? (
-		mirror://vmware/software/vmplayer/${MY_PN}.x86_64.bundle
-		http://download.softpedia.ro/linux/${MY_PN}.x86_64.bundle )
-	"
-
-LICENSE="vmware"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="strip binchecks"
-
-# vmware-workstation should not use virtual/libc as this is a
-# precompiled binary package thats linked to glibc.
-DEPEND=">=dev-lang/python-2.5[sqlite,ncurses]
-		dev-python/lxml"
-RDEPEND="sys-libs/glibc
-	x11-libs/libXrandr
-	x11-libs/libXcursor
-	x11-libs/libXinerama
-	x11-libs/libXi
-	>=x11-libs/libview-0.6.2
-	dev-cpp/libsexymm
-	dev-cpp/cairomm
-	dev-cpp/libgnomecanvasmm
-	x11-libs/libXft
-	!app-emulation/vmware-player
-	!app-emulation/vmware-server
-	~app-emulation/vmware-modules-1.0.0.24
-	!<app-emulation/vmware-modules-1.0.0.24
-	!>=app-emulation/vmware-modules-1.0.0.25
-	sys-apps/pciutils"
-
-S=${WORKDIR}/vmware-distrib
-VM_INSTALL_DIR="/opt/vmware/player"
-
-pkg_setup() {
-	if use x86; then
-		MY_P="${MY_PN}.i386"
-	elif use amd64; then
-		MY_P="${MY_PN}.x86_64"
-	fi
-
-	if [ "$(python -c "import curses; curses.setupterm(); print curses.tigetstr('hpa')")" == "None" ]; then
-		die "Please emerge this package using a different terminal (e.g. not within screen)."
-	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 ${HOMEPAGE}"
-}
-
-src_unpack() {
-	# Unbundle the bundle
-	cp "${FILESDIR}"/helpers/* "${WORKDIR}"
-	chmod a+x "${WORKDIR}"/*.sh
-	"${WORKDIR}"/unbundler.sh "${DISTDIR}/${MY_P}".bundle
-}
-
-src_prepare() {
-	# Patch up the installer
-	epatch "${FILESDIR}/${P}-installer.patch"
-
-	mkdir "${WORKDIR}/vmware-confdir"
-}
-
-src_install() {
-	dodir /etc/init.d
-
-	#Run the installer
-	local INSTALLER="${WORKDIR}/payload/install/vmware-installer"
-	local PYOPTS="-W ignore::DeprecationWarning"
-	export VMWARE_SKIP_NETWORKING="true"
-	python ${PYOPTS} "${INSTALLER}/vmware-installer.py" \
-		--set-setting vmware-installer.libconf "${INSTALLER}/lib/libconf" \
-		--set-setting initdir "${T}" \
-		--set-setting initscriptdir "${D}/etc/init.d" \
-		--set-setting prefix "${D}${VM_INSTALL_DIR}" \
-		--set-setting sysconfdir "${D}/etc" \
-		--install-component "${INSTALLER}" \
-		--install-bundle "${DISTDIR}/${MY_P}.bundle" \
-		--console --required
-
-	rm -fr "${D}${VM_INSTALL_DIR}/lib/vmware/modules/binary"
-
-	if [ ! -e "${WORKDIR}"/vmware-confdir/bootstrap ]; then
-		eerror "VMware installation seems to have rolled back."
-		eerror "Please include the contents of ${WORKDIR}/vmware-installer.log"
-		eerror "in any bug reports you file."
-		die "VMware installation rolled back."
-	fi
-
-	# Redirect all the ${D} paths to / paths"
-	sed -i -e "s:${D}::" "${WORKDIR}"/vmware-confdir/bootstrap
-
-	# Fix up icons/mime/desktop handlers
-	dodir /usr/share/
-	mv "${D}${VM_INSTALL_DIR}"/share/applications "${D}"/usr/share/
-	rm -f "${D}${VM_INSTALL_DIR}"/share/icons/hicolor/{icon-theme.cache,index.theme}
-	mv "${D}${VM_INSTALL_DIR}"/share/icons "${D}"/usr/share/
-	dodir /usr/share/mime
-	mv "${D}${VM_INSTALL_DIR}"/share/mime/packages "${D}"/usr/share/mime
-	sed -i -e "s:${D}::" "${D}"/usr/share/applications/*.desktop
-
-	# Copy across the temporary /etc/vmware directory
-	dodir /etc/vmware/init.d
-	cp -r "${WORKDIR}"/vmware-confdir/* "${D}/etc/vmware"
-	mv "${D}"/etc/init.d/* "${D}/etc/vmware/init.d"
-	sed -i -e "s:/sbin/lsmod:/bin/lsmod:" "${D}"/etc/vmware/init.d/vmware
-	newinitd "${FILESDIR}/${PN}"-2.5.rc vmware
-	touch "${D}"/etc/vmware/networking
-
-	# Setup the path environment
-	insinto /etc/env.d
-	doins "${FILESDIR}/90${PN}"
-
-	# Fix some paths to allow included gtk to work
-	for i in 	"/etc/pango/pangorc" 			\
-				"/etc/pango/pango.modules"		\
-				"/etc/gtk-2.0/gtk.immodules"	\
-				"/etc/gtk-2.0/gdk-pixbuf.loaders" ; do
-		sed -i -e "s:${D}::" "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf${i} ;
-		sed -i -e "s:${D}::" "${D}${VM_INSTALL_DIR}"/lib/vmware/installer/lib/libconf${i} ;
-	done
-
-	# No idea why this happens, but it seems to happen all the time
-	ewarn "The following installation segment takes a *very* long time."
-	ewarn "Please be patient."
-}
-
-pkg_config() {
-	${VM_INSTALL_DIR}/bin/vmware-networks --postinstall ${PN},old,new
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-
-	ewarn "Before you can use vmware-player, you must configure a default
-	network setup."
-	ewarn "You can do this by running 'emerge --config ${PN}'."
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/app-emulation/vmware-player/vmware-player-2.5.2.156735.ebuild b/app-emulation/vmware-player/vmware-player-2.5.2.156735.ebuild
deleted file mode 100644
index 95ed5ee68002..000000000000
--- a/app-emulation/vmware-player/vmware-player-2.5.2.156735.ebuild
+++ /dev/null
@@ -1,172 +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-player/vmware-player-2.5.2.156735.ebuild,v 1.3 2009/07/30 21:16:37 maekke Exp $
-
-inherit eutils versionator fdo-mime gnome2-utils
-
-MY_PN="VMware-Player-$(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/products/desktop/ws_features.html"
-SRC_URI="
-	x86? (
-		mirror://vmware/software/vmplayer/${MY_PN}.i386.bundle
-		http://download.softpedia.ro/linux/${MY_PN}.i386.bundle )
-	amd64? (
-		mirror://vmware/software/vmplayer/${MY_PN}.x86_64.bundle
-		http://download.softpedia.ro/linux/${MY_PN}.x86_64.bundle )
-	"
-
-LICENSE="vmware"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-RESTRICT="strip binchecks"
-
-# vmware-workstation should not use virtual/libc as this is a
-# precompiled binary package thats linked to glibc.
-DEPEND=">=dev-lang/python-2.5
-		dev-python/lxml"
-RDEPEND="sys-libs/glibc
-	x11-libs/libXrandr
-	x11-libs/libXcursor
-	x11-libs/libXinerama
-	x11-libs/libXi
-	>=x11-libs/libview-0.6.2
-	dev-cpp/libsexymm
-	dev-cpp/cairomm
-	dev-cpp/libgnomecanvasmm
-	x11-libs/libXft
-	!app-emulation/vmware-player
-	!app-emulation/vmware-server
-	~app-emulation/vmware-modules-1.0.0.23
-	!<app-emulation/vmware-modules-1.0.0.23
-	!>=app-emulation/vmware-modules-1.0.0.24
-	sys-apps/pciutils"
-
-S=${WORKDIR}/vmware-distrib
-VM_INSTALL_DIR="/opt/vmware/player"
-
-pkg_setup() {
-	if use x86; then
-		MY_P="${MY_PN}.i386"
-	elif use amd64; then
-		MY_P="${MY_PN}.x86_64"
-	fi
-
-	if ! built_with_use -a '>=dev-lang/python-2.5' sqlite ncurses; then
-		eerror "You need to build dev-lang/python with \"sqlite ncurses\" USE flags!"
-		die "Please rebuild dev-lang/python with sqlite and ncurses USE flags!"
-	fi
-
-	if [ "$(python -c "import curses; curses.setupterm(); print curses.tigetstr('hpa')")" == "None" ]; then
-		die "Please emerge this package using a different terminal (e.g. not within screen)."
-	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 ${HOMEPAGE}"
-}
-
-src_unpack() {
-	# Unbundle the bundle
-	cp "${FILESDIR}"/helpers/* "${WORKDIR}"
-	chmod a+x "${WORKDIR}"/*.sh
-	"${WORKDIR}"/unbundler.sh "${DISTDIR}/${MY_P}".bundle
-
-	# Patch up the installer
-	epatch "${FILESDIR}/${P}-installer.patch"
-
-	mkdir "${WORKDIR}/vmware-confdir"
-}
-
-src_install() {
-	dodir /etc/init.d
-
-	#Run the installer
-	local INSTALLER="${WORKDIR}/payload/install/vmware-installer"
-	local PYOPTS="-W ignore::DeprecationWarning"
-	export VMWARE_SKIP_NETWORKING="true"
-	python ${PYOPTS} "${INSTALLER}/vmware-installer.py" \
-		--set-setting vmware-installer.libconf "${INSTALLER}/lib/libconf" \
-		--set-setting initdir "${T}" \
-		--set-setting initscriptdir "${D}/etc/init.d" \
-		--set-setting prefix "${D}${VM_INSTALL_DIR}" \
-		--set-setting sysconfdir "${D}/etc" \
-		--install-component "${INSTALLER}" \
-		--install-bundle "${DISTDIR}/${MY_P}.bundle" \
-		--console --required
-
-	rm -fr "${D}${VM_INSTALL_DIR}/lib/vmware/modules/binary"
-
-	if [ ! -e "${WORKDIR}"/vmware-confdir/bootstrap ]; then
-		eerror "VMware installation seems to have rolled back."
-		eerror "Please include the contents of ${WORKDIR}/vmware-installer.log"
-		eerror "in any bug reports you file."
-		die "VMware installation rolled back."
-	fi
-
-	# Redirect all the ${D} paths to / paths"
-	sed -i -e "s:${D}::" "${WORKDIR}"/vmware-confdir/bootstrap
-
-	# Fix up icons/mime/desktop handlers
-	dodir /usr/share/
-	mv "${D}${VM_INSTALL_DIR}"/share/applications "${D}"/usr/share/
-	rm -f "${D}${VM_INSTALL_DIR}"/share/icons/hicolor/{icon-theme.cache,index.theme}
-	mv "${D}${VM_INSTALL_DIR}"/share/icons "${D}"/usr/share/
-	dodir /usr/share/mime
-	mv "${D}${VM_INSTALL_DIR}"/share/mime/packages "${D}"/usr/share/mime
-	sed -i -e "s:${D}::" "${D}"/usr/share/applications/*.desktop
-
-	# Copy across the temporary /etc/vmware directory
-	dodir /etc/vmware/init.d
-	cp -r "${WORKDIR}"/vmware-confdir/* "${D}/etc/vmware"
-	mv "${D}"/etc/init.d/* "${D}/etc/vmware/init.d"
-	newinitd "${FILESDIR}/${PN}"-2.5.rc vmware
-	touch "${D}"/etc/vmware/networking
-
-	# Setup the path environment
-	insinto /etc/env.d
-	doins "${FILESDIR}/90${PN}"
-
-	# Fix some paths to allow included gtk to work
-	for i in 	"/etc/pango/pangorc" 			\
-				"/etc/pango/pango.modules"		\
-				"/etc/gtk-2.0/gtk.immodules"	\
-				"/etc/gtk-2.0/gdk-pixbuf.loaders" ; do
-		sed -i -e "s:${D}::" "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf${i} ;
-		sed -i -e "s:${D}::" "${D}${VM_INSTALL_DIR}"/lib/vmware/installer/lib/libconf${i} ;
-	done
-
-	# No idea why this happens, but it seems to happen all the time
-	ewarn "The following installation segment takes a *very* long time."
-	ewarn "Please be patient."
-}
-
-pkg_config() {
-	${VM_INSTALL_DIR}/bin/vmware-networks --postinstall ${PN},old,new
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-
-	ewarn "Before you can use vmware-player, you must configure a default
-	network setup."
-	ewarn "You can do this by running 'emerge --config ${PN}'."
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}