Bugs 268695, 273750.

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

6 files changed, 198 insertions, 18 deletions

diff --git a/app-emulation/vmware-player/ChangeLog b/app-emulation/vmware-player/ChangeLog
index 4c466fd72654..d21ea9c0381d 100644
--- a/app-emulation/vmware-player/ChangeLog
+++ b/app-emulation/vmware-player/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/vmware-player
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/ChangeLog,v 1.73 2009/05/05 10:42:51 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/ChangeLog,v 1.74 2009/06/14 15:39:14 vadimk Exp $
+
+*vmware-player-2.5.2.156735-r1 (14 Jun 2009)
+
+  14 Jun 2009; Vadim Kuznetsov vadimk@gentoo.org
+  +vmware-player-2.5.2.156735-r1.ebuild, metadata.xml:
+  Bugs 268695, 273750.
 
   05 May 2009; Christian Faulhammer <fauli@gentoo.org>
   vmware-player-2.5.2.156735.ebuild:
diff --git a/app-emulation/vmware-player/Manifest b/app-emulation/vmware-player/Manifest
index 2e1b2ebd9248..24001168f69e 100644
--- a/app-emulation/vmware-player/Manifest
+++ b/app-emulation/vmware-player/Manifest
@@ -1,6 +1,3 @@
------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
@@ -28,13 +25,7 @@ DIST VMware-player-1.0.9-126128.tar.gz 38963760 RMD160 ed54df1e097894f11b7bbce82
 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 cc97feb26475a875d4298e0e0ad98ef2d1f25ee4 SHA1 f1d30a60564d3497816f5d5f27298926040fe91c SHA256 df6640a36edc60e089ed9a1d5b2061654e21cbd2659b623646d3aa398f5ce469
-MISC ChangeLog 24509 RMD160 e2faae7c4465db3cb2384d184012feb72ac4c010 SHA1 0dcc4c8a7cb8c4049d0da01fde4a888ed6d3dae9 SHA256 bb4cfd444e48ab8bb0a22b9018c4ca82eaee315098e38bae5d4da94f39c58c91
-MISC metadata.xml 159 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 SHA1 f46b02a39bcd0165558de67ff4256cfc812418a3 SHA256 8581ae1c90a48f50fa0542c7fb28cb8984baaf12f50fa18f33e467081effb215
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkoAGDMACgkQNQqtfCuFneOOngCfYKSKZ5R4P7SzraUUkfBqekWZ
-lVsAn0mQD1j9SdAKXSTwSmlOxtdk5rbD
-=6O5S
------END PGP SIGNATURE-----
+MISC ChangeLog 24684 RMD160 14c8713fb83fc61b9677689e4dc2064cb173a190 SHA1 ab15eaab7f0029faf808e4bdefb3aeb522584708 SHA256 73cdf887feacb9e88da018a6cc8f27138e00bd32f336f48f3d2ded4caaacba83
+MISC metadata.xml 560 RMD160 474aeb207bf8b2d968949ae350832e8d09e6d8d1 SHA1 bfc620124e161094aa6028082ff2cc053f482f51 SHA256 6f4d5fef6cb81690b981c8cde50dd26eb2854f4750b6c9cd133e504b1f41aa9f
diff --git a/app-emulation/vmware-player/metadata.xml b/app-emulation/vmware-player/metadata.xml
index 3260ec55a8de..11522c02ba57 100644
--- a/app-emulation/vmware-player/metadata.xml
+++ b/app-emulation/vmware-player/metadata.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>vmware</herd>
+	<herd>vmware</herd>
+	<maintainer>
+	    <email>vadimk@g.o</email>
+	</maintainer>
+	<longdescription lang="en">
+		VMware Player - free desktop virtualization software application - makes it 
+		easy to operate any virtual machine created by VMware Workstation, VMware Fusion,
+		VMware Server or VMware ESX, as well as Microsoft Virtual Server virtual
+		machines or Microsoft Virtual PC virtual machines.
+	</longdescription>
 </pkgmetadata>
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
new file mode 100644
index 000000000000..5abf6d6eec4f
--- /dev/null
+++ b/app-emulation/vmware-player/vmware-player-2.5.2.156735-r1.ebuild
@@ -0,0 +1,172 @@
+# 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-server/Manifest b/app-emulation/vmware-server/Manifest
index 51e63eef357c..73031e6588c6 100644
--- a/app-emulation/vmware-server/Manifest
+++ b/app-emulation/vmware-server/Manifest
@@ -26,6 +26,7 @@ DIST VMware-server-2.0.1-156745.x86_64.tar.gz 457559901 RMD160 71ce6f19285c58699
 DIST vmware-server-perl-fixed-rpath-libs.tar.bz2 73834 RMD160 7f64627b5b945e8d7dabe39c165a4b66b71fb4d3 SHA1 9d696750ca3ec92b31ca8112fd80dcd832494044 SHA256 c42299dd033187c67b45b739da66583fbd94cdcba745200b89a25ac96cd9364b
 EBUILD vmware-server-1.0.8.126538.ebuild 2998 RMD160 f44db390c4e54dccf78f77d59b3aa430bc412ef9 SHA1 db86c3ab21c6cf2dbf603383a7fe98f6998f8789 SHA256 b92b97bea08c999656cf5c39a0838d2f6903b4ef36308406bd153144e1af3b25
 EBUILD vmware-server-1.0.9.156507.ebuild 3000 RMD160 fdc85d1654f1de07ab0c8b9eb7701a8dbd1d4a6e SHA1 ae46834bfc88886c5ea5a7675512a8ffe08e6c4c SHA256 f5f55f2fa35b2e1455db958df173a4ea2540f2a92ec05372eeafa4a514e88023
