Version bump vmware-workstation to 6.5.2.156735.

Package-Manager: portage-2.2_rc28/cvs/Linux i686

4 files changed, 262 insertions, 5 deletions

diff --git a/app-emulation/vmware-workstation/ChangeLog b/app-emulation/vmware-workstation/ChangeLog
index b6897d8f5fa7..db5bf4eaaa44 100644
--- a/app-emulation/vmware-workstation/ChangeLog
+++ b/app-emulation/vmware-workstation/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-emulation/vmware-workstation
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.198 2009/03/25 10:14:37 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.199 2009/04/06 21:24:11 ikelos Exp $
+
+*vmware-workstation-6.5.2.156735 (06 Apr 2009)
+
+  06 Apr 2009; Mike Auty <ikelos@gentoo.org>
+  +files/6.5.2.156735/vmware-player.py.patch,
+  +files/6.5.2.156735/vmware-vix.py.patch,
+  +files/vmware-workstation-6.5.2.156735-installer.patch,
+  +files/6.5.2.156735/vmware-player-extras.py.patch,
+  +files/6.5.2.156735/vmware-workstation.py.patch,
+  +vmware-workstation-6.5.2.156735.ebuild:
+  Version bump vmware-workstation to 6.5.2.156735.
 
   25 Mar 2009; Mike Auty <ikelos@gentoo.org>
   vmware-workstation-6.5.1.126130.ebuild:
diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
index 562aac1dd0ba..89767989d6b8 100644
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@@ -11,6 +11,10 @@ AUX 6.5.1.126130/vmware-player-extras.py.patch 426 RMD160 458d95094d2e47726221ab
 AUX 6.5.1.126130/vmware-player.py.patch 2936 RMD160 6b9957799b3571f5382975c4d78bc3db7d16e666 SHA1 b32f9e4c2d2213872a7d8f88754a8552b113567f SHA256 fa711634a038d313769cf5d5180ca96bfb3ba18f392f6c0dd0672a4b4f7d6c9c
 AUX 6.5.1.126130/vmware-vix.py.patch 439 RMD160 88e318b81efa5340830f1d9a65112ce2d23d0335 SHA1 ca84dacd405f675f31f2da5bea7cdf5d7d988739 SHA256 ad41ae4a4a580fa3b6f7ebd1d04d6e7885c3fb5695d5675ed168ce29925dbded
 AUX 6.5.1.126130/vmware-workstation.py.patch 948 RMD160 5ee87ba02c4bb50af44eb495ab72e1f148ff84ae SHA1 33b32bdbba9ec6115ea5d44080682ed789a7766b SHA256 4e9a01f8072a1294c0d5631daee703ea183e5a8edb6400f49deddd2b96bb2dc2
+AUX 6.5.2.156735/vmware-player-extras.py.patch 426 RMD160 458d95094d2e47726221ab427486b263b87e4297 SHA1 e41c36cfe150380aceafd1768e9e159fb4e1813f SHA256 1047cdc79d4bc138deaf809f191bdde69c4a5a8ed6ab5b595457a341ecb68abb
+AUX 6.5.2.156735/vmware-player.py.patch 2936 RMD160 6b9957799b3571f5382975c4d78bc3db7d16e666 SHA1 b32f9e4c2d2213872a7d8f88754a8552b113567f SHA256 fa711634a038d313769cf5d5180ca96bfb3ba18f392f6c0dd0672a4b4f7d6c9c
+AUX 6.5.2.156735/vmware-vix.py.patch 439 RMD160 88e318b81efa5340830f1d9a65112ce2d23d0335 SHA1 ca84dacd405f675f31f2da5bea7cdf5d7d988739 SHA256 ad41ae4a4a580fa3b6f7ebd1d04d6e7885c3fb5695d5675ed168ce29925dbded
+AUX 6.5.2.156735/vmware-workstation.py.patch 948 RMD160 5ee87ba02c4bb50af44eb495ab72e1f148ff84ae SHA1 33b32bdbba9ec6115ea5d44080682ed789a7766b SHA256 4e9a01f8072a1294c0d5631daee703ea183e5a8edb6400f49deddd2b96bb2dc2
 AUX 90vmware-workstation 106 RMD160 471fb03d54bb48c651d4543f1c8ece1bb9b40c0a SHA1 3db7ec2a3b37a84328bf3d481a58b42499ef520b SHA256 c8f7143551f516b901143e60fc74e822ca3d235477d1c2a135bb36cbc639cf1e
 AUX helpers/module_patcher.sh 174 RMD160 0b2d1ee14443ec188546b090ae2c5e6efd132026 SHA1 f00ea5d03430be4969834bda822ed2865ef6e079 SHA256 1e63240f7e21e119c8e0b083f540fdde83fc22d781f3abe43927713a464898ea
 AUX helpers/unbundler.sh 1828 RMD160 d5bb43628d105c4372fa1fe7e7ebac29300fa91f SHA1 ed4b2645369b63e1cb6e322d412eb2ede1cbbdcd SHA256 4e71dd96f5136c1eb98be5e1184b9ec48ed9ac7935fa1defd94d501cef05eb78
