Version bump.
authorVadim Kuznetsov <vadimk@gentoo.org>
Sun, 18 Apr 2010 11:49:03 +0000 (11:49 +0000)
committerVadim Kuznetsov <vadimk@gentoo.org>
Sun, 18 Apr 2010 11:49:03 +0000 (11:49 +0000)
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

app-emulation/vmware-player/ChangeLog
app-emulation/vmware-player/Manifest
app-emulation/vmware-player/files/2.5.4.246459/vmware-player-extras.py.patch [new file with mode: 0644]
app-emulation/vmware-player/files/2.5.4.246459/vmware-player.py.patch [new file with mode: 0644]
app-emulation/vmware-player/files/vmware-player-2.5.4.246459-installer.patch [new file with mode: 0644]
app-emulation/vmware-player/vmware-player-2.5.4.246459.ebuild [new file with mode: 0644]

index 00d5077d13636a31e1b824fa52074aa3b3c2f73e..5bea5829196a1d3e0889931af5b62158bf069769 100644 (file)
@@ -1,6 +1,16 @@
 # ChangeLog for app-emulation/vmware-player
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/ChangeLog,v 1.81 2010/04/09 19:48:34 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/ChangeLog,v 1.82 2010/04/18 11:49:02 vadimk Exp $
+
+*vmware-player-2.5.4.246459 (18 Apr 2010)
+
+  18 Apr 2010; Vadim Kuznetsov <vadimk@gentoo.org>
+  +files/vmware-player-2.5.4.246459-installer.patch,
+  +files/2.5.4.246459/vmware-player.py.patch,
+  +files/2.5.4.246459/vmware-player-extras.py.patch,
+  +vmware-player-2.5.4.246459.ebuild:
+  Version bump.
+  http://www.vmware.com/support/player25/doc/releasenotes_player254.html
 
 *vmware-player-2.5.3.185404-r1 (09 Apr 2010)
 
index 83714bdcf42787c959b4acd8be804cb2c900dd1c..d543782aacf48bb8c8833a656e05b8de608340b3 100644 (file)
@@ -6,20 +6,26 @@ AUX 1.0.9.126128/007_all_use-modprobe-over-insmod.patch 445 RMD160 186ab443a7332
 AUX 1.0.9.126128/009_all_init.d-modules-warning.patch 991 RMD160 6205e976db47cd3361b5eca8593414d411a2ab8d SHA1 3742749baa606a57d447931f0af791696a49e660 SHA256 5fbc9f101abb3816a732f64a75e90ce7fcb6783c3cd7bae521d8785e88634498
 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 2.5.4.246459/vmware-player-extras.py.patch 426 RMD160 458d95094d2e47726221ab427486b263b87e4297 SHA1 e41c36cfe150380aceafd1768e9e159fb4e1813f SHA256 1047cdc79d4bc138deaf809f191bdde69c4a5a8ed6ab5b595457a341ecb68abb
+AUX 2.5.4.246459/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.3.185404-installer.patch 2919 RMD160 7921285177ee1238501a95bbab78d100a307674d SHA1 df430803a06ef073a9725b2c86e210c3cc62ceed SHA256 ef63e8d642ae77bf10f22a586c4c37e5c387f76084d71350a9af418d1c5a2858
+AUX vmware-player-2.5.4.246459-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.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-2.5.4-246459.i386.bundle 101120072 RMD160 81fcf4489f790865644457fffd88cfc27e65cf2c SHA1 4c4412c5807ecd00e66886e0e7c43ed61b62aab7 SHA256 c2fe8d107ba28d355e5a5d8604c985c0a4f795ea367b0e9652b4251c474a8f69
+DIST VMware-Player-2.5.4-246459.x86_64.bundle 64397672 RMD160 a5ff1b6382d23cccb3dd3785dfce52ca9c4eb2b6 SHA1 bf7acfdcb44bf345d58f79ad1bcb04816f262d22 SHA256 c2f374a92026893f0b07044c4da51427079064cae17f0eb8681f8e01b8a54e3d
 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 2648 RMD160 acee4b2456d7e19939fa8d947096d16b20d35ac4 SHA1 e4e629df918b8f09fce898ef6dc7f5b6194bb344 SHA256 173a52b3ca1e774f863ad3dd3404a92f48a7da5255ed51c629c9e817058c563a
 EBUILD vmware-player-2.5.3.185404-r1.ebuild 5155 RMD160 459c45e40365af1fba812f20f854acee7aa082a0 SHA1 adb4052dff6ca9ef71a35e740077589bab1572e5 SHA256 e0b5c446b1f83062b6d15430d46417daf4c4a722b2141fb6cae44ce383c655e9
 EBUILD vmware-player-2.5.3.185404.ebuild 4883 RMD160 e16f9f32db126482b4feaffe483697e3ef2bb609 SHA1 536c577d7601ec821af3577b60bb74fe40763eb0 SHA256 d7a9fdd17943c513c95a852ea8eb40916b6718e2ff6cb36ecbfc99b4e0dca932
