public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-workstation/files/, app-emulation/vmware-workstation/
@ 2015-07-10 23:17 Evan Teran
  0 siblings, 0 replies; 3+ messages in thread
From: Evan Teran @ 2015-07-10 23:17 UTC (permalink / raw
  To: gentoo-commits

commit:     37995188eb8033a27494e53505bc3d2aaed3e2da
Author:     Evan Teran <evan.teran <AT> gmail <DOT> com>
AuthorDate: Mon Jul  6 03:22:17 2015 +0000
Commit:     Evan Teran <evan.teran <AT> gmail <DOT> com>
CommitDate: Mon Jul  6 03:22:17 2015 +0000
URL:        https://gitweb.gentoo.org/proj/vmware.git/commit/?id=37995188

ebuild for vmware workstation 11.1 shoudl work on kernels 3.10 - 4.0

Package-Manager: portage-2.2.20

 app-emulation/vmware-workstation/Manifest          |   1 +
 .../vmware-workstation/files/vmware-11.0.rc        |  44 ++
 .../vmware-workstation-11.1.0.2496824.ebuild       | 497 +++++++++++++++++++++
 3 files changed, 542 insertions(+)

diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
index ac896a7..69b6166 100644
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@@ -2,4 +2,5 @@ DIST VMware-Workstation-10.0.2-1744117.i386.bundle.tar 283658240 SHA256 3b8fcdf6
 DIST VMware-Workstation-10.0.2-1744117.x86_64.bundle.tar 254115840 SHA256 95986090a4f2f59ae551a63a78f9ff5bdc3a87c48b25b10abb754720c3581f02 SHA512 69ede2f67e3283a3b234605ca5aa05555da008917d6b329ab6ca27f578620b6268ec79622b4fc5c331111f527fcac917dd78a844ad2ff4bbd0149aa4dbb7755d WHIRLPOOL 42117a4bb6184629ec2e8c13c39f3298c746a4fa10b0928cee3ccd1c3e4464af95f59c7ff0f71c44184d25cc91e593cbb40fd050275ee1e66b308010fc907a17
 DIST VMware-Workstation-10.0.5-2443746.i386.bundle.tar 283392000 SHA256 993af797b37fcd86345f509b92a64e8425ddeab76d730dfe3a0ddbf42be583c8 SHA512 f1d1d3b293d69f1b0727272c6f2437ad33642e9f96a098057cbcc85e8d63cdd03d440aa1dee199ab7ee9f1255b69821bdb93d2d2b6dd86f6e4b4110bb50631a9 WHIRLPOOL 139e6005ffb2a839d4ce3588280ed2e5fb8b36061fb3a8868695131805e6aaac462474ba3b38eca653dacc3552acf8fb40aed97d2dd272c18230c3c461d0b479
 DIST VMware-Workstation-10.0.5-2443746.x86_64.bundle.tar 254208000 SHA256 4c8edbc4936977e36dfdcb4e6f4efb3ad0d2d4b8586c82562f3122fc0c1f3b06 SHA512 73265b4c2e88578b132eb67c985b9e12e9bf34af7c5d23060cd8596123bee82da9e3a27ca63477cbf467185767b93a71392a4d1c493be6f1a9303bed2601631c WHIRLPOOL 333e7fafb753740a990b395340a646bad1062ba30cae92f98c81281012f4d2713ed4ae9fb0ce98361d142a69148cc644637d61241e583a391c524a2c18f54ae3
+DIST VMware-Workstation-11.1.0-2496824.x86_64.bundle.tar 259112960 SHA256 bad9d8e223a2d7be07965c6dfc1dc450c996d4d447c500a7c874b85fc731d6c1 SHA512 78de89be8943f8ee99fae048047047f98ae44ee3bbb6dabd550726af864c61b0824a72b5ad91120cab0115d91fa036908d182518fcbd1b68b9a78caeb18ebc33 WHIRLPOOL 77807b5139eef194233bca608c888cec81a40b3fda1c08fb31a39bd24133ac58f700b6b84fd50207b9a47184a72a86e00cf00c74b13523c05b069b3dc089b34b
 DIST gentoo-01.tar.gz 1884 SHA256 e92c694865f1b29f4d7a39efa1dd87bc71dc5f922573f00a3d31ee8e27a8c335 SHA512 454ab93997781bd0a9accddb2ac7bb446f07ea7cddef5640369025c30e03592e14869e0f0f7b4457db2f1ada31c98051426016c86201afa8bc8e3aa4ccc2f875 WHIRLPOOL 9202583b617532ab2612b384da307218e7c93c2962f0d233e28bea066b07163c9bc51c0a599309f9d703c5575ebeb292d787716225624dc1c2fdff3c44fa3513

diff --git a/app-emulation/vmware-workstation/files/vmware-11.0.rc b/app-emulation/vmware-workstation/files/vmware-11.0.rc
new file mode 100644
index 0000000..2a827bc
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/vmware-11.0.rc
@@ -0,0 +1,44 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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
+	
+	# quiet for vmci because it may not be there
+	modprobe -vq vmci || modprobe -v vmw_vmci
+	eend $?
+	
+	# vmci or vmw_vmci was loaded by the previous modprobe 
+	# no need to do it here
+	modprobe -av vmmon 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 -rv vsock vmmon vmblock vmnet
+	eend $?
+	
+	# quiet for vmci because it may not be there
+	modprobe -rvq vmci || modprobe -rv vmw_vmci
+	eend $?
+}

