Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app-emulation/vmware-modules/ChangeLog10
-rw-r--r--app-emulation/vmware-modules/vmware-modules-238.6.ebuild (renamed from app-emulation/vmware-modules/vmware-modules-238.5-r1.ebuild)4
-rw-r--r--app-emulation/vmware-modules/vmware-modules-264.4.ebuild (renamed from app-emulation/vmware-modules/vmware-modules-264.3.ebuild)2
-rw-r--r--app-emulation/vmware-player/ChangeLog10
-rw-r--r--app-emulation/vmware-player/vmware-player-3.1.6.744570.ebuild (renamed from app-emulation/vmware-player/vmware-player-3.1.5.491717.ebuild)7
-rw-r--r--app-emulation/vmware-player/vmware-player-4.0.4.744019-r1.ebuild (renamed from app-emulation/vmware-player/vmware-player-4.0.3.703057.ebuild)40
-rw-r--r--app-emulation/vmware-tools/ChangeLog10
-rw-r--r--app-emulation/vmware-tools/vmware-tools-8.4.9.744570.ebuild (renamed from app-emulation/vmware-tools/vmware-tools-8.8.2.703057.ebuild)6
-rw-r--r--app-emulation/vmware-tools/vmware-tools-8.8.4.744019.ebuild (renamed from app-emulation/vmware-tools/vmware-tools-8.4.8.491717.ebuild)4
-rw-r--r--app-emulation/vmware-vix/Manifest21
-rw-r--r--app-emulation/vmware-workstation/ChangeLog12
-rw-r--r--app-emulation/vmware-workstation/files/configure-hostd.sh20
-rw-r--r--app-emulation/vmware-workstation/vmware-workstation-7.1.6.744570.ebuild (renamed from app-emulation/vmware-workstation/vmware-workstation-7.1.5.491717.ebuild)6
-rw-r--r--app-emulation/vmware-workstation/vmware-workstation-8.0.4.744019-r1.ebuild (renamed from app-emulation/vmware-workstation/vmware-workstation-8.0.3.703057.ebuild)59
14 files changed, 113 insertions, 98 deletions
diff --git a/app-emulation/vmware-modules/ChangeLog b/app-emulation/vmware-modules/ChangeLog
index ec184ead4f5e..377e976ac2f6 100644
--- a/app-emulation/vmware-modules/ChangeLog
+++ b/app-emulation/vmware-modules/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for app-emulation/vmware-modules
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.96 2012/06/01 00:06:32 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.97 2012/06/17 13:09:10 vadimk Exp $
+
+*vmware-modules-238.6 (17 Jun 2012)
+*vmware-modules-264.4 (17 Jun 2012)
+
+ 17 Jun 2012; Vadim Kuznetsov vadimk@gentoo.org +vmware-modules-238.6.ebuild,
+ +vmware-modules-264.4.ebuild, -vmware-modules-238.5-r1.ebuild,
+ -vmware-modules-264.3.ebuild:
+ bump vmware desktop. bug 421269
01 Jun 2012; Zac Medico <zmedico@gentoo.org> vmware-modules-238.5-r1.ebuild,
vmware-modules-264.3.ebuild:
diff --git a/app-emulation/vmware-modules/vmware-modules-238.5-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-238.6.ebuild
index 0ba14dca1dc9..930c41ac04e7 100644
--- a/app-emulation/vmware-modules/vmware-modules-238.5-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-238.6.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-238.5-r1.ebuild,v 1.3 2012/06/01 00:06:32 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-238.6.ebuild,v 1.1 2012/06/17 13:09:10 vadimk Exp $
-EAPI="2"
+EAPI="4"
inherit eutils flag-o-matic linux-info linux-mod user versionator
diff --git a/app-emulation/vmware-modules/vmware-modules-264.3.ebuild b/app-emulation/vmware-modules/vmware-modules-264.4.ebuild
index e6f00b3fb642..6a4edfd21851 100644
--- a/app-emulation/vmware-modules/vmware-modules-264.3.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-264.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-264.3.ebuild,v 1.3 2012/06/01 00:06:32 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-264.4.ebuild,v 1.1 2012/06/17 13:09:10 vadimk Exp $
EAPI="4"
diff --git a/app-emulation/vmware-player/ChangeLog b/app-emulation/vmware-player/ChangeLog
index 2014d0a351b6..169fded16191 100644
--- a/app-emulation/vmware-player/ChangeLog
+++ b/app-emulation/vmware-player/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for app-emulation/vmware-player
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/ChangeLog,v 1.105 2012/05/05 14:50:49 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/ChangeLog,v 1.106 2012/06/17 13:09:54 vadimk Exp $
+
+*vmware-player-3.1.6.744570 (17 Jun 2012)
+*vmware-player-4.0.4.744019-r1 (17 Jun 2012)
+
+ 17 Jun 2012; Vadim Kuznetsov vadimk@gentoo.org
+ +vmware-player-3.1.6.744570.ebuild, +vmware-player-4.0.4.744019-r1.ebuild,
+ -vmware-player-3.1.5.491717.ebuild, -vmware-player-4.0.3.703057.ebuild:
+ bump vmware desktop. bug 421269
*vmware-player-4.0.3.703057 (05 May 2012)
diff --git a/app-emulation/vmware-player/vmware-player-3.1.5.491717.ebuild b/app-emulation/vmware-player/vmware-player-3.1.6.744570.ebuild
index e549f84fcc8d..b17e449744f9 100644
--- a/app-emulation/vmware-player/vmware-player-3.1.5.491717.ebuild
+++ b/app-emulation/vmware-player/vmware-player-3.1.6.744570.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.5.491717.ebuild,v 1.2 2011/11/22 18:00:27 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/vmware-player-3.1.6.744570.ebuild,v 1.1 2012/06/17 13:09:54 vadimk Exp $
EAPI="2"
@@ -9,6 +9,7 @@ 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}"
+PV_MINOR=$(get_version_component_range 3)
DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
HOMEPAGE="http://www.vmware.com/products/player/"
@@ -76,7 +77,7 @@ RDEPEND="dev-cpp/cairomm
x11-libs/pango
x11-libs/startup-notification
!app-emulation/vmware-workstation"
-PDEPEND="~app-emulation/vmware-modules-238.5
+PDEPEND="~app-emulation/vmware-modules-238.${PV_MINOR}
vmware-tools? ( app-emulation/vmware-tools )"
S=${WORKDIR}/vmware-player-app
diff --git a/app-emulation/vmware-player/vmware-player-4.0.3.703057.ebuild b/app-emulation/vmware-player/vmware-player-4.0.4.744019-r1.ebuild
index 656e98d76c3f..94d538c1dac7 100644
--- a/app-emulation/vmware-player/vmware-player-4.0.3.703057.ebuild
+++ b/app-emulation/vmware-player/vmware-player-4.0.4.744019-r1.ebuild
@@ -1,28 +1,30 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/vmware-player-4.0.3.703057.ebuild,v 1.1 2012/05/05 14:50:49 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/vmware-player-4.0.4.744019-r1.ebuild,v 1.1 2012/06/17 13:09:54 vadimk Exp $
EAPI="4"
inherit eutils versionator fdo-mime gnome2-utils pax-utils vmware-bundle
MY_PN="VMware-Player"
-MY_PV="$(replace_version_separator 3 - $PV)"
-MY_P="${MY_PN}-${MY_PV}"
+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}"
DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
HOMEPAGE="http://www.vmware.com/products/player/"
+BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/player/${MY_PV}/${PV_BUILD}/linux/core/"
SRC_URI="
- x86? ( ${MY_P}.i386.bundle )
- amd64? ( ${MY_P}.x86_64.bundle )
+ x86? ( ${BASE_URI}${MY_P}.i386.bundle.tar )
+ amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar )
"
LICENSE="vmware"
SLOT="0"
KEYWORDS="-* ~amd64 ~x86"
IUSE="cups doc +vmware-tools"
-RESTRICT="binchecks fetch strip"
+RESTRICT="binchecks strip"
# vmware-workstation should not use virtual/libc as this is a
# precompiled binary package thats linked to glibc.
@@ -83,21 +85,10 @@ PDEPEND="~app-emulation/vmware-modules-264.${PV_MINOR}
S=${WORKDIR}
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() {
+ default
+ local bundle=${A%.tar}
+
local component ; for component in \
vmware-player \
vmware-player-app \
@@ -107,7 +98,7 @@ src_unpack() {
vmware-player-setup
#vmware-ovftool
do
- vmware-bundle_extract-bundle-component "${DISTDIR}/${A}" "${component}" "${S}"
+ vmware-bundle_extract-bundle-component "${bundle}" "${component}" "${S}"
done
}
@@ -130,9 +121,6 @@ libgcr.so.0' | while read -r libname libpath ; do
}
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"
@@ -202,8 +190,8 @@ src_install() {
VMBLOCK_CONFED = "yes"
VSOCK_CONFED = "yes"
NETWORKING = "yes"
- player.product.version = "${major_minor_revision}"
- product.buildNumber = "${build}"
+ player.product.version = "${MY_PV}"
+ product.buildNumber = "${PV_BUILD}"
EOF
# install the init.d script
diff --git a/app-emulation/vmware-tools/ChangeLog b/app-emulation/vmware-tools/ChangeLog
index 7a702ab6a6c5..c90bc720285a 100644
--- a/app-emulation/vmware-tools/ChangeLog
+++ b/app-emulation/vmware-tools/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for app-emulation/vmware-tools
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-tools/ChangeLog,v 1.10 2012/05/05 14:49:10 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-tools/ChangeLog,v 1.11 2012/06/17 13:10:27 vadimk Exp $
+
+*vmware-tools-8.8.4.744019 (17 Jun 2012)
+*vmware-tools-8.4.9.744570 (17 Jun 2012)
+
+ 17 Jun 2012; Vadim Kuznetsov vadimk@gentoo.org
+ +vmware-tools-8.4.9.744570.ebuild, +vmware-tools-8.8.4.744019.ebuild,
+ -vmware-tools-8.4.8.491717.ebuild, -vmware-tools-8.8.2.703057.ebuild:
+ bump vmware desktop. bug 421269
*vmware-tools-8.8.2.703057 (05 May 2012)
diff --git a/app-emulation/vmware-tools/vmware-tools-8.8.2.703057.ebuild b/app-emulation/vmware-tools/vmware-tools-8.4.9.744570.ebuild
index 03343727c6ea..47ad1738fd21 100644
--- a/app-emulation/vmware-tools/vmware-tools-8.8.2.703057.ebuild
+++ b/app-emulation/vmware-tools/vmware-tools-8.4.9.744570.ebuild
@@ -1,11 +1,11 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-tools/vmware-tools-8.8.2.703057.ebuild,v 1.1 2012/05/05 14:49:10 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-tools/vmware-tools-8.4.9.744570.ebuild,v 1.1 2012/06/17 13:10:27 vadimk Exp $
inherit versionator vmware-bundle
MY_PV="$(replace_version_separator 3 - $PV)"
-BASE_URI="http://softwareupdate.vmware.com/cds/vmw-desktop/player/4.0.3/$(get_version_component_range 4)/linux/packages/"
+BASE_URI="http://softwareupdate.vmware.com/cds/vmw-desktop/player/3.1.$(($(get_version_component_range 3)-3))/$(get_version_component_range 4)/linux/packages/"
DESCRIPTION="VMware Tools for guest operating systems"
HOMEPAGE="http://www.vmware.com/products/player/"
@@ -16,7 +16,7 @@ KEYWORDS="-* ~amd64 ~x86"
RESTRICT="mirror"
IUSE=""
-DEPEND=""
+DEPEND="!<app-emulation/vmware-workstation-7"
RDEPEND=""
IUSE_VMWARE_GUEST="freebsd linux netware solaris windows winPre2k"
diff --git a/app-emulation/vmware-tools/vmware-tools-8.4.8.491717.ebuild b/app-emulation/vmware-tools/vmware-tools-8.8.4.744019.ebuild
index f06b0efce75e..d8e713c2eb79 100644
--- a/app-emulation/vmware-tools/vmware-tools-8.4.8.491717.ebuild
+++ b/app-emulation/vmware-tools/vmware-tools-8.8.4.744019.ebuild
@@ -1,11 +1,11 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-tools/vmware-tools-8.4.8.491717.ebuild,v 1.2 2012/03/10 14:19:04 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-tools/vmware-tools-8.8.4.744019.ebuild,v 1.1 2012/06/17 13:10:27 vadimk Exp $
inherit versionator vmware-bundle
MY_PV="$(replace_version_separator 3 - $PV)"
-BASE_URI="http://softwareupdate.vmware.com/cds/vmw-desktop/player/3.1.5/491717/linux/packages/"
+BASE_URI="http://softwareupdate.vmware.com/cds/vmw-desktop/player/4.0.$(get_version_component_range 3)/$(get_version_component_range 4)/linux/packages/"
DESCRIPTION="VMware Tools for guest operating systems"
HOMEPAGE="http://www.vmware.com/products/player/"
diff --git a/app-emulation/vmware-vix/Manifest b/app-emulation/vmware-vix/Manifest
index 7b3802b7fedf..3fea06a70896 100644
--- a/app-emulation/vmware-vix/Manifest
+++ b/app-emulation/vmware-vix/Manifest
@@ -1,18 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST VMware-VIX-1.11.1-528992.i386.bundle 76080744 RMD160 e00bf46b197b718719f96f957882580617ece471 SHA1 3326051e398d5ffffabac181f48af17429ada958 SHA256 94ea02b4f385c2b02df7b5e1452bc06f7d592ac0e0b2117f8a39d2f6a779fbbd
-DIST VMware-VIX-1.11.1-528992.x86_64.bundle 79344105 RMD160 2c69dd8cd0284a242a27f2a36e6dbe5fc2fb9727 SHA1 2b272f26dd8b60c0c4fb9e2cb8b0ddde8700bb6a SHA256 d43e42c4f9ecc1cf60e075511a446f16091ea8f367b006c89ef230351cb7eef7
-DIST VMware-vix-1.6.2-156745.i386.tar.gz 18413447 RMD160 36d7e4c3740e109c515de5150ec7ed969db421b1 SHA1 01ef532e329f56c6839a5be9531673623b7ddcd4 SHA256 5e230879d5c24dffda36c9b0fc69637dcdd9fffd3b306f86a5ebd9ba231a6f5b
-DIST VMware-vix-1.6.2-156745.x86_64.tar.gz 22657119 RMD160 1841373c363a71645a5f8ab2b4e3790bf00d21e9 SHA1 034a7f75d58b73bc31d02c8f2503f7fdd1f1fe31 SHA256 c37b58d1cfa3686138178cc60af92c48e81ccca6f039c966ebb43928fc95adb7
-EBUILD vmware-vix-1.11.1.528992.ebuild 2783 RMD160 b376bdc329efcb68d88086d4706ea6acb00d2e36 SHA1 cdab11b5139dba5ea09308ec3618ff8114a00cc9 SHA256 0eee655d179fa430ce17f2e3777b5ffae15637687d69b18e6925eed2de132a42
-EBUILD vmware-vix-1.6.2.156745-r2.ebuild 5887 RMD160 e177ed7503120cf1a6fa40b3c56c77912d9c108d SHA1 55efd6a632b172b3133681ab2433929fa14bfe15 SHA256 fcd351578c9b5c93963e968e3567cd43a532278fb4411c9405b479110cd5bd8c
-MISC ChangeLog 1145 RMD160 570970c57caa9303ac0e6c17056ffe3511953542 SHA1 ebd28a92da6abe12bb49184f8b906758acc303f9 SHA256 a1ba0281714c05775277bbaee636f53e7198d5520ae01f0262d825a83002496c
+DIST VMware-VIX-1.11.4-744019.i386.bundle 76259648 RMD160 a7f463dcdf2e1ad9acc9aa7fde3439e7f9fa3100 SHA1 7a08a47ca0e18c2e8ad2a1a4ee7962af9dd894dd SHA256 0e866bbdcc7f9ed7511af012a8645092a29d7d7b6cedd9d82d08560a9e3bde03
+DIST VMware-VIX-1.11.4-744019.x86_64.bundle 79518116 RMD160 937d4bd3012dd8141e4abdfb2755126f666715a9 SHA1 c19fb9d5b3d1681107292a6d01d7be1067f516b5 SHA256 0a77d6254963d15f9238c3054d98aa3597bdca7e7df69a55a6a74debdb2784be
+EBUILD vmware-vix-1.11.4.744019.ebuild 2783 RMD160 dd5bd035e393f9469f07dcd923c5aa9c7b69527b SHA1 6678e16e722d96c3b023cdf74a662aee77735498 SHA256 0ee99b33f5b835be32468f65be7126b64f54b2bfef49cd45f91de7b0327dfca0
+MISC ChangeLog 1366 RMD160 5c9de760fb3703fce4ed1f3fda3a502262183304 SHA1 8faa32ad2879ca2a8cc265c47b233c87cc9b3c6a SHA256 dd7f878880b689c162b6425d2c394ffe434bcbc2737f3b41f784aa0fd2d8c732
MISC metadata.xml 736 RMD160 9e0b6138a82c1ca34b847bc71bc072e44c60d95a SHA1 4365d9dc523f50c84cb02caf44fadf05ee996b3c SHA256 3882e8981caee5b279a4a1990df6b404e920ab088d6a4cd1d789cbb29e301f74
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEARECAAYFAk/ICBcACgkQ/ejvha5XGaPMsACfU+f58NJtW5jCJO/5mc90uqn+
-nzYAn1iEfv4TqVGgRV74ClgaUwMShJmd
-=1akX
------END PGP SIGNATURE-----
diff --git a/app-emulation/vmware-workstation/ChangeLog b/app-emulation/vmware-workstation/ChangeLog
index 7869929dde05..d2df4cb2cbfc 100644
--- a/app-emulation/vmware-workstation/ChangeLog
+++ b/app-emulation/vmware-workstation/ChangeLog
@@ -1,6 +1,16 @@
# ChangeLog for app-emulation/vmware-workstation
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.236 2012/05/05 14:52:20 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.237 2012/06/17 13:11:13 vadimk Exp $
+
+*vmware-workstation-8.0.4.744019-r1 (17 Jun 2012)
+*vmware-workstation-7.1.6.744570 (17 Jun 2012)
+
+ 17 Jun 2012; Vadim Kuznetsov vadimk@gentoo.org +files/configure-hostd.sh,
+ +vmware-workstation-7.1.6.744570.ebuild,
+ +vmware-workstation-8.0.4.744019-r1.ebuild,
+ -vmware-workstation-7.1.5.491717.ebuild,
+ -vmware-workstation-8.0.3.703057.ebuild:
+ bump vmware desktop. bug 421269
*vmware-workstation-8.0.3.703057 (05 May 2012)
diff --git a/app-emulation/vmware-workstation/files/configure-hostd.sh b/app-emulation/vmware-workstation/files/configure-hostd.sh
new file mode 100644
index 000000000000..480e9037d86d
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/configure-hostd.sh
@@ -0,0 +1,20 @@
+#!/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/vmware-workstation-7.1.5.491717.ebuild b/app-emulation/vmware-workstation/vmware-workstation-7.1.6.744570.ebuild
index b09436d9762b..3e8bf7328edc 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-7.1.5.491717.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-7.1.6.744570.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-7.1.5.491717.ebuild,v 1.3 2012/03/24 13:50:09 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-7.1.6.744570.ebuild,v 1.1 2012/06/17 13:11:13 vadimk Exp $
EAPI="2"
@@ -9,6 +9,7 @@ inherit eutils versionator fdo-mime gnome2-utils vmware-bundle
MY_PN="VMware-Workstation"
MY_PV="$(replace_version_separator 3 - $PV)"
MY_P="${MY_PN}-${MY_PV}"
+PV_MINOR=$(get_version_component_range 3)
DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
HOMEPAGE="http://www.vmware.com/products/workstation/"
@@ -76,8 +77,9 @@ RDEPEND="dev-cpp/cairomm
x11-libs/pango
x11-libs/startup-notification
x11-themes/hicolor-icon-theme
+ !app-emulation/vmware-server
!app-emulation/vmware-player"
-PDEPEND="~app-emulation/vmware-modules-238.5
+PDEPEND="~app-emulation/vmware-modules-238.${PV_MINOR}
vmware-tools? ( app-emulation/vmware-tools )"
S=${WORKDIR}
diff --git a/app-emulation/vmware-workstation/vmware-workstation-8.0.3.703057.ebuild b/app-emulation/vmware-workstation/vmware-workstation-8.0.4.744019-r1.ebuild
index 5cd1271eafb1..4603d4ae652c 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-8.0.3.703057.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-8.0.4.744019-r1.ebuild
@@ -1,28 +1,29 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-8.0.3.703057.ebuild,v 1.1 2012/05/05 14:52:20 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-8.0.4.744019-r1.ebuild,v 1.1 2012/06/17 13:11:13 vadimk Exp $
EAPI="4"
inherit eutils versionator fdo-mime gnome2-utils pam vmware-bundle
MY_PN="VMware-Workstation"
-MY_PV="$(replace_version_separator 3 - $PV)"
-MY_P="${MY_PN}-Full-${MY_PV}"
+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}"
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? ( ${MY_P}.i386.bundle )
- amd64? ( ${MY_P}.x86_64.bundle )
+ x86? ( ${BASE_URI}${MY_P}.i386.bundle.tar )
+ amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar )
"
-
LICENSE="vmware"
SLOT="0"
KEYWORDS="-* ~amd64 ~x86"
-IUSE="cups doc gnome kde ovftool server vix vmware-tools"
-RESTRICT="binchecks fetch mirror strip"
+IUSE="cups doc ovftool server vix vmware-tools"
+RESTRICT="binchecks mirror strip"
# vmware-workstation should not use virtual/libc as this is a
# precompiled binary package thats linked to glibc.
@@ -57,8 +58,6 @@ RDEPEND="dev-cpp/cairomm
sys-libs/glibc
sys-libs/zlib
x11-libs/cairo
- gnome? ( x11-libs/gksu )
- kde? ( kde-base/kdesu )
x11-libs/gtk+:2
x11-libs/libgksu
x11-libs/libICE
@@ -91,21 +90,9 @@ VM_INSTALL_DIR="/opt/vmware"
VM_DATA_STORE_DIR="/var/lib/vmware/Shared VMs"
VM_HOSTD_USER="root"
-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() {
+ default
+ local bundle=${A%.tar}
local component; for component in \
vmware-vmx \
vmware-player-app \
@@ -115,21 +102,20 @@ src_unpack() {
vmware-network-editor-ui \
vmware-usbarbitrator
do
- vmware-bundle_extract-bundle-component "${DISTDIR}/${A}" "${component}" "${S}"
+ vmware-bundle_extract-bundle-component "${bundle}" "${component}" "${S}"
done
if use server; then
- vmware-bundle_extract-bundle-component "${DISTDIR}/${A}" vmware-workstation-server #"${S}"
+ vmware-bundle_extract-bundle-component "${bundle}" vmware-workstation-server #"${S}"
fi
if use vix; then
- vmware-bundle_extract-bundle-component "${DISTDIR}/${A}" vmware-vix-core vmware-vix
- vmware-bundle_extract-bundle-component "${DISTDIR}/${A}" vmware-vix-lib-Workstation800andvSphere500 vmware-vix
+ vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-core vmware-vix
+ vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-lib-Workstation800andvSphere500 vmware-vix
fi
if use ovftool; then
- vmware-bundle_extract-bundle-component "${DISTDIR}/${A}" vmware-ovftool
+ vmware-bundle_extract-bundle-component "${bundle}" vmware-ovftool
fi
-
}
src_prepare() {
@@ -205,6 +191,10 @@ src_install() {
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/*
@@ -287,14 +277,6 @@ src_install() {
dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware "${VM_INSTALL_DIR}"/bin/vmware
dosym "${VM_INSTALL_DIR}"/lib/vmware/icu /etc/vmware/icu
- # fixing gksu problem
- if use gnome; then
- dosym /usr/bin/gksu "${VM_INSTALL_DIR}"/bin/vmware-gksu
- fi
- if use kde; then
- dosym /usr/bin/kdesu "${VM_INSTALL_DIR}"/bin/vmware-gksu
- fi
-
# 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}
@@ -304,6 +286,7 @@ src_install() {
if use server; then
fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-{hostd,vim-cmd,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