-MISC ChangeLog 25848 RMD160 a598717266133f2e6ac1de0588da0689ac78d3d6 SHA1 2d8ca9d3d5c705a9ce7f6eb72b5991fffa22610f SHA256 329975da55b68c386cc6d6f0b8af0b974395f1f2d6bf8f2d02014d2b3d308f1a
+EBUILD vmware-player-2.5.4.246459.ebuild 5152 RMD160 c40dd11c35820d8bffb54e5a3ca9b258eabfc187 SHA1 6906cafa396ba6d234bb57e5cff4efba15962910 SHA256 cf8930e8477e62e959df1e22e556bc18ad5ae892d1069558245ddf50e798e93b
+MISC ChangeLog 26222 RMD160 09a31be849dde3eadbbfd3f362d063664428b388 SHA1 9f02776b7d72da8920f7bea39e6db024906caeb9 SHA256 005a4e60db468354f7a5c92870afcc599964340b6e3af331a3b8c902f8e604f5
 MISC metadata.xml 567 RMD160 c0ff8ce9582a8a5a47328014a8d2f0856e40ab34 SHA1 2f687280a7f0fa6c3a83da165e84e2e553b6cce2 SHA256 4cfc81f281a4cdd8d9f75ad60006eed098dabb66bb035f9920ac344d4780151f
diff --git a/app-emulation/vmware-player/files/2.5.4.246459/vmware-player-extras.py.patch b/app-emulation/vmware-player/files/2.5.4.246459/vmware-player-extras.py.patch
new file mode 100644 (file)
index 0000000..eb9e723
--- /dev/null
@@ -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.4.246459/vmware-player.py.patch b/app-emulation/vmware-player/files/2.5.4.246459/vmware-player.py.patch
new file mode 100644 (file)
index 0000000..49306c3
--- /dev/null
@@ -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')
diff --git a/app-emulation/vmware-player/files/vmware-player-2.5.4.246459-installer.patch b/app-emulation/vmware-player/files/vmware-player-2.5.4.246459-installer.patch
new file mode 100644 (file)
index 0000000..80a301e
--- /dev/null
@@ -0,0 +1,64 @@
+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.4.246459.ebuild b/app-emulation/vmware-player/vmware-player-2.5.4.246459.ebuild
new file mode 100644 (file)
index 0000000..98fc697
--- /dev/null
@@ -0,0 +1,174 @@
+# Copyright 1999-2010 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.4.246459.ebuild,v 1.1 2010/04/18 11:49:02 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 )
+       amd64? ( mirror://vmware/software/vmplayer/${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="
+       ~app-emulation/vmware-modules-1.0.0.25
+       dev-cpp/cairomm
+       dev-cpp/libgnomecanvasmm
+       dev-cpp/libsexymm
+       dev-libs/libxml2
+       sys-libs/glibc
+       sys-apps/pciutils
+       >=x11-libs/libview-0.6.2
+       x11-libs/libXcursor
+       x11-libs/libXft
+       x11-libs/libXi
+       x11-libs/libXinerama
+       x11-libs/libXrandr
+       !app-emulation/vmware-server
+       !app-emulation/vmware-workstation
+       "
+
+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
+
+       # Bug 311435
+       mv "${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libxml2.so.2/libxml2.so.2 \
+          "${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libxml2.so.2/libxml2.so.2.old
+       dosym /usr/lib/libxml2.so.2 "${VM_INSTALL_DIR}"/lib/vmware/lib/libxml2.so.2/libxml2.so.2
+
+       # 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
+}
+
+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_prerm() {
+       einfo "Stopping ${product_name} for safe unmerge"
+       /etc/init.d/vmware stop
+}
+
+pkg_postrm() {
+       fdo-mime_desktop_database_update
+       gnome2_icon_cache_update
+}