diff --git a/app-emulation/vmware-workstation/vmware-workstation-11.1.0.2496824.ebuild b/app-emulation/vmware-workstation/vmware-workstation-11.1.0.2496824.ebuild
new file mode 100644
index 0000000..c54501b
--- /dev/null
+++ b/app-emulation/vmware-workstation/vmware-workstation-11.1.0.2496824.ebuild
@@ -0,0 +1,497 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit eutils versionator fdo-mime systemd gnome2-utils pam vmware-bundle
+
+MY_PN="VMware-Workstation"
+MY_PV=$(get_version_component_range 1-3)
+PV_MINOR=$(get_version_component_range 3)
+PV_BUILD=$(get_version_component_range 4)
+MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}"
+
+SYSTEMD_UNITS_TAG="gentoo-01"
+
+DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
+HOMEPAGE="http://www.vmware.com/products/workstation/"
+BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/ws/${MY_PV}/${PV_BUILD}/linux/core/"
+SRC_URI="
+	amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar )
+	https://github.com/akhuettel/systemd-vmware/archive/${SYSTEMD_UNITS_TAG}.tar.gz
+	"
+LICENSE="vmware GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="cups doc ovftool server vix vmware-tools"
+RESTRICT="mirror 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:2
+	dev-cpp/gtkmm:2.4
+	dev-cpp/libgnomecanvasmm
+	dev-cpp/pangomm
+	dev-libs/atk
+	dev-libs/glib:2
+	dev-libs/icu
+	dev-libs/expat
+	dev-libs/libaio
+	=dev-libs/libgcrypt-1.5*
+	dev-libs/libsigc++
+	dev-libs/libxml2
+	dev-libs/openssl:0.9.8
+	dev-libs/xmlrpc-c
+	gnome-base/libgnomecanvas
+	gnome-base/libgtop:2
+	gnome-base/librsvg:2
+	gnome-base/orbit
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libart_lgpl
+	media-libs/libpng:1.2
+	media-libs/libpng
+	media-libs/tiff:3
+	net-misc/curl
+	cups? ( net-print/cups )
+	sys-devel/gcc
+	sys-fs/fuse
+	sys-libs/glibc
+	sys-libs/zlib
+	x11-libs/cairo
+	x11-libs/gtk+:2
+	x11-libs/libgksu
+	x11-libs/libICE
+	x11-libs/libSM
+	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/pangox-compat
+	x11-libs/startup-notification
+	x11-themes/hicolor-icon-theme
+	!app-emulation/vmware-player"
+PDEPEND="~app-emulation/vmware-modules-304.${PV_MINOR}
+	vmware-tools? ( app-emulation/vmware-tools )"
+
+S=${WORKDIR}
+VM_INSTALL_DIR="/opt/vmware"
+VM_DATA_STORE_DIR="/var/lib/vmware/Shared VMs"
+VM_HOSTD_USER="root"
+
+src_unpack() {
+	default
+	local bundle
+	use amd64 && bundle=${MY_P}.x86_64.bundle
+	local component; for component in \
+		vmware-vmx \
+		vmware-player-app \
+		vmware-player-setup \
+		vmware-workstation \
+		vmware-network-editor \
+		vmware-network-editor-ui \
+		vmware-usbarbitrator \
+		vmware-vprobe
+	do
+		vmware-bundle_extract-bundle-component "${bundle}" "${component}" "${S}"
+	done
+
+	if use server; then
+		vmware-bundle_extract-bundle-component "${bundle}" vmware-workstation-server #"${S}"
+	fi
+
+	if use vix; then
+		vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-core vmware-vix
+		vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-lib-Workstation1000andvSphere550 vmware-vix
+	fi
+	if use ovftool; then
+		vmware-bundle_extract-bundle-component "${bundle}" vmware-ovftool
+	fi
+}
+
+src_prepare() {
+	rm -f  bin/vmware-modconfig
+	rm -rf lib/modules/binary
+	# Bug 459566
+	mv lib/libvmware-netcfg.so lib/lib/
+
+	if use server; then
+		rm -f vmware-workstation-server/bin/{openssl,configure-hostd.sh}
+	fi
+
+	find "${S}" -name '*.a' -delete
+
+#	clean_bundled_libs
+}
+
+clean_bundled_libs() {
+	ebegin 'Removing superfluous libraries'
+	cd lib/lib || die
+	ldconfig -p | \
+		sed 's:^\s\+\([^(]*[^( ]\).*=> /.*$:\1:g;t;d' | \
+		fgrep -vx 'libcrypto.so.0.9.8
+libssl.so.0.9.8i
+libgcr.so.0
+libglib-2.0.so.0' |
+		xargs -d'\n' -r rm -rf
+	eend
+}
+
+src_install() {
+	local major_minor=$(get_version_component_range 1-2 "${PV}")
+	local major_minor_revision=$(get_version_component_range 1-3 "${PV}")
+	local build=$(get_version_component_range 4 "${PV}")
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	echo "SEARCH_DIRS_MASK=\"${VM_INSTALL_DIR}\"" >> ${T}/10${PN}
+	doins "${T}"/10${PN}
+
+	# install the binaries
+	into "${VM_INSTALL_DIR}"
+	dobin bin/*
+
+	# install the libraries
+	insinto "${VM_INSTALL_DIR}"/lib/vmware
+	doins -r lib/*
+
+	# Bug 432918
+	dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.0.9.8/libcrypto.so.0.9.8 \
+		"${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libcrypto.so.0.9.8
+	dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.0.9.8/libssl.so.0.9.8 \
+		"${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libssl.so.0.9.8
+
+	# install the ancillaries
+	insinto /usr
+	doins -r share
+
+	if use cups; then
+		exeinto $(cups-config --serverbin)/filter
+		doexe extras/thnucups
+
+		insinto /etc/cups
+		doins -r etc/cups/*
+	fi
+
+	insinto /etc/xdg
+	doins -r etc/xdg/*
+
+	# install documentation
+	doman man/man1/vmware.1.gz
+
+	if use doc; then
+		dodoc doc/*
+	fi
+
+	insinto "${VM_INSTALL_DIR}"/lib/vmware/setup
+	doins vmware-config
+
+	# install vmware workstation server
+	if use server; then
+		dosbin sbin/*
+
+		cd "${S}"/vmware-workstation-server
+
+		# install binaries
+		into "${VM_INSTALL_DIR}"/lib/vmware
+		dobin bin/*
+
+		dobin "${FILESDIR}"/configure-hostd.sh
+
+		dobin "${FILESDIR}"/configure-hostd.sh
+
+		# install the libraries
+		insinto "${VM_INSTALL_DIR}"/lib/vmware/lib
+		doins -r lib/*
+
+		into "${VM_INSTALL_DIR}"
+		for tool in  vmware-{hostd,wssc-adminTool} ; do
+			cat > "${T}/${tool}" <<-EOF
+				#!/usr/bin/env bash
+				set -e
+
+				. /etc/vmware/bootstrap
+
+				exec "${VM_INSTALL_DIR}/lib/vmware/lib/wrapper-gtk24.sh" \\
+					"${VM_INSTALL_DIR}/lib/vmware/lib" \\
+					"${VM_INSTALL_DIR}/lib/vmware/bin/${tool}" \\
+					"${VM_INSTALL_DIR}/lib/vmware/libconf" "\$@"
+			EOF
+			dobin "${T}/${tool}"
+		done
+
+		insinto "${VM_INSTALL_DIR}"/lib/vmware
+		doins -r hostd
+
+		# create the configuration
+		insinto /etc/vmware/hostd
+		doins -r config/etc/vmware/hostd/*
+		doins -r etc/vmware/hostd/*
+
+		insinto /etc/vmware/ssl
+		doins etc/vmware/ssl/*
+
+		# pam
+		pamd_mimic_system vmware-authd auth account
+
+		# create directory for shared virtual machines.
+		keepdir "${VM_DATA_STORE_DIR}"
+		keepdir /var/log/vmware
+	fi
+
+	# install vmware-vix
+	if use vix; then
+		cd "${S}"/vmware-vix
+
+		# install the binary
+		into "${VM_INSTALL_DIR}"
+		dobin bin/*
+
+		# install the libraries
+		insinto "${VM_INSTALL_DIR}"/lib/vmware-vix
+		doins -r lib/*
+
+		dosym vmware-vix/libvixAllProducts.so "${VM_INSTALL_DIR}"/lib/libbvixAllProducts.so
+
+		# install headers
+		insinto /usr/include/vmware-vix
+		doins include/*
+
+		if use doc; then
+			dohtml -r doc/*
+		fi
+	fi
+
+	# install ovftool
+	if use ovftool; then
+		cd "${S}"
+
+		insinto "${VM_INSTALL_DIR}"/lib/vmware-ovftool
+		doins -r vmware-ovftool/*
+
+		chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/{ovftool,ovftool.bin}
+		dosym "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/ovftool "${VM_INSTALL_DIR}"/bin/ovftool
+	fi
+
+	# create symlinks for the various tools
+	local tool ; for tool in thnuclnt vmware vmplayer{,-daemon} licenseTool vmamqpd \
+			vmware-{acetool,enter-serial,gksu,fuseUI,modconfig{,-console},netcfg,tray,unity-helper,zenity} ; do
+		dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}"
+	done
+	dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer "${VM_INSTALL_DIR}"/bin/vmplayer
+	dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware "${VM_INSTALL_DIR}"/bin/vmware
+	dosym "${VM_INSTALL_DIR}"/lib/vmware/icu /etc/vmware/icu
+
+	# fix permissions
+	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks}
+	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/{wrapper-gtk24.sh,libgksu2.so.0/gksu-run-helper}
+	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/setup/vmware-config
+	fperms 4711 "${VM_INSTALL_DIR}"/bin/vmware-mount
+	fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats}
+	if use server; then
+		fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-{hostd,wssc-adminTool}
+		fperms 4711 "${VM_INSTALL_DIR}"/sbin/vmware-authd
+		fperms 1777 "${VM_DATA_STORE_DIR}"
+	fi
+	if use vix; then
+		fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware-vix/setup/vmware-config
+	fi
+
+	# create the environment
+	local envd="${T}/90vmware"
+	cat > "${envd}" <<-EOF
+		PATH='${VM_INSTALL_DIR}/bin'
+		ROOTPATH='${VM_INSTALL_DIR}/bin'
+	EOF
+	doenvd "${envd}"
+
+	# create the configuration
+	dodir /etc/vmware
+
+	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.version = "${major_minor_revision}"
+		product.buildNumber = "${build}"
+		product.name = "VMware Workstation"
+		workstation.product.version = "${major_minor_revision}"
+	EOF
+
+	if use vix; then
+		cat >> "${D}"/etc/vmware/config <<-EOF
+			vmware.fullpath = "${VM_INSTALL_DIR}/bin/vmware"
+			vix.libdir = "${VM_INSTALL_DIR}/lib/vmware-vix"
+			vix.config.version = "1"
+		EOF
+	fi
+
+	if use server; then
+		cat >> "${D}"/etc/vmware/config <<-EOF
+			authd.client.port = "902"
+			authd.proxy.nfc = "vmware-hostd:ha-nfc"
+			authd.soapserver = "TRUE"
+		EOF
+	fi
+
+	# install the init.d script
+	local initscript="${T}/vmware.rc"
+	sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
+		"${FILESDIR}/vmware-${major_minor}.rc" > ${initscript}
+	newinitd "${initscript}" vmware
+
+	if use server; then
+		# install the init.d script
+		local initscript="${T}/vmware-workstation-server.rc"
+		sed -e "s:@@ETCDIR@@:/etc/vmware:g" \
+			-e "s:@@PREFIX@@:${VM_INSTALL_DIR}:g" \
+			-e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
+			-e "s:@@LIBDIR@@:${VM_INSTALL_DIR}/lib/vmware:g" \
+			"${FILESDIR}/vmware-server-${major_minor}.rc" > ${initscript}
+		newinitd "${initscript}" vmware-workstation-server
+	fi
+
+	# 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}}
+	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware:g" \
+		-e "/^Encoding/d" \
+		-i "${D}/usr/share/applications/${PN}.desktop"
+	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \
+		-e "/^Encoding/d" \
+		-i "${D}/usr/share/applications/vmware-player.desktop"
+	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware-netcfg:g" \
+		-e "/^Encoding/d" \
+		-i "${D}/usr/share/applications/vmware-netcfg.desktop"
+
+	if use server; then
+	# Configuration for vmware-workstation-server
+		local hostdUser="${VM_HOSTD_USER:-root}"
+		sed -e "/ACEDataUser/s:root:${hostdUser}:g" \
+			-i "${D}/etc/vmware/hostd/authorization.xml" || die
+
+		# Shared VMs Path: [standard].
+		sed -e "s:##{DS_NAME}##:standard:g" \
+			-e "s:##{DS_PATH}##:${VM_DATA_STORE_DIR}:g" \
+			-i "${D}/etc/vmware/hostd/datastores.xml" || die
+
+		sed -e "s:##{HTTP_PORT}##:-1:g" \
+			-e "s:##{HTTPS_PORT}##:443:g" \
+			-e "s:##{PIPE_PREFIX}##:/var/run/vmware/:g" \
+			-i "${D}/etc/vmware/hostd/proxy.xml" || die
+
+		# See vmware-workstation-server.py for more details.
+		sed -e "s:##{BUILD_CFGDIR}##:/etc/vmware/hostd/:g" \
+			-e "s:##{CFGALTDIR}##:/etc/vmware/hostd/:g" \
+			-e "s:##{CFGDIR}##:/etc/vmware/:g" \
+			-e "s:##{ENABLE_AUTH}##:true:g" \
+			-e "s:##{HOSTDMODE}##:ws:g" \
+			-e "s:##{HOSTD_CFGDIR}##:/etc/vmware/hostd/:g" \
+			-e "s:##{HOSTD_MOCKUP}##:false:g" \
+			-e "s:##{LIBDIR}##:${VM_INSTALL_DIR}/lib/vmware:g" \
+			-e "s:##{LIBDIR_INSTALLED}##:${VM_INSTALL_DIR}/lib/vmware/:g" \
+			-e "s:##{LOGDIR}##:/var/log/vmware/:g" \
+			-e "s:##{LOGLEVEL}##:verbose:g" \
+			-e "s:##{MOCKUP}##:mockup-host-config.xml:g" \
+			-e "s:##{PLUGINDIR}##:./:g" \
+			-e "s:##{SHLIB_PREFIX}##:lib:g" \
+			-e "s:##{SHLIB_SUFFIX}##:.so:g" \
+			-e "s:##{USE_BLKLISTSVC}##:false:g" \
+			-e "s:##{USE_CBRCSVC}##:false:g" \
+			-e "s:##{USE_CIMSVC}##:false:g" \
+			-e "s:##{USE_DIRECTORYSVC}##:false:g" \
+			-e "s:##{USE_DIRECTORYSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_DYNAMIC_PLUGIN_LOADING}##:false:g" \
+			-e "s:##{USE_DYNAMO}##:false:g" \
+			-e "s:##{USE_DYNSVC}##:false:g" \
+			-e "s:##{USE_GUESTSVC}##:false:g" \
+			-e "s:##{USE_HBRSVC}##:false:g" \
+			-e "s:##{USE_HBRSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_HOSTSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_HTTPNFCSVC}##:false:g" \
+			-e "s:##{USE_HTTPNFCSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_LICENSESVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_NFCSVC}##:true:g" \
+			-e "s:##{USE_NFCSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_OVFMGRSVC}##:true:g" \
+			-e "s:##{USE_PARTITIONSVC}##:false:g" \
+			-e "s:##{USE_SECURESOAP}##:false:g" \
+			-e "s:##{USE_SNMPSVC}##:false:g" \
+			-e "s:##{USE_SOLO_MOCKUP}##:false:g" \
+			-e "s:##{USE_STATSSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_VCSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_VDISKSVC}##:false:g" \
+			-e "s:##{USE_VDISKSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_VMSVC_MOCKUP}##:false:g" \
+			-e "s:##{VM_INVENTORY}##:vmInventory.xml:g" \
+			-e "s:##{VM_RESOURCES}##:vmResources.xml:g" \
+			-e "s:##{WEBSERVER_PORT_ENTRY}##::g" \
+			-e "s:##{WORKINGDIR}##:./:g" \
+			-i "${D}/etc/vmware/hostd/config.xml" || die
+
+		sed -e "s:##{ENV_LOCATION}##:/etc/vmware/hostd/env/:g" \
+			-i "${D}/etc/vmware/hostd/environments.xml" || die
+
+		# @@VICLIENT_URL@@=XXX
+		sed -e "s:@@AUTHD_PORT@@:902:g" \
+			-i "${D}${VM_INSTALL_DIR}/lib/vmware/hostd/docroot/client/clients.xml" || die
+	fi
+
+	# install systemd unit files
+	systemd_dounit "${WORKDIR}/systemd-vmware-${SYSTEMD_UNITS_TAG}/"*.{service,target}
+}
+
+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 workstation, 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
+}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-workstation/files/, app-emulation/vmware-workstation/
@ 2016-03-18  3:16 Evan Teran
  0 siblings, 0 replies; 3+ messages in thread
From: Evan Teran @ 2016-03-18  3:16 UTC (permalink / raw
  To: gentoo-commits

commit:     95398f53a43171553a660f2b87e38a5b96a7aba9
Author:     Evan Teran <evan.teran <AT> gmail <DOT> com>
AuthorDate: Fri Mar 18 03:14:50 2016 +0000
Commit:     Evan Teran <evan.teran <AT> gmail <DOT> com>
CommitDate: Fri Mar 18 03:14:50 2016 +0000
URL:        https://gitweb.gentoo.org/proj/vmware.git/commit/?id=95398f53

app-emulation/vmware-workstation: initial vmware-12 support

Package-Manager: portage-2.2.26

 app-emulation/vmware-workstation/Manifest          |   1 +
 .../vmware-workstation/files/vmware-12.1.rc        |  44 ++
 .../vmware-workstation/files/vmware-server-12.1.rc |  55 ++
 ...orkstation-12.1.0.3272444-unbundle-libcds.patch | Bin 0 -> 3414 bytes
 .../vmware-workstation-12.1.0.3272444-r1.ebuild    | 622 +++++++++++++++++++++
 5 files changed, 722 insertions(+)

diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
index f768cf1..1dfe000 100644
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@@ -2,5 +2,6 @@ DIST VMware-Workstation-10.0.6-2700073.i386.bundle.tar 281272320 SHA256 02b6c26b
 DIST VMware-Workstation-10.0.6-2700073.x86_64.bundle.tar 252610560 SHA256 e29edcb0638f32bff81d372c9eaf54e663e3376cd1d89dbd4cfe4cab533398b2 SHA512 072de1da92cbef890707a6c4e3d5223fdc60e50a5166bb72b1ebc098d28c1a75b83ed65a29fdf1311e119e590560546e376909e1384f1eab05918500ec80ede4 WHIRLPOOL 3f4252abb6c87424b88fa34adc29e1927d1e6458beca65d9b290ff0c8ad4ccaf2945e2209670f8f8d4e84548d806c18fb23dc8380ec65452841e2c0bbcce89aa
 DIST VMware-Workstation-11.1.2-2780323.x86_64.bundle.tar 259133440 SHA256 085b50175b253647d8b2cb188286d3cf9265ed246cc0deb3b142b0438ef5725f SHA512 1c43ebaa4f8b228ec00f24a263eddcbbad5c0c940cd67040e6e2275c3a4aab6c9e2e5ee96996ca4f007ff786ece978c5789214ad92479720182fc3153d7edbde WHIRLPOOL 60e359a1dcfe1178652d8c6be705dda4f2f31b109bf01d5b5b16dc03e26a649e8f1af2ffa03d68e9108646c98e9cad41c10a9452ea14950883f9162e57ac20ca
 DIST VMware-Workstation-11.1.3-3206955.x86_64.bundle.tar 259594240 SHA256 a8d333d6f6677eb1d70b3572e5bf8f34ebb6cb77bdee4b94d6ea8033f579ed5d SHA512 8cb4781dc388bcaeb82f19d18e0bf2608d393f18c4e255a1c89c9090954bbee5e78ebde5cec6df06d9c037ed4f0595a7a801d76b3a8e2b960f6822bbf1094d1b WHIRLPOOL 5ba631502ff4dbf0e480e932e9a21cbb06d25d68b9ac412beb41680d3d0e678c630ba692e7e52cda2399574b28698ca5deb6a6c54b4614ab752159b6036a0094
+DIST VMware-Workstation-12.1.0-3272444.x86_64.bundle.tar 170639360 SHA256 b15d2ae889465e6e080b84474ca49ebd6c21a0bce701a0f74d34b6e930869043 SHA512 bd64fe19ebb96b06cd34795dab46490cb0e1fe4822dbce4678185fb2cba3e921170feac7904771c14ece3450ddb0e86f5f4d03081551367b8c70afe77df3fab7 WHIRLPOOL 7d72352e272358c25fe49b05c4cdc5653bffef9e20cc2151a2f032fecb98eb7831a922d8dca0ce509d8944abeaff951e9ece8b11dac6782facc762e3b54c2aac
 DIST gentoo-01.tar.gz 1884 SHA256 e92c694865f1b29f4d7a39efa1dd87bc71dc5f922573f00a3d31ee8e27a8c335 SHA512 454ab93997781bd0a9accddb2ac7bb446f07ea7cddef5640369025c30e03592e14869e0f0f7b4457db2f1ada31c98051426016c86201afa8bc8e3aa4ccc2f875 WHIRLPOOL 9202583b617532ab2612b384da307218e7c93c2962f0d233e28bea066b07163c9bc51c0a599309f9d703c5575ebeb292d787716225624dc1c2fdff3c44fa3513
 DIST vmware-systemd-gentoo-01.tgz 1884 SHA256 e92c694865f1b29f4d7a39efa1dd87bc71dc5f922573f00a3d31ee8e27a8c335 SHA512 454ab93997781bd0a9accddb2ac7bb446f07ea7cddef5640369025c30e03592e14869e0f0f7b4457db2f1ada31c98051426016c86201afa8bc8e3aa4ccc2f875 WHIRLPOOL 9202583b617532ab2612b384da307218e7c93c2962f0d233e28bea066b07163c9bc51c0a599309f9d703c5575ebeb292d787716225624dc1c2fdff3c44fa3513

diff --git a/app-emulation/vmware-workstation/files/vmware-12.1.rc b/app-emulation/vmware-workstation/files/vmware-12.1.rc
new file mode 100644
index 0000000..f2dc692
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/vmware-12.1.rc
@@ -0,0 +1,44 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+	
+	# quiet for vmci because it may not be there
+	modprobe -vq vmci || modprobe -v vmw_vmci
+	eend $?
+	
+	# vmci or vmw_vmci was loaded by the previous modprobe 
+	# no need to do it here
+	modprobe -av vmmon 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 -rv vsock vmmon vmblock vmnet
+	eend $?
+	
+	# quiet for vmci because it may not be there
+	modprobe -rvq vmci || modprobe -rv vmw_vmci
+	eend $?
+}

diff --git a/app-emulation/vmware-workstation/files/vmware-server-12.1.rc b/app-emulation/vmware-workstation/files/vmware-server-12.1.rc
new file mode 100644
index 0000000..a82b900
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/vmware-server-12.1.rc
@@ -0,0 +1,55 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+	need localmount vmware
+	use net
+}
+
+checkconfig() {
+	# Check if certificates exist.  If not, we need to generate them, ala sshd.
+	if [ ! -e @@ETCDIR@@/ssl/rui.key -o ! -e @@ETCDIR@@/ssl/rui.crt ]; then
+		mkdir -p @@ETCDIR@@/ssl
+		openssl req -x509 -days 365 -newkey rsa:2048 -keyout @@ETCDIR@@/ssl/rui.key -out @@ETCDIR@@/ssl/rui.crt -config @@ETCDIR@@/ssl/hostd.ssl.config
+		chmod -R 600 @@ETCDIR@@/ssl
+	fi
+}
+
+start() {
+	checkconfig
+
+	ebegin Starting VMware Authentication Daemon
+	start-stop-daemon --start \
+	  --exec @@PREFIX@@/sbin/vmware-authdlauncher
+	eend $?
+	ebegin Starting VMware Workstation Server
+	start-stop-daemon --start \
+	  --pidfile /var/run/vmware/vmware-hostd.PID \
+	  --exec @@BINDIR@@/vmware-hostd \
+	  -- -a -d @@ETCDIR@@/hostd/config.xml
+
+	eend $?
+}
+
+stop() {
+	ebegin "Shutdown VMs in the AutoStart Sequence"
+	local HOHO_ADMIN="$(@@BINDIR@@/vmware-wssc-adminTool "@@ETCDIR@@/hostd/authorization.xml" 2>/dev/null)"
+
+	if [ "x" != "x${HOHO_ADMIN}" ]; then
+		@@BINDIR@@/vmware-vim-cmd -U "${HOHO_ADMIN}" hostsvc/autostartmanager/autostop
+	fi
+	eend $?
+
+	ebegin Stopping VMware Workstation Server
+	start-stop-daemon --stop \
+	  --pidfile /var/run/vmware/vmware-hostd.PID \
+	  --exec @@BINDIR@@/vmware-hostd 
+	eend $?
+	ebegin Stopping VMware Authentication Daemon
+	#start-stop-daemon --stop \
+	#  --exec @@PREFIX@@/sbin/vmware-authdlauncher
+	killall @@PREFIX@@/sbin/vmware-authdlauncher
+	eend $?
+}

diff --git a/app-emulation/vmware-workstation/files/vmware-workstation-12.1.0.3272444-unbundle-libcds.patch b/app-emulation/vmware-workstation/files/vmware-workstation-12.1.0.3272444-unbundle-libcds.patch
new file mode 100644
index 0000000..0d584b3
Binary files /dev/null and b/app-emulation/vmware-workstation/files/vmware-workstation-12.1.0.3272444-unbundle-libcds.patch differ

diff --git a/app-emulation/vmware-workstation/vmware-workstation-12.1.0.3272444-r1.ebuild b/app-emulation/vmware-workstation/vmware-workstation-12.1.0.3272444-r1.ebuild
new file mode 100644
index 0000000..9c4e95f
--- /dev/null
+++ b/app-emulation/vmware-workstation/vmware-workstation-12.1.0.3272444-r1.ebuild
@@ -0,0 +1,622 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils versionator readme.gentoo-r1 fdo-mime gnome2-utils pam systemd vmware-bundle
+
+MY_PN="VMware-Workstation"
+MY_PV=$(get_version_component_range 1-3)
+PV_MODULES="308.$(get_version_component_range 2-3)"
+PV_BUILD=$(get_version_component_range 4)
+MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}"
+
+SYSTEMD_UNITS_TAG="gentoo-01"
+
+DESCRIPTION="Emulate a complete PC without the performance overhead of most emulators"
+HOMEPAGE="http://www.vmware.com/products/workstation/"
+BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/ws/${MY_PV}/${PV_BUILD}/linux/core/"
+SRC_URI="
+	amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar )
+	https://github.com/akhuettel/systemd-vmware/archive/${SYSTEMD_UNITS_TAG}.tar.gz -> vmware-systemd-${SYSTEMD_UNITS_TAG}.tgz
+	"
+
+LICENSE="vmware GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="bundled-libs cups doc ovftool server vix +vmware-tools"
+RESTRICT="mirror strip preserve-libs"
+
+BUNDLED_LIBS_DIR=/opt/vmware/lib/vmware/lib
+
+BUNDLED_LIBS="
+	libXau.so.6
+	libXcomposite.so.1
+	libXcursor.so.1
+	libXdamage.so.1
+	libXdmcp.so.6
+	libXfixes.so.3
+	libXft.so.2
+	libXinerama.so.1
+	libXrandr.so.2
+	libXrender.so.1
+	libaio.so.1
+	libatk-1.0.so.0
+	libatkmm-1.6.so.1
+	libatspi.so.0
+	libcairo.so.2
+	libcairomm-1.0.so.1
+	libcrypto.so.1.0.1
+	libcurl.so.4
+	libdbus-1.so.3
+	libfontconfig.so.1
+	libfreetype.so.6
+	libfuse.so.2
+	libgailutil.so.18
+	libgcc_s.so.1
+	libgcrypt.so.11
+	libgdk-x11-2.0.so.0
+	libgdk_pixbuf-2.0.so.0
+	libgdkmm-2.4.so.1
+	libgio-2.0.so.0
+	libgiomm-2.4.so.1
+	libglib-2.0.so.0
+	libglibmm-2.4.so.1
+	libglibmm_generate_extra_defs-2.4.so.1
+	libgmodule-2.0.so.0
+	libgobject-2.0.so.0
+	libgpg-error.so.0
+	libgthread-2.0.so.0
+	libgtk-x11-2.0.so.0
+	libgtkmm-2.4.so.1
+	libpango-1.0.so.0
+	libpangocairo-1.0.so.0
+	libpangoft2-1.0.so.0
+	libpangomm-1.4.so.1
+	libpangox-1.0.so.0
+	libpangoxft-1.0.so.0
+	libpcsclite.so.1
+	libpixman-1.so.0
+	libpng12.so.0
+	librsvg-2.so.2
+	libsigc-2.0.so.0
+	libssl.so.1.0.1
+	libstdc++.so.6
+	libxml2.so.2
+	libz.so.1
+"
+
+BUNDLED_LIB_DEPENDS="
+	app-accessibility/at-spi2-core
+	dev-cpp/atkmm
+	dev-cpp/cairomm
+	dev-cpp/glibmm:2
+	dev-cpp/gtkmm:2.4
+	dev-cpp/pangomm
+	dev-libs/atk
+	dev-libs/glib:2
+	dev-libs/libaio
+	dev-libs/libgcrypt:11/11
+	dev-libs/libgpg-error
+	dev-libs/libsigc++:2
+	dev-libs/libxml2
+	dev-libs/openssl:0
+	gnome-base/librsvg:2
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libpng:1.2
+	net-misc/curl
+	sys-apps/dbus
+	sys-apps/pcsc-lite
+	sys-fs/fuse
+	sys-libs/zlib
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/libXau
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXdmcp
+	x11-libs/libXfixes
+	x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/pango
+	x11-libs/pangox-compat
+	x11-libs/pixman
+"
+
+# vmware should not use virtual/libc as this is a
+# precompiled binary package thats linked to glibc.
+RDEPEND="
+	app-arch/bzip2
+	dev-libs/dbus-glib
+	dev-libs/expat
+	dev-libs/gmp:0
+	dev-libs/icu
+	dev-libs/json-c
+	dev-libs/libcroco
+	dev-libs/libffi
+	dev-libs/libgcrypt:0/20
+	dev-libs/libtasn1:0/6
+	dev-libs/nettle:0/6
+	gnome-base/gconf
+	gnome-base/libgnome-keyring
+	media-gfx/graphite2
+	media-libs/alsa-lib
+	media-libs/harfbuzz:0/0.9.18
+	media-libs/libart_lgpl
+	media-libs/libpng:0
+	media-libs/libvorbis
+	media-libs/mesa
+	media-sound/pulseaudio
+	net-dns/libidn
+	net-libs/gnutls
+	net-print/cups
+	sys-apps/tcp-wrappers
+	sys-apps/util-linux
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXtst
+	x11-libs/libXxf86vm
+	x11-libs/libdrm
+	x11-libs/libxcb
+	x11-libs/libxshmfence
+	x11-libs/startup-notification
+	x11-libs/xcb-util
+	x11-themes/hicolor-icon-theme
+	bundled-libs? (
+		media-libs/jbigkit:0/2.1
+		media-libs/tiff:3
+		virtual/jpeg:62
+	)
+	!bundled-libs? ( ${BUNDLED_LIB_DEPENDS} )
+	!app-emulation/vmware-player
+"
+PDEPEND="~app-emulation/vmware-modules-${PV_MODULES}
+	vmware-tools? ( app-emulation/vmware-tools )"
+DEPEND="dev-util/bsdiff"
+
+S=${WORKDIR}
+VM_INSTALL_DIR="/opt/vmware"
+VM_DATA_STORE_DIR="/var/lib/vmware/Shared VMs"
+VM_HOSTD_USER="root"
+
+QA_PREBUILT="/opt/*"
+
+QA_WX_LOAD="opt/vmware/lib/vmware/tools-upgraders/vmware-tools-upgrader-32 opt/vmware/lib/vmware/bin/vmware-vmx-stats opt/vmware/lib/vmware/bin/vmware-vmx-debug opt/vmware/lib/vmware/bin/vmware-vmx"
+
+src_unpack() {
+	default
+	local bundle=${MY_P}.x86_64.bundle
+
+	local component; for component in \
+		vmware-workstation \
+		vmware-player-app \
+		vmware-player-setup \
+		vmware-vmx \
+		vmware-network-editor \
+		vmware-network-editor-ui \
+		vmware-usbarbitrator \
+		vmware-vprobe
+	do
+		vmware-bundle_extract-bundle-component "${bundle}" "${component}" "${S}"
+	done
+
+	if use ovftool; then
+		vmware-bundle_extract-bundle-component "${bundle}" vmware-ovftool
+	fi
+
+	if use server; then
+		vmware-bundle_extract-bundle-component "${bundle}" vmware-workstation-server #"${S}"
+	fi
+
+	if use vix; then
+		vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-core vmware-vix
+		vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-lib-Workstation1200 vmware-vix
+	fi
+}
+
+clean_bundled_libs() {
+	einfo "Removing bundled libraries"
+	for libname in ${BUNDLED_LIBS} ; do
+		rm -rv "${S}"/lib/lib/${libname} || die "Failed removing bundled ${libname}"
+	done
+
+	rm -rv "${S}"/lib/libconf || die "Failed removing bundled gtk conf libs"
+
+	# Among the bundled libs there are libcrypto.so.1.0.1 and libssl.so.1.0.1
+	# (needed by libcds.so) which seem to be compiled from openssl-1.0.1h.
+	# Upstream real sonames are *so.1.0.0 so it's necessary to fix DT_NEEDED link
+	# in libcds.so to be able to use system libs.
+	pushd >/dev/null .
+	einfo "Patching libcds.so"
+	cd "${S}"/lib/lib/libcds.so
+	cp libcds.so "${T}"/libcds.so
+	# The patch is created with patchelf > 0.8 (so using the live repository) and bsdiff:
+	# The following command should be replaced in the future with:
+	#   patchelf --replace-needed libssl.so.1.0.{1,0} \
+	#            --replace-needed libcrypto.so.1.0.{1,0} \
+	#            libcds.so
+	bspatch "${T}"/libcds.so libcds.so "${FILESDIR}"/${P}-unbundle-libcds.patch
+	popd >/dev/null
+}
+
+src_prepare() {
+	rm -f bin/vmware-modconfig
+	rm -rf lib/modules/binary
+	# Bug 459566
+	mv lib/libvmware-netcfg.so lib/lib/
+
+	if use server; then
+		rm -f vmware-workstation-server/bin/{openssl,configure-hostd.sh}
+	fi
+
+	if ! use bundled-libs ; then
+		clean_bundled_libs
+	fi
+
+	DOC_CONTENTS="
+/etc/env.d is updated during ${PN} installation. Please run:\n
+env-update && source /etc/profile\n
+Before you can use ${PN}, you must configure a default network setup.
+You can do this by running 'emerge --config ${PN}'.\n
+To be able to run ${PN} your user must be in the vmware group.\n
+You MUST set USE=bundled-libs if you are running gcc-5, otherwise vmware will not start.
+"
+}
+
+src_install() {
+	local major_minor=$(get_version_component_range 1-2 "${PV}")
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	echo "SEARCH_DIRS_MASK=\"${VM_INSTALL_DIR}\"" >> ${T}/10${PN}
+	doins "${T}"/10${PN}
+
+	# install the binaries
+	into "${VM_INSTALL_DIR}"
+	dobin bin/*
+
+	# install the libraries
+	insinto "${VM_INSTALL_DIR}"/lib/vmware
+	doins -r lib/*
+
+	# workaround for hardcoded search paths needed during shared objects loading
+	if ! use bundled-libs ; then
+		dosym /usr/$(get_libdir)/libglib-2.0.so.0 \
+			"${VM_INSTALL_DIR}"/lib/vmware/lib/libglib-2.0.so.0/libglib-2.0.so.0
+		# Bug 432918
+		dosym /usr/$(get_libdir)/libcrypto.so.1.0.0 \
+			"${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.1.0.1/libcrypto.so.1.0.1
+		dosym /usr/$(get_libdir)/libssl.so.1.0.0 \
+			"${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.1.0.1/libssl.so.1.0.1
+	fi
+
+	# install the ancillaries
+	insinto /usr
+	doins -r share
+
+	if use cups; then
+		exeinto $(cups-config --serverbin)/filter
+		doexe extras/thnucups
+
+		insinto /etc/cups
+		doins -r etc/cups/*
+	fi
+
+	if use doc; then
+		dodoc doc/*
+	fi
+
+	exeinto "${VM_INSTALL_DIR}"/lib/vmware/setup
+	doexe vmware-config
+
+	# install vmware workstation server
+	if use server; then
+		dosbin sbin/*
+
+		cd "${S}"/vmware-workstation-server
+
+		# install binaries
+		into "${VM_INSTALL_DIR}"/lib/vmware
+		dobin bin/*
+
+		dobin "${FILESDIR}"/configure-hostd.sh
+
+		dobin "${FILESDIR}"/configure-hostd.sh
+
+		# install the libraries
+		insinto "${VM_INSTALL_DIR}"/lib/vmware/lib
+		doins -r lib/*
+
+		into "${VM_INSTALL_DIR}"
+		for tool in vmware-hostd wssc-adminTool ; do
+			cat > "${T}/${tool}" <<-EOF
+				#!/usr/bin/env bash
+				set -e
+
+				. /etc/vmware/bootstrap
+
+				exec "${VM_INSTALL_DIR}/lib/vmware/lib/wrapper-gtk24.sh" \\
+					"${VM_INSTALL_DIR}/lib/vmware/lib" \\
+					"${VM_INSTALL_DIR}/lib/vmware/bin/${tool}" \\
+					"${VM_INSTALL_DIR}/lib/vmware/libconf" "\$@"
+			EOF
+			dobin "${T}/${tool}"
+		done
+
+		insinto "${VM_INSTALL_DIR}"/lib/vmware
+		doins -r hostd
+
+		# create the configuration
+		insinto /etc/vmware/hostd
+		doins -r config/etc/vmware/hostd/*
+		doins -r etc/vmware/hostd/*
+
+		insinto /etc/vmware/ssl
+		doins etc/vmware/ssl/*
+
+		# pam
+		pamd_mimic_system vmware-authd auth account
+
+		# create directory for shared virtual machines.
+		keepdir "${VM_DATA_STORE_DIR}"
+		keepdir /var/log/vmware
+	fi
+
+	# install vmware-vix
+	if use vix; then
+		cd "${S}"/vmware-vix
+
+		# install the binary
+		into "${VM_INSTALL_DIR}"
+		dobin bin/*
+
+		# install the libraries
+		insinto "${VM_INSTALL_DIR}"/lib/vmware-vix
+		doins -r lib/*
+
+		dosym vmware-vix/libvixAllProducts.so "${VM_INSTALL_DIR}"/lib/libbvixAllProducts.so
+
+		# install headers
+		insinto /usr/include/vmware-vix
+		doins include/*
+
+		if use doc; then
+			dohtml -r doc/*
+		fi
+	fi
+
+	# install ovftool
+	if use ovftool; then
+		cd "${S}"
+
+		insinto "${VM_INSTALL_DIR}"/lib/vmware-ovftool
+		doins -r vmware-ovftool/*
+
+		chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/{ovftool,ovftool.bin}
+		dosym "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/ovftool "${VM_INSTALL_DIR}"/bin/ovftool
+	fi
+
+	# create symlinks for the various tools
+	local tool ; for tool in thnuclnt vmware vmplayer{,-daemon} licenseTool vmamqpd \
+			vmware-{acetool,enter-serial,gksu,fuseUI,modconfig{,-console},netcfg,tray,zenity} ; do
+		dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}"
+	done
+	dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer "${VM_INSTALL_DIR}"/bin/vmplayer
+	dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware "${VM_INSTALL_DIR}"/bin/vmware
+	dosym "${VM_INSTALL_DIR}"/lib/vmware/icu /etc/vmware/icu
+
+	# fix permissions
+	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks}
+	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/wrapper-gtk24.sh
+	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/libgksu2.so.0/gksu-run-helper
+	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/setup/vmware-config
+	fperms 4711 "${VM_INSTALL_DIR}"/bin/vmware-mount
+	fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats}
+	if use server; then
+		fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{vmware-hostd,wssc-adminTool}
+		fperms 4711 "${VM_INSTALL_DIR}"/sbin/vmware-authd
+		fperms 1777 "${VM_DATA_STORE_DIR}"
+	fi
+	if use vix; then
+		fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware-vix/setup/vmware-config
+	fi
+
+	# create the environment
+	local envd="${T}/90vmware"
+	cat > "${envd}" <<-EOF
+		PATH='${VM_INSTALL_DIR}/bin'
+		ROOTPATH='${VM_INSTALL_DIR}/bin'
+	EOF
+	doenvd "${envd}"
+
+	use bundled-libs && echo 'VMWARE_USE_SHIPPED_LIBS=1' >> "${envd}"
+
+	# create the configuration
+	dodir /etc/vmware
+
+	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 = "${MY_PV}"
+		product.buildNumber = "${PV_BUILD}"
+		product.version = "${MY_PV}"
+		product.name = "VMware Workstation"
+		workstation.product.version = "${MY_PV}"
+	EOF
+
+	if use vix; then
+		cat >> "${D}"/etc/vmware/config <<-EOF
+			vmware.fullpath = "${VM_INSTALL_DIR}/bin/vmware"
+			vix.libdir = "${VM_INSTALL_DIR}/lib/vmware-vix"
+			vix.config.version = "1"
+		EOF
+	fi
+
+	if use server; then
+		cat >> "${D}"/etc/vmware/config <<-EOF
+			authd.client.port = "902"
+			authd.proxy.nfc = "vmware-hostd:ha-nfc"
+			authd.soapserver = "TRUE"
+		EOF
+	fi
+
+	# install the init.d script
+	local initscript="${T}/vmware.rc"
+	sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
+		"${FILESDIR}/vmware-${major_minor}.rc" > "${initscript}" || die
+	newinitd "${initscript}" vmware
+
+	if use server; then
+		# install the init.d script
+		local initscript="${T}/vmware-workstation-server.rc"
+		sed -e "s:@@ETCDIR@@:/etc/vmware:g" \
+			-e "s:@@PREFIX@@:${VM_INSTALL_DIR}:g" \
+			-e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
+			-e "s:@@LIBDIR@@:${VM_INSTALL_DIR}/lib/vmware:g" \
+			"${FILESDIR}/vmware-server-${major_minor}.rc" > ${initscript} || die
+		newinitd "${initscript}" vmware-workstation-server
+	fi
+
+	# fill in variable placeholders
+	if use bundled-libs ; then
+		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
+	fi
+	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \
+		-e "/^Encoding/d" \
+		-i "${D}/usr/share/applications/vmware-player.desktop" || die
+	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware:g" \
+		-e "/^Encoding/d" \
+		-i "${D}/usr/share/applications/vmware-workstation.desktop" || die
+	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware-netcfg:g" \
+		-e "/^Encoding/d" \
+		-i "${D}/usr/share/applications/vmware-netcfg.desktop" || die
+
+	if use server; then
+	# Configuration for vmware-workstation-server
+		local hostdUser="${VM_HOSTD_USER:-root}"
+		sed -e "/ACEDataUser/s:root:${hostdUser}:g" \
+			-i "${D}/etc/vmware/hostd/authorization.xml" || die
+
+		# Shared VMs Path: [standard].
+		sed -e "s:##{DS_NAME}##:standard:g" \
+			-e "s:##{DS_PATH}##:${VM_DATA_STORE_DIR}:g" \
+			-i "${D}/etc/vmware/hostd/datastores.xml" || die
+
+		sed -e "s:##{HTTP_PORT}##:-1:g" \
+			-e "s:##{HTTPS_PORT}##:443:g" \
+			-e "s:##{PIPE_PREFIX}##:/var/run/vmware/:g" \
+			-i "${D}/etc/vmware/hostd/proxy.xml" || die
+
+		# See vmware-workstation-server.py for more details.
+		sed -e "s:##{BUILD_CFGDIR}##:/etc/vmware/hostd/:g" \
+			-e "s:##{CFGALTDIR}##:/etc/vmware/hostd/:g" \
+			-e "s:##{CFGDIR}##:/etc/vmware/:g" \
+			-e "s:##{ENABLE_AUTH}##:true:g" \
+			-e "s:##{HOSTDMODE}##:ws:g" \
+			-e "s:##{HOSTD_CFGDIR}##:/etc/vmware/hostd/:g" \
+			-e "s:##{HOSTD_MOCKUP}##:false:g" \
+			-e "s:##{LIBDIR}##:${VM_INSTALL_DIR}/lib/vmware:g" \
+			-e "s:##{LIBDIR_INSTALLED}##:${VM_INSTALL_DIR}/lib/vmware/:g" \
+			-e "s:##{LOGDIR}##:/var/log/vmware/:g" \
+			-e "s:##{LOGLEVEL}##:verbose:g" \
+			-e "s:##{MOCKUP}##:mockup-host-config.xml:g" \
+			-e "s:##{PLUGINDIR}##:./:g" \
+			-e "s:##{SHLIB_PREFIX}##:lib:g" \
+			-e "s:##{SHLIB_SUFFIX}##:.so:g" \
+			-e "s:##{USE_BLKLISTSVC}##:false:g" \
+			-e "s:##{USE_CBRCSVC}##:false:g" \
+			-e "s:##{USE_CIMSVC}##:false:g" \
+			-e "s:##{USE_DIRECTORYSVC}##:false:g" \
+			-e "s:##{USE_DIRECTORYSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_DYNAMIC_PLUGIN_LOADING}##:false:g" \
+			-e "s:##{USE_DYNAMO}##:false:g" \
+			-e "s:##{USE_DYNSVC}##:false:g" \
+			-e "s:##{USE_GUESTSVC}##:false:g" \
+			-e "s:##{USE_HBRSVC}##:false:g" \
+			-e "s:##{USE_HBRSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_HOSTSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_HTTPNFCSVC}##:false:g" \
+			-e "s:##{USE_HTTPNFCSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_LICENSESVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_NFCSVC}##:true:g" \
+			-e "s:##{USE_NFCSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_OVFMGRSVC}##:true:g" \
+			-e "s:##{USE_PARTITIONSVC}##:false:g" \
+			-e "s:##{USE_SECURESOAP}##:false:g" \
+			-e "s:##{USE_SNMPSVC}##:false:g" \
+			-e "s:##{USE_SOLO_MOCKUP}##:false:g" \
+			-e "s:##{USE_STATSSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_VCSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_VDISKSVC}##:false:g" \
+			-e "s:##{USE_VDISKSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_VMSVC_MOCKUP}##:false:g" \
+			-e "s:##{VM_INVENTORY}##:vmInventory.xml:g" \
+			-e "s:##{VM_RESOURCES}##:vmResources.xml:g" \
+			-e "s:##{WEBSERVER_PORT_ENTRY}##::g" \
+			-e "s:##{WORKINGDIR}##:./:g" \
+			-i "${D}/etc/vmware/hostd/config.xml" || die
+
+		sed -e "s:##{ENV_LOCATION}##:/etc/vmware/hostd/env/:g" \
+			-i "${D}/etc/vmware/hostd/environments.xml" || die
+
+		# @@VICLIENT_URL@@=XXX
+		sed -e "s:@@AUTHD_PORT@@:902:g" \
+			-i "${D}${VM_INSTALL_DIR}/lib/vmware/hostd/docroot/client/clients.xml" || die
+	fi
+
+	# install systemd unit files
+	systemd_dounit "${WORKDIR}/systemd-vmware-${SYSTEMD_UNITS_TAG}/"*.{service,target}
+
+	readme.gentoo_create_doc
+}
+
+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
+	readme.gentoo_print_elog
+
+	ewarn "${P} is using an old version of libgcrypt library which"
+	ewarn "is going to be soon removed from portage due to security reasons"
+	ewarn "(see https://bugs.gentoo.org/show_bug.cgi?id=541564)."
+	ewarn "Until vmware is fixed upstream you're exposed to security issues!"
+}
+
+pkg_prerm() {
+	einfo "Stopping ${PN} for safe unmerge"
+	/etc/init.d/vmware stop
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-workstation/files/, app-emulation/vmware-workstation/
@ 2016-03-19 15:21 Andreas Hüttel
  0 siblings, 0 replies; 3+ messages in thread
From: Andreas Hüttel @ 2016-03-19 15:21 UTC (permalink / raw
  To: gentoo-commits

commit:     a68af6fdcd55e683d128205eea0b87d8af336fe8
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 19 15:18:45 2016 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Mar 19 15:18:45 2016 +0000
URL:        https://gitweb.gentoo.org/proj/vmware.git/commit/?id=a68af6fd

app-emulation/vmware-workstation: Make binary patch a textfile...

Package-Manager: portage-2.2.27

 ...orkstation-12.1.0.3272444-unbundle-libcds.patch | Bin 3414 -> 0 bytes
 ...ion-12.1.0.3272444-unbundle-libcds.patch.base64 |  60 +++++++++++++++++++++
 .../vmware-workstation-12.1.0.3272444-r1.ebuild    |   9 ++--
 3 files changed, 65 insertions(+), 4 deletions(-)

diff --git a/app-emulation/vmware-workstation/files/vmware-workstation-12.1.0.3272444-unbundle-libcds.patch b/app-emulation/vmware-workstation/files/vmware-workstation-12.1.0.3272444-unbundle-libcds.patch
deleted file mode 100644
index 0d584b3..0000000
Binary files a/app-emulation/vmware-workstation/files/vmware-workstation-12.1.0.3272444-unbundle-libcds.patch and /dev/null differ

diff --git a/app-emulation/vmware-workstation/files/vmware-workstation-12.1.0.3272444-unbundle-libcds.patch.base64 b/app-emulation/vmware-workstation/files/vmware-workstation-12.1.0.3272444-unbundle-libcds.patch.base64
new file mode 100644
index 0000000..ff1e7d4
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/vmware-workstation-12.1.0.3272444-unbundle-libcds.patch.base64
@@ -0,0 +1,60 @@
+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

diff --git a/app-emulation/vmware-workstation/vmware-workstation-12.1.0.3272444-r1.ebuild b/app-emulation/vmware-workstation/vmware-workstation-12.1.0.3272444-r1.ebuild
index 9c4e95f..e489c4e 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-12.1.0.3272444-r1.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-12.1.0.3272444-r1.ebuild
@@ -237,14 +237,15 @@ clean_bundled_libs() {
 	# in libcds.so to be able to use system libs.
 	pushd >/dev/null .
 	einfo "Patching libcds.so"
-	cd "${S}"/lib/lib/libcds.so
-	cp libcds.so "${T}"/libcds.so
-	# The patch is created with patchelf > 0.8 (so using the live repository) and bsdiff:
+	cd "${S}"/lib/lib/libcds.so || die
+	cp libcds.so "${T}"/libcds.so || die
+	# The patch is created with patchelf > 0.8 (so using the live repository), bsdiff, and base64:
 	# The following command should be replaced in the future with:
 	#   patchelf --replace-needed libssl.so.1.0.{1,0} \
 	#            --replace-needed libcrypto.so.1.0.{1,0} \
 	#            libcds.so
-	bspatch "${T}"/libcds.so libcds.so "${FILESDIR}"/${P}-unbundle-libcds.patch
+	base64 -d "${FILESDIR}"/${P}-unbundle-libcds.patch.base64 > "${T}"/${P}-unbundle-libcds.patch || die
+	bspatch "${T}"/libcds.so libcds.so "${T}"/${P}-unbundle-libcds.patch || die
 	popd >/dev/null
 }
 


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2016-03-19 15:22 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-18  3:16 [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-workstation/files/, app-emulation/vmware-workstation/ Evan Teran
  -- strict thread matches above, loose matches on Subject: below --
2016-03-19 15:21 Andreas Hüttel
2015-07-10 23:17 Evan Teran

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox