bump vmware desktop. bug 421269

(Portage version: 2.1.10.65/cvs/Linux x86_64)

3 files changed, 27 insertions, 30 deletions

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