@@ -18,22 +22,26 @@ AUX helpers/vmware-config.sh 497 RMD160 04addab6d99bf2c984f855a97b935ca8e0e584d8
 AUX vmware-player.desktop 599 RMD160 a5a9897671da69c4706ba412d9a041edfd13a9b7 SHA1 12af70f7039b19838e298d1949df28b1b8d407a6 SHA256 b967f2e6dba531613498a2dea130f557fc366e869876aa63ba3ae97f5ff59c54
 AUX vmware-workstation-6.5.0.118166-installer.patch 2919 RMD160 7921285177ee1238501a95bbab78d100a307674d SHA1 df430803a06ef073a9725b2c86e210c3cc62ceed SHA256 ef63e8d642ae77bf10f22a586c4c37e5c387f76084d71350a9af418d1c5a2858
 AUX vmware-workstation-6.5.1.126130-installer.patch 2919 RMD160 7921285177ee1238501a95bbab78d100a307674d SHA1 df430803a06ef073a9725b2c86e210c3cc62ceed SHA256 ef63e8d642ae77bf10f22a586c4c37e5c387f76084d71350a9af418d1c5a2858
+AUX vmware-workstation-6.5.2.156735-installer.patch 2919 RMD160 7921285177ee1238501a95bbab78d100a307674d SHA1 df430803a06ef073a9725b2c86e210c3cc62ceed SHA256 ef63e8d642ae77bf10f22a586c4c37e5c387f76084d71350a9af418d1c5a2858
 AUX vmware-workstation-6.5.rc 1444 RMD160 8d3cb79bdcb48fb944615279e741146c36792bc2 SHA1 bd2784708b998c894dfdf661295b3e1708ce47fa SHA256 4636d8dbcb4f263d49769f7fb7c7f8945355f0bb2e858f4fd4aa96dff87d3dd1
 AUX vmware-workstation.desktop 605 RMD160 256b59a1e52b65279ef38b3dcf52c43a34090807 SHA1 8f8c1fded85070be0532e33f1bdc05425e33bfb1 SHA256 ae2f572200a16a1e1222e282268ae138588c0e7576045a584c1d17f54f379f3e
 AUX vmware-workstation.rc 1862 RMD160 000c71ee5c62edc27d3df3f23286e1fe8490516e SHA1 cf1db60598d0d2fe44260f7387537ec1babf3a52 SHA256 76e6ea8c199a4dced79a75a0346360714941ef192b61e4610c6229e071d64782
 AUX vmware-workstation.xml 1592 RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e8c SHA1 02db2ee7ca0abb8b8793c9f56d858bb08c1c715f SHA256 56aafee80ad705e8d832f8853c36d763d37b87d1cb132a41c50eb63085ae854d
 DIST VMware-Workstation-6.5.1-126130.i386.bundle 395045565 RMD160 b06aacfa606a1e37ac0d1da43286c87e561f7a6c SHA1 d331b278c1e159ad21e261bdad4a0e03bbe22701 SHA256 3945172a5420f96b4a53d125cc0835ea1919a7c5b370e71e7d76297d7c7fcb6f
 DIST VMware-Workstation-6.5.1-126130.x86_64.bundle 361697489 RMD160 30762c062ef2f68d60240fb55163b20d3769b2ac SHA1 03fd6fcf3ab55f8f465d04bb6348ea8323a71be9 SHA256 31f6cc9abbad715ebf9f8e9938871dd0f35eaa92b21b5b2f46c4396537dfa2b0
+DIST VMware-Workstation-6.5.2-156735.i386.bundle 352992724 RMD160 0ad7fb8c037046ffd2192670a270f519ab6df328 SHA1 d508111adf479d82049c323b1d0b82200c0ab4dd SHA256 89f3330fd208382f41f30bf335e3205f256447d8baf2bdb3bf67ae79bbff4220
+DIST VMware-Workstation-6.5.2-156735.x86_64.bundle 356786849 RMD160 13d31a25a1a8008964df65ea2fd722226bca19e1 SHA1 04aa442a2b9bf2c67d6266a410b20ef146b93bef SHA256 aa11e961519488254a4df2287aaba6183c9db711663de36fa7efe64b789febec
 DIST VMware-workstation-5.5.9-126128.tar.gz 111649803 RMD160 a5a867761d36c9a02821f8dd639a95b8c9ab38bc SHA1 eb8786111a74213ea4ec24636a4ba70b7f5dc741 SHA256 71a062e29480a48647c7323883e4e4b43a9365c1bb70000a23b768647db46444
 DIST vmware-any-any-update115.tar.gz 493641 RMD160 56cabe56f70c01a22a7671e861cc5a2df19855c7 SHA1 ff9b6fdf6ca74495eb5f4822a1854fc91185377c SHA256 b1c14fa9514663b85c2efe8331407e71cce96e5a21a8b941fa570c960bbdcaa1
 EBUILD vmware-workstation-5.5.9.126128.ebuild 3250 RMD160 3b2bca708a25da65badac4df9ab22bddd3b942b2 SHA1 8b8c90fac9d18e5d6424007be0ac63ec61ef1855 SHA256 417d5c1dabc7cc974e0ca64f431b0bc659919e4cc4d2b04003430238bbfb3534
 EBUILD vmware-workstation-6.5.1.126130.ebuild 5336 RMD160 9843dfa41757ef83b02acc328d1233dc81378a22 SHA1 b4cf5f74f24a81f92aa9f7ee1536d988bd7721d5 SHA256 c18342ea301c0db0b9342403451f63d6cecbd85267c50b717745fa1286fa87b1
-MISC ChangeLog 32012 RMD160 a7d39d62fe370b7193ced0f81caa3c785efbb615 SHA1 3fa06ab405593e59559765097cfc3ba47a57a72e SHA256 0a420a818c05048f31dc966513c3ae8fff393873225a4f5c5bbe895c946b7734
+EBUILD vmware-workstation-6.5.2.156735.ebuild 5330 RMD160 ab328495bc4fc075053cba5c3166075703986e92 SHA1 8c31b395f1ef4f3472bc0b9196eef9fbf163562e SHA256 d8854d733cdef85ed6f83ca63ff43e48847b23449d3e0645f1c774ce1b585ee1
+MISC ChangeLog 32451 RMD160 9b3b585a46cdaf46f1dd189dfdaf5b1b32a04ca3 SHA1 e2396fac0bf6e26439c39b33748b029b38a84a5e SHA256 2fac6780f8fafd1b838831b36cc1f37cf02b3a974c66f8debd072af140614eaa
 MISC metadata.xml 339 RMD160 9f4931e525280fd376eb7ac3e42c369acd23a33e SHA1 3948dcc9a9b7dc585f1783e0419b313084a231c0 SHA256 bb60a871a58964feaa59ec824a5d511455054461f0394a57a8c9ca019a0f4593
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAknKBC0ACgkQu7rWomwgFXp34QCfbB0YS5ykmL8JFNYa0If5f+WT
-4sQAn1dOcasCJSM2EXHwjvIKk+45m68t
-=vp7s
+iEYEARECAAYFAknaczEACgkQu7rWomwgFXpxwgCgpoI/6LF2doW1CwAf3ys//639
+/HIAn12U7I/4tfGDVRpnw+etXqjDalaS
+=yZEZ
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/vmware-workstation/files/vmware-workstation-6.5.2.156735-installer.patch b/app-emulation/vmware-workstation/files/vmware-workstation-6.5.2.156735-installer.patch
new file mode 100644
index 000000000000..80a301e5c183
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/vmware-workstation-6.5.2.156735-installer.patch
@@ -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-workstation/vmware-workstation-6.5.2.156735.ebuild b/app-emulation/vmware-workstation/vmware-workstation-6.5.2.156735.ebuild
new file mode 100644
index 000000000000..5cda0962c275
--- /dev/null
+++ b/app-emulation/vmware-workstation/vmware-workstation-6.5.2.156735.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-6.5.2.156735.ebuild,v 1.1 2009/04/06 21:24:11 ikelos Exp $
+
+inherit eutils versionator fdo-mime gnome2-utils
+
+MY_PN="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/products/desktop/ws_features.html"
+SRC_URI="
+	x86? (
+		mirror://vmware/software/wkst/${MY_PN}.i386.bundle
+		http://download.softpedia.ro/linux/${MY_PN}.i386.bundle )
+	amd64? (
+		mirror://vmware/software/wkst/${MY_PN}.x86_64.bundle
+		http://download.softpedia.ro/linux/${MY_PN}.x86_64.bundle )
+	"
+
+LICENSE="vmware"
+SLOT="0"
+KEYWORDS="-* ~x86 ~amd64"
+IUSE=""
+RESTRICT="strip fetch binchecks"
+PROPERTIES="interactive"
+
+# 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/libXft
+	>=x11-libs/libview-0.6.2
+	dev-cpp/libsexymm
+	dev-cpp/cairomm
+	dev-cpp/libgnomecanvasmm
+	!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-fs/fuse
+	sys-apps/pciutils"
+
+S=${WORKDIR}/vmware-distrib
+VM_INSTALL_DIR="/opt/vmware/workstation"
+
+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}"-6.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
+}