version bump

(Portage version: 2.1.9.44/cvs/Linux x86_64)

7 files changed, 328 insertions, 1 deletions

diff --git a/app-emulation/vmware-player/ChangeLog b/app-emulation/vmware-player/ChangeLog
index f8a30e0e39cf..dc0503ff5f9e 100644
--- a/app-emulation/vmware-player/ChangeLog
+++ b/app-emulation/vmware-player/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/vmware-player
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/ChangeLog,v 1.90 2011/03/16 13:28:23 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/ChangeLog,v 1.91 2011/03/27 15:23:48 vadimk Exp $
+
+*vmware-player-3.1.3.324285 (27 Mar 2011)
+
+  27 Mar 2011; Vadim Kuznetsov <vadimk@gentoo.org> +files/config-3.0,
+  +files/vmware-3.0.rc, +vmware-player-3.1.3.324285.ebuild,
+  +files/list-bundle-components.xsl, +files/list-component-files.xsl:
+  Bug 290831. Version bump. Thanks Matt Whitlock and all, all, et al.
 
   16 Mar 2011; Vadim Kuznetsov <vadimk@gentoo.org>
   -files/1.0.9.126128/000_all_initd-location.patch,
diff --git a/app-emulation/vmware-player/files/config-3.0 b/app-emulation/vmware-player/files/config-3.0
new file mode 100644
index 000000000000..cc83931d70bf
--- /dev/null
+++ b/app-emulation/vmware-player/files/config-3.0
@@ -0,0 +1,10 @@
+VMCI_CONFED = "yes"
+NETWORKING = "yes"
+initscriptdir = "/etc/init.d"
+VMBLOCK_CONFED = "yes"
+authd.fullpath = "@@VM_INSTALL_DIR@@/sbin/vmware-authd"
+gksu.rootMethod = "su"
+VSOCK_CONFED = "yes"
+libdir = "@@VM_INSTALL_DIR@@/lib/vmware"
+bindir = "@@VM_INSTALL_DIR@@/bin"
+product.buildNumber = "@@BUILD_NUMBER@@"
diff --git a/app-emulation/vmware-player/files/list-bundle-components.xsl b/app-emulation/vmware-player/files/list-bundle-components.xsl
new file mode 100644
index 000000000000..db1a4e4f6602
--- /dev/null
+++ b/app-emulation/vmware-player/files/list-bundle-components.xsl
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+	<xsl:output omit-xml-declaration="yes"/>
+
+	<xsl:template match="text()"/>
+
+	<xsl:template match="/bundle/components/component">
+		<xsl:value-of select="@offset"/>
+		<xsl:text> </xsl:text>
+		<xsl:value-of select="@size"/>
+		<xsl:text> </xsl:text>
+		<xsl:value-of select="@name"/>
+		<xsl:text>&#10;</xsl:text>
+	</xsl:template>
+
+</xsl:stylesheet>
diff --git a/app-emulation/vmware-player/files/list-component-files.xsl b/app-emulation/vmware-player/files/list-component-files.xsl
new file mode 100644
index 000000000000..91c6152fa21b
--- /dev/null
+++ b/app-emulation/vmware-player/files/list-component-files.xsl
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+	<xsl:output omit-xml-declaration="yes"/>
+
+	<xsl:template match="text()"/>
+
+	<xsl:template match="/component/fileset/file">
+		<xsl:value-of select="@offset"/>
+		<xsl:text> </xsl:text>
+		<xsl:value-of select="@compressedSize"/>
+		<xsl:text> </xsl:text>
+		<xsl:value-of select="@uncompressedSize"/>
+		<xsl:text> </xsl:text>
+		<xsl:value-of select="@path"/>
+		<xsl:text>&#10;</xsl:text>
+	</xsl:template>
+
+</xsl:stylesheet>
diff --git a/app-emulation/vmware-player/files/vmware-3.0.rc b/app-emulation/vmware-player/files/vmware-3.0.rc
new file mode 100644
index 000000000000..4b524dc5e16a
--- /dev/null
+++ b/app-emulation/vmware-player/files/vmware-3.0.rc
@@ -0,0 +1,33 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/files/vmware-3.0.rc,v 1.1 2011/03/27 15:23:48 vadimk Exp $
+
+depend() {
+	need localmount
+	use net 
+}
+
+start() {
+	ebegin Starting VMware USB Arbitrator
+	#start-stop-daemon --start --exec @@BINDIR@@/vmware-usbarbitrator
+	@@BINDIR@@/vmware-usbarbitrator 
+	eend $?
+	ebegin Starting VMware services
+	modprobe -a vmmon vmci vsock vmblock vmnet 
+	eend $?
+	@@BINDIR@@/vmware-networks --start
+	eend $?
+}
+
+stop() {
+	ebegin Stopping VMware USB Arbitrator
+	#start-stop-daemon --stop --exec @@BINDIR@@/vmware-usbarbitrator
+	killall --wait @@BINDIR@@/vmware-usbarbitrator 
+	eend $?
+	@@BINDIR@@/vmware-networks --stop 
+	eend $?
+	ebegin Stopping VMware services
+	modprobe -r vsock vmci vmmon vmblock vmnet
+	eend $?
+}
diff --git a/app-emulation/vmware-player/metadata.xml b/app-emulation/vmware-player/metadata.xml
index fffe0eea11aa..a2358d06228d 100644
--- a/app-emulation/vmware-player/metadata.xml
+++ b/app-emulation/vmware-player/metadata.xml
@@ -3,6 +3,10 @@
 <pkgmetadata>
 	<herd>vmware</herd>
 	<maintainer>