+EBUILD vmware-server-2.0.1.156745-r1.ebuild 2799 RMD160 30c6d30bc70b6871b2dd53b64d6f3023976b0c35 SHA1 658434a9c02ef1d9c4662b8ccb193b048e081675 SHA256 b13140796f0a88af05a1cb24e8c5248c6e18d331cadf3dc76032565dfe14ea00
 EBUILD vmware-server-2.0.1.156745.ebuild 2796 RMD160 c26aac86392b7f94605425a4c497dda153c1d4c3 SHA1 35192867e3da224200a1fd69a2d0dac0c1288c9e SHA256 daf6974b3936487c219ba669acaa1e2a82f661696b92fc909f8e98401dc650c9
-MISC ChangeLog 9936 RMD160 8c953c282322bbb3fc887d29557bfa42dc975de4 SHA1 a7a63d1fdddd51f9e1859a5255ac08bbb19df64b SHA256 ec8a96091ef6f38633f691f2027774bcdd2c38873c96f0a42195b322222f59cb
-MISC metadata.xml 447 RMD160 9388d3ff2a6a57cd7a09f8e935ecbea30a560a2f SHA1 335a602096688579f0bf23888b45db21d05f33d4 SHA256 1a0147ef5d56c4f8a43749d96634b8c7d48776e1c049e01f048b1f0fe2f0813a
+MISC ChangeLog 10101 RMD160 5ec06e91048ea124421504d2f3601c9c2b4c831e SHA1 710247d7c92462e254b666474f76e22c15f22107 SHA256 e2de364b813a0978eb335075fabd9b353b3ca8692881ef07cd377e2b5b16de27
+MISC metadata.xml 444 RMD160 c49905e8be5b5ad0ce15caa202caa23e0cbb0030 SHA1 015f85fcc6f66febfea63700cccebb11afb9214c SHA256 00ee918cfca0e92747f14c4aa95427a1a265958eb53a0a39f44aa4362a1f0400
diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
index 4e0278d65fe6..8efb218ed9e1 100644
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@@ -32,6 +32,7 @@ DIST VMware-workstation-5.5.9-126128.tar.gz 111649803 RMD160 a5a867761d36c9a0282
 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
+EBUILD vmware-workstation-6.5.2.156735-r1.ebuild 5341 RMD160 4c93fd0a4dfb8c1193a783e87f516bb1638abebb SHA1 e8bfae56020632fb2f7b2d118a10b00a8e7db7b4 SHA256 d676560d3b8c71f85b64e37dfcd547d9f7839642ba49cc70f0214be2005dedef
 EBUILD vmware-workstation-6.5.2.156735.ebuild 5517 RMD160 a9dabc119d1efe061581a41ea5f5d478b8c48e65 SHA1 42bbf8b2689c25b0db8f2b9ccae2f7b4be5411f0 SHA256 f69ced5903e0c87cb3c8cce23cae6b4df14d423ef8d50c3b4fef0bce09a1b6b5
-MISC ChangeLog 33132 RMD160 30af8a5f2a7deae498ef86755131d8ba94d0106e SHA1 127eb9f491e578a925b5339cc7512535e88b56a9 SHA256 55ee38fb1cd99fcef3cc855f8f23cfa8a680c04f0fe0646dff66b61819f5f925
-MISC metadata.xml 339 RMD160 9f4931e525280fd376eb7ac3e42c369acd23a33e SHA1 3948dcc9a9b7dc585f1783e0419b313084a231c0 SHA256 bb60a871a58964feaa59ec824a5d511455054461f0394a57a8c9ca019a0f4593
+MISC ChangeLog 33307 RMD160 fb2217af9583182b554af7a438bbb4979584706d SHA1 0059fc2a6aa4e916ee8a8f2cdc239593f135e795 SHA256 27ca09828dd154e3f68a0d13849b4ce8a52494e45a51b0acfaefc279fc98871d
+MISC metadata.xml 404 RMD160 fd4d022b46d0c41bd0d5a4b38d35b93b63c772e8 SHA1 a6ffa1df12caadd8813394eaaf4452c707f447cd SHA256 4988d14588e1a2c647efba5d4b75013cdec700306b9e1f87f0fc3ea651d795ca