summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Teran <evan.teran@gmail.com>2014-10-11 12:14:05 -0400
committerEvan Teran <evan.teran@gmail.com>2014-10-11 12:14:05 -0400
commitca8c57bf573ea8326c4fb6528fabf190a5cc5ee9 (patch)
treebd0cf28f2ae2046ed718fa80aae4d7b63f3eee9d /app-emulation/vmware-workstation
parentmore synching with mainline (diff)
downloadvmware-ca8c57bf573ea8326c4fb6528fabf190a5cc5ee9.tar.gz
vmware-ca8c57bf573ea8326c4fb6528fabf190a5cc5ee9.tar.bz2
vmware-ca8c57bf573ea8326c4fb6528fabf190a5cc5ee9.zip
more synching with mainline
Diffstat (limited to 'app-emulation/vmware-workstation')
-rw-r--r--app-emulation/vmware-workstation/Manifest11
-rw-r--r--app-emulation/vmware-workstation/files/configure-hostd.sh20
-rw-r--r--app-emulation/vmware-workstation/files/list-bundle-components.xsl17
-rw-r--r--app-emulation/vmware-workstation/files/list-component-files.xsl19
-rw-r--r--app-emulation/vmware-workstation/files/vmware-9.0.rc33
-rw-r--r--app-emulation/vmware-workstation/files/vmware-server-8.0.rc55
-rw-r--r--app-emulation/vmware-workstation/files/vmware-server-9.0.rc55
-rw-r--r--app-emulation/vmware-workstation/vmware-workstation-10.0.2.1744117.ebuild (renamed from app-emulation/vmware-workstation/vmware-workstation-9.0.2.1031769.ebuild)26
8 files changed, 21 insertions, 215 deletions
diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
index 6d9b424..0c6a39b 100644
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@@ -1,8 +1,3 @@
-DIST VMware-Workstation-7.1.6-744570.i386.bundle 130391795 SHA256 fbeadabe7c0929a10f144dc82e37afc73bbd60bedf299bb2c6142dda379ad5b4 SHA512 c57148f0ef7041bdadf46668aaddd0315134185103706dc23815bf3ebe4f2389a9387c63d0caf3fb0e1baf236320c633264e473439b2e00eb26c11d489e6af0a WHIRLPOOL e631ccb14424d5165fc2f9bbe7d910e60c06ed3f4c5fbddbbf5b4bc66153a84927a3779359f3d07b258a59766ff9d063585e1ecc70dc4d107c073bf529541dbf
-DIST VMware-Workstation-7.1.6-744570.x86_64.bundle 137422513 SHA256 1a0694349393ce326f62c291d76c1c5e8d5473b49bf986476e1485df422a2f8f SHA512 df72b0c770f9e356efd1bbffe2c596909f193bc2100a015cfbab819fea017ee735fcc932180c0cc5ffbe8223fa66a06dcd35e34d183b06f71c7ba937c440e2fd WHIRLPOOL e7b50e706b88e30801ccaeaedf59f5fbdf06342d8566a65b3cb19ec2c433da52768b55f9e5e58e274071c284d38280e0635f8a9c3fd2d01f53037c1082d15af3
-DIST VMware-Workstation-8.0.4-744019.i386.bundle.tar 189839360 SHA256 5b469de4f583fc0d33750253244c23e0f6a9d5b713e8d46ea3dd07f01af2b5ed SHA512 f0b17262594bf613a971c49843eec8fd1182a031c0cdca91824a1c6a0315e87183c0d99f6e37e2aa3a9a9a00f57efbbc6ff155094aa6cc776901177697aa8e49 WHIRLPOOL bf5a7a2f8c7cfc53fe2d0dfbe1b8b1fa9452a3eb0a1b5a70363dab4bd23c86a628a3938b5c5c30301639ea748347230fc3ad0b8977dabc1c2b828f6dde81b1f1
-DIST VMware-Workstation-8.0.4-744019.x86_64.bundle.tar 189552640 SHA256 83cdf3f4cf99afdd3e9685b5cc50f613094cc24e7502a2dc577f05640382a6c5 SHA512 87258301b157f9bade30094a02a5f3749342b00ccb5b1359d10152331d3d257bb1afe23fa7b68c973e2f4e2b9e9afc7ca52e99118041e1d45be3099f8d10d51c WHIRLPOOL 1bf6ce95e63042bb47971c36f55f943ef8ce736c5f9355fe7afbc114a09f716277199a847af041bd467cdb02170414bd660bafa54cce59029347e27ffda6eb73
-DIST VMware-Workstation-8.0.5-893925.i386.bundle.tar 188180480 SHA256 79033aa837a1b2fcf1229c407b159586152d41f3c624ae1745264443bad06a90 SHA512 2ea55d6ba1b64ee33ca73af46ce4ba58be441ecb973e4f9e3711b7d516b1d6233ee8e125c0d90226169258a5bbccf73f67ea593a1eaa48e7368275f545db3306 WHIRLPOOL 270b37814ee4c19bbe3e1d573016cf1899a90dc1c3500181eeb336220eebde276fb11bb4e46d3121a8e1517f749fe9a127eb76f642938d7b8e8f22ae3fbed556
-DIST VMware-Workstation-8.0.5-893925.x86_64.bundle.tar 187729920 SHA256 39010a8b712c9e9ea86f0bf32b1ad86a7788748f00292f344b1bdea899a6ac0d SHA512 010cbe7a6ffa6cd07b6daab8534c4da260aae17a6c7988e74792aa450f266bea306cca49820a65dfb3e0b76e912a5430fe98f4f0446f750fe26b867cfe2ed48d WHIRLPOOL dbf6994fbf87b3eca0fe882075dbdd68de599c7b699e609a43d3bade5e23704158ef11a13dea12b41c2c3c7d57ba493e324b4ebf2b138c9cf5835699ba76ae55
-DIST VMware-Workstation-9.0.2-1031769.i386.bundle.tar 264898560 SHA256 f23efa3db418790cffa38a90639edd0f5e0834fa98c69a3146489cc3774a71c7 SHA512 ea38c747e236e3a5ae3da809f22a997044c3306239afbc2cc28dfd04f3589dc23e35295bcb5dfb7f5ea687a908b790fb56afa062b7a5cea523c8645d94d652b0 WHIRLPOOL 18aaed121c973911d00a89790b98c8b22b942d29a3580181e7937fe27882d4cd30b2e0a7c13d22129c2e72c7cbce87cff0c80f32e6726d25cf67ec159506db46
-DIST VMware-Workstation-9.0.2-1031769.x86_64.bundle.tar 232693760 SHA256 53e175340086f8be2a9cf6c272fe1f8721aa06ed227a2c880a23323c4c491ee3 SHA512 2b11078e96826eaf8b83053fa091d9b7799810fdd93ef730f9732876f29a1d989728cd94c0dafb9f27e9e006c8930bb7546ca1b8bb9390a7c5d62b8ff507f5b4 WHIRLPOOL 37dc8d6cd17c8580f360d180b8fff160204d57afbfb74cc34ffb900766b9d362ebf809383a99478a586dcb9da41594d80880e9e84cb5e17433521c7f90196a4f
+DIST VMware-Workstation-10.0.2-1744117.i386.bundle.tar 283658240 SHA256 3b8fcdf6e459c93b3f2a69288eed53dc92931841d30f064701030434e08231ea SHA512 a5b574d8d0bf5c32a8aa177fcc7d51456ba11fe81e142ba1c16fd25393faa0944844ed10c9e6438ac66ebaeeeefeca1561a590f42768d1685347b93c7acacc23 WHIRLPOOL 53686ed03fdadbd829f560e432bd64d3f227a5f243ae921f2c789203c8a28f26f806ea30817937b31514abb740541ddb7c675855e6f93ec40f8f4d222e348888
+DIST VMware-Workstation-10.0.2-1744117.x86_64.bundle.tar 254115840 SHA256 95986090a4f2f59ae551a63a78f9ff5bdc3a87c48b25b10abb754720c3581f02 SHA512 69ede2f67e3283a3b234605ca5aa05555da008917d6b329ab6ca27f578620b6268ec79622b4fc5c331111f527fcac917dd78a844ad2ff4bbd0149aa4dbb7755d WHIRLPOOL 42117a4bb6184629ec2e8c13c39f3298c746a4fa10b0928cee3ccd1c3e4464af95f59c7ff0f71c44184d25cc91e593cbb40fd050275ee1e66b308010fc907a17
+DIST gentoo-01.tar.gz 1884 SHA256 e92c694865f1b29f4d7a39efa1dd87bc71dc5f922573f00a3d31ee8e27a8c335 SHA512 454ab93997781bd0a9accddb2ac7bb446f07ea7cddef5640369025c30e03592e14869e0f0f7b4457db2f1ada31c98051426016c86201afa8bc8e3aa4ccc2f875 WHIRLPOOL 9202583b617532ab2612b384da307218e7c93c2962f0d233e28bea066b07163c9bc51c0a599309f9d703c5575ebeb292d787716225624dc1c2fdff3c44fa3513
diff --git a/app-emulation/vmware-workstation/files/configure-hostd.sh b/app-emulation/vmware-workstation/files/configure-hostd.sh
deleted file mode 100644
index 480e903..0000000
--- a/app-emulation/vmware-workstation/files/configure-hostd.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-action="$1"
-
-case $action in
- add)
- rc-update -q add vmware-workstation-server default
- rc-service vmware-workstation-server start
- ;;
- remove)
- rc-update -q del vmware-workstation-server default
- rc-service vmware-workstation-server stop
- ;;
- status)
- rc-service -q vmware-workstation-server status
- ;;
- *)
- exit 1
- ;;
-esac
diff --git a/app-emulation/vmware-workstation/files/list-bundle-components.xsl b/app-emulation/vmware-workstation/files/list-bundle-components.xsl
deleted file mode 100644
index db1a4e4..0000000
--- a/app-emulation/vmware-workstation/files/list-bundle-components.xsl
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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-workstation/files/list-component-files.xsl b/app-emulation/vmware-workstation/files/list-component-files.xsl
deleted file mode 100644
index 91c6152..0000000
--- a/app-emulation/vmware-workstation/files/list-component-files.xsl
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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-workstation/files/vmware-9.0.rc b/app-emulation/vmware-workstation/files/vmware-9.0.rc
deleted file mode 100644
index ba9d82b..0000000
--- a/app-emulation/vmware-workstation/files/vmware-9.0.rc
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 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
- 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-workstation/files/vmware-server-8.0.rc b/app-emulation/vmware-workstation/files/vmware-server-8.0.rc
deleted file mode 100644
index 302db72..0000000
--- a/app-emulation/vmware-workstation/files/vmware-server-8.0.rc
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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-server-9.0.rc b/app-emulation/vmware-workstation/files/vmware-server-9.0.rc
deleted file mode 100644
index 302db72..0000000
--- a/app-emulation/vmware-workstation/files/vmware-server-9.0.rc
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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/vmware-workstation-9.0.2.1031769.ebuild b/app-emulation/vmware-workstation/vmware-workstation-10.0.2.1744117.ebuild
index 031fe78..501e70f 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-9.0.2.1031769.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-10.0.2.1744117.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-9.0.2.1031769.ebuild,v 1.2 2013/06/22 22:44:06 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-10.0.2.1744117.ebuild,v 1.1 2014/04/19 10:13:35 dilfridge Exp $
EAPI="4"
-inherit eutils versionator fdo-mime gnome2-utils pam vmware-bundle
+inherit eutils versionator fdo-mime systemd gnome2-utils pam vmware-bundle
MY_PN="VMware-Workstation"
MY_PV=$(get_version_component_range 1-3)
@@ -12,12 +12,15 @@ 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="
x86? ( ${BASE_URI}${MY_P}.i386.bundle.tar )
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"
@@ -37,6 +40,7 @@ RDEPEND="dev-cpp/cairomm
dev-libs/icu
dev-libs/expat
dev-libs/libaio
+ dev-libs/libgcrypt:0
dev-libs/libsigc++
dev-libs/libxml2
=dev-libs/openssl-0.9.8*
@@ -77,10 +81,11 @@ RDEPEND="dev-cpp/cairomm
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-271.${PV_MINOR}
+PDEPEND="~app-emulation/vmware-modules-279.${PV_MINOR}
vmware-tools? ( app-emulation/vmware-tools )"
S=${WORKDIR}
@@ -90,7 +95,9 @@ VM_HOSTD_USER="root"
src_unpack() {
default
- local bundle=${A%.tar}
+ local bundle
+ use amd64 && bundle=${MY_P}.x86_64.bundle
+ use x86 && bundle=${MY_P}.i386.bundle
local component; for component in \
vmware-vmx \
vmware-player-app \
@@ -110,7 +117,7 @@ src_unpack() {
if use vix; then
vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-core vmware-vix
- vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-lib-Workstation900andvSphere510 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
@@ -277,8 +284,8 @@ src_install() {
fi
# create symlinks for the various tools
- local tool ; for tool in thnuclnt vmware vmplayer{,-daemon} \
- vmware-{acetool,enter-serial,gksu,fuseUI,modconfig{,-console},netcfg,tray,unity-helper} ; do
+ 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
@@ -451,6 +458,9 @@ src_install() {
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() {