+	    <email>matt@whitlock.name</email>
+		<name>Matt Whitlock</name>
+	</maintainer>
+	<maintainer>
 	    <email>vadimk@gentoo.org</email>
 	</maintainer>
 	<longdescription lang="en">
@@ -11,4 +15,8 @@
 		VMware Server or VMware ESX, as well as Microsoft Virtual Server virtual
 		machines or Microsoft Virtual PC virtual machines.
 	</longdescription>
+    <use>
+		<flag name="vmware-tools">Install VMware Tools images</flag>
+	</use>
+
 </pkgmetadata>
diff --git a/app-emulation/vmware-player/vmware-player-3.1.3.324285.ebuild b/app-emulation/vmware-player/vmware-player-3.1.3.324285.ebuild
new file mode 100644
index 000000000000..4592291b268c
--- /dev/null
+++ b/app-emulation/vmware-player/vmware-player-3.1.3.324285.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/vmware-player-3.1.3.324285.ebuild,v 1.1 2011/03/27 15:23:48 vadimk Exp $
+
+EAPI="2"
+
+inherit eutils versionator fdo-mime gnome2-utils vmware-bundle
+
+MY_PN="VMware-Player"
+MY_PV="$(replace_version_separator 3 - $PV)"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
+HOMEPAGE="http://www.vmware.com/products/player/"
+SRC_URI="
+	x86? ( ${MY_P}.i386.bundle )
+	amd64? ( ${MY_P}.x86_64.bundle )
+	"
+
+LICENSE="vmware"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="doc +vmware-tools"
+RESTRICT="binchecks fetch strip"
+
+# vmware-workstation should not use virtual/libc as this is a
+# precompiled binary package thats linked to glibc.
+RDEPEND="dev-cpp/cairomm
+	dev-cpp/glibmm
+	dev-cpp/gtkmm
+	dev-cpp/libgnomecanvasmm
+	dev-cpp/libsexymm
+	dev-cpp/pangomm
+	dev-libs/atk
+	dev-libs/glib
+	dev-libs/libaio
+	dev-libs/libsigc++
+	dev-libs/libxml2
+	=dev-libs/openssl-0.9.8*
+	dev-libs/xmlrpc-c
+	gnome-base/libgnomecanvas
+	gnome-base/libgtop
+	gnome-base/librsvg
+	gnome-base/orbit
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libart_lgpl
+	=media-libs/libpng-1.2*
+	net-misc/curl
+	sys-devel/gcc
+	sys-fs/fuse
+	sys-libs/glibc
+	sys-libs/zlib
+	x11-libs/cairo
+	x11-libs/gtk+
+	x11-libs/libgksu
+	x11-libs/libICE
+	x11-libs/libsexy
+	x11-libs/libSM
+	>=x11-libs/libview-0.6.6
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXft
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango
+	x11-libs/startup-notification
+	!app-emulation/vmware-server
+	!app-emulation/vmware-workstation"
+PDEPEND="~app-emulation/vmware-modules-238.3
+	vmware-tools? ( app-emulation/vmware-tools )"
+
+S=${WORKDIR}/vmware-player-app
+VM_INSTALL_DIR="/opt/vmware"
+
+pkg_nofetch() {
+	local bundle
+
+	if use x86; then
+		bundle="${MY_P}.i386.bundle"
+	elif use amd64; then
+		bundle="${MY_P}.x86_64.bundle"
+	fi
+
+	einfo "Please download ${bundle}"
+	einfo "from ${HOMEPAGE}"
+	einfo "and place it in ${DISTDIR}"
+}
+
+src_unpack() {
+	vmware-bundle_extract-bundle-component "${DISTDIR}/${A}" vmware-player-app
+}
+
+src_prepare() {
+	rm -f bin/vmware-modconfig
+	rm -rf lib/modules/binary
+
+	# remove superfluous libraries
+	ebegin 'Removing superfluous libraries'
+	cd lib/lib || die
+	# exclude OpenSSL from unbundling until the AES-NI patch gets into the tree
+	# see http://forums.gentoo.org/viewtopic-t-835867.html
+	ldconfig -p | sed 's:^\s\+\([^(]*[^( ]\).*=> /.*$:\1:g;t;d' | fgrep -vx 'libcrypto.so.0.9.8
+libssl.so.0.9.8' | xargs -d'\n' -r rm -rf
+	eend
+}
+
+src_install() {
+	local major_minor_revision=$(get_version_component_range 1-3 "${PV}")
+	local build=$(get_version_component_range 4 "${PV}")
+
+	# install the binaries
+	into "${VM_INSTALL_DIR}"
+	dobin bin/* || die "failed to install bin"
+	dosbin sbin/* || die "failed to install sbin"
+
+	# install the libraries
+	insinto "${VM_INSTALL_DIR}"/lib/vmware
+	doins -r lib/* || die "failed to install lib"
+
+	# commented out until Portage gets OpenSSL 0.9.8 with AES-NI support
+	# see http://forums.gentoo.org/viewtopic-t-835867.html
+	## these two libraries do not like to load from /usr/lib*
+	#local each ; for each in libcrypto.so.0.9.8 libssl.so.0.9.8 ; do
+	#	if [[ ! -f "${VM_INSTALL_DIR}/lib/vmware/lib/${each}" ]] ; then
+	#		dosym "/usr/$(get_libdir)/${each}" \
+	#			"${VM_INSTALL_DIR}/lib/vmware/lib/${each}/${each}"
+	#	fi
+	#done
+
+	# install the ancillaries
+	insinto /usr
+	doins -r share || die "failed to install share"
+
+	# install documentation
+	if use doc; then
+		dodoc doc/* || die "failed to install docs"
+	fi
+
+	# create symlinks for the various tools
+	local tool ; for tool in vmplayer{,-daemon} \
+			vmware-{acetool,unity-helper,modconfig{,-console},gksu,fuseUI} ; do
+		dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}" || die
+	done
+	dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer "${VM_INSTALL_DIR}"/bin/vmplayer || die
+
+	# fix up permissions
+	chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware/{bin/*,lib/wrapper-gtk24.sh}
+	chmod 04711 "${D}${VM_INSTALL_DIR}"/sbin/vmware-authd
+	chmod 04711 "${D}${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx*
+
+	# create the environment
+	local envd="${T}/90vmware"
+	cat > "${envd}" <<-EOF
+		PATH='${VM_INSTALL_DIR}/bin'
+		ROOTPATH='${VM_INSTALL_DIR}/bin'
+	EOF
+	doenvd "${envd}" || die
+
+	# create the configuration
+	dodir /etc/vmware || die
+
+	cat > "${D}"/etc/vmware/bootstrap <<-EOF
+		BINDIR='${VM_INSTALL_DIR}/bin'
+		LIBDIR='${VM_INSTALL_DIR}/lib'
+	EOF
+
+	cat > "${D}"/etc/vmware/config <<-EOF
+		bindir = "${VM_INSTALL_DIR}/bin"
+		libdir = "${VM_INSTALL_DIR}/lib/vmware"
+		initscriptdir = "/etc/init.d"
+		authd.fullpath = "${VM_INSTALL_DIR}/sbin/vmware-authd"
+		gksu.rootMethod = "su"
+		VMCI_CONFED = "yes"
+		VMBLOCK_CONFED = "yes"
+		VSOCK_CONFED = "yes"
+		NETWORKING = "yes"
+		player.product.version = "${major_minor_revision}"
+		product.buildNumber = "${build}"
+	EOF
+
+	# install the init.d script
+	local initscript="${T}/vmware.rc"
+
+	sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
+		"${FILESDIR}/vmware-3.0.rc" > "${initscript}" || die
+	newinitd "${initscript}" vmware || die
+
+	# fill in variable placeholders
+	sed -e "s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g" \
+		-i "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}} || die
+	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \
+		-i "${D}/usr/share/applications/${PN}.desktop" || die
+}
+
+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 "/etc/env.d was updated. Please run:"
+	ewarn "env-update && source /etc/profile"
+	ewarn ""
+	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 ${PN} for safe unmerge"
+	/etc/init.d/vmware stop
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}