Bug 311435

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

3 files changed, 183 insertions, 12 deletions

diff --git a/app-emulation/vmware-player/ChangeLog b/app-emulation/vmware-player/ChangeLog
index 29551232ff1d..00d5077d1363 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/ChangeLog,v 1.80 2010/03/09 11:59:10 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/ChangeLog,v 1.81 2010/04/09 19:48:34 vadimk Exp $
+
+*vmware-player-2.5.3.185404-r1 (09 Apr 2010)
+
+  09 Apr 2010; Vadim Kuznetsov <vadimk@gentoo.org>
+  +vmware-player-2.5.3.185404-r1.ebuild:
+  Bug 311435
 
   09 Mar 2010; Jonathan Callen <abcd@gentoo.org>
   vmware-player-1.0.9.126128.ebuild:
diff --git a/app-emulation/vmware-player/Manifest b/app-emulation/vmware-player/Manifest
index 1addf8ed671b..83714bdcf427 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
@@ -22,13 +19,7 @@ DIST VMware-Player-2.5.3-185404.x86_64.bundle 64357415 RMD160 d5d9e4a9466a5672f4
 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 25694 RMD160 5709c1cae832a91b5970713e92bf1225a6768d7f SHA1 ead257b692760f0ce6972fc7dd31f9f54867701c SHA256 0cadfe81940b85130c3725d6d4004ea546ac1faa25745b78c0a076ae8be09ee7
+MISC ChangeLog 25848 RMD160 a598717266133f2e6ac1de0588da0689ac78d3d6 SHA1 2d8ca9d3d5c705a9ce7f6eb72b5991fffa22610f SHA256 329975da55b68c386cc6d6f0b8af0b974395f1f2d6bf8f2d02014d2b3d308f1a
 MISC metadata.xml 567 RMD160 c0ff8ce9582a8a5a47328014a8d2f0856e40ab34 SHA1 2f687280a7f0fa6c3a83da165e84e2e553b6cce2 SHA256 4cfc81f281a4cdd8d9f75ad60006eed098dabb66bb035f9920ac344d4780151f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuWOBMACgkQOypDUo0oQOr3fwCfadcxic3TKvCfvng1HuC5KiAc
-5fkAoL2e9tHXp1Qy14n4VpX1PgVC80PN
-=PAHy
------END PGP SIGNATURE-----
diff --git a/app-emulation/vmware-player/vmware-player-2.5.3.185404-r1.ebuild b/app-emulation/vmware-player/vmware-player-2.5.3.185404-r1.ebuild
new file mode 100644
index 000000000000..c56222afa645
--- /dev/null
+++ b/app-emulation/vmware-player/vmware-player-2.5.3.185404-r1.ebuild
@@ -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.3.185404-r1.ebuild,v 1.1 2010/04/09 19:48:34 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
+}