see changelog

svn path=/trunk/; revision=385

5 files changed, 204 insertions, 6 deletions

diff --git a/app-emulation/vmware-player/ChangeLog b/app-emulation/vmware-player/ChangeLog
index 05fb5fb..dcbfc8a 100644
--- a/app-emulation/vmware-player/ChangeLog
+++ b/app-emulation/vmware-player/ChangeLog
@@ -2,6 +2,16 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*vmware-player-3.0.1.227600-r1 (03 Mar 2010)
+
+  03 Mar 2010; Vadim Kuznetsov <vadimk@gentoo.org>
+  vmware-player-3.0.1.227600.ebuild, +vmware-player-3.0.1.227600-r1.ebuild,
+  files/vmware-3.0.rc:
+  Only lib goes to /opt/vmware. Bin installs into /usr/bin. Thus no env.d/90
+  No more player subfolder, just /opt/vmware. 
+  config file is moved inside of ebuild.
+  Added fetch restrictions.
+
 *vmware-player-3.0.1.227600 (01 Mar 2010)
 
   01 Mar 2010; Vadim Kuznetsov <vadimk@gentoo.org>
diff --git a/app-emulation/vmware-player/Manifest b/app-emulation/vmware-player/Manifest
index 230eac9..bc3c971 100644
--- a/app-emulation/vmware-player/Manifest
+++ b/app-emulation/vmware-player/Manifest
@@ -1,9 +1,10 @@
 AUX config-3.0 308 RMD160 4773cf7aba9b54c37f24dddeaef24a3899d2efed SHA1 574e77f24b11d169c535ed0f7f4cdd1a5c472425 SHA256 f00e4bb7e23d1d9dffdb5043705f512dba34c641121401851ab77c648fe64a70
 AUX list-bundle-components.xsl 470 RMD160 c45fe9d1690eac831c79bc63ef68de45d1265891 SHA1 d35982cfe4f3052fff013059d1df495c672ddd0e SHA256 4fe6b25ecbb99b3a4f15cbb8de41be466ff545f8e9fa1110d62ca0cf24e72395
 AUX list-component-files.xsl 545 RMD160 46747c300daf5c6b2c143f02840a94a409f381c4 SHA1 40b6e4cd0bb189ec9997e8b6009c9508082ed51a SHA256 6682c07630ef4586016776e065018f8695a790c5297408597b1ae24692fab629
-AUX vmware-3.0.rc 490 RMD160 160fa8e99909e734268873ad2f0a3ece5d3e396a SHA1 7de796a256f799b0bad86dcd2f269dfd293a312e SHA256 031c5a9178d23fa0a8cd60f50e3b5b646d7b4fbd5c4ab3bc29a85d7fed9f4d0a
+AUX vmware-3.0.rc 462 RMD160 8226bfcbcc745e80f9e880db80c28bc8673ba120 SHA1 3a5f485d31586cf1386ac6c691c1e5ef9e356b0d SHA256 cbd56dfd5ce43ae2efbd01046478dfb55d9fef9ded571741e5acb0c34fdaece8
 DIST VMware-Player-3.0.1-227600.i386.bundle 84974107 RMD160 4337339976d25d8dbd1f4904ba2ed2b53d1e9c49 SHA1 cff76010f0429576288ea1e5a594cd47a2c64f4a SHA256 9314e49ebb252fd937032481b13d0bea4a3af6409485e79576f797834b978285
 DIST VMware-Player-3.0.1-227600.x86_64.bundle 79959324 RMD160 c6652acadc760bab8ecfed2682706e31f51423ef SHA1 84f25370d24c03a18968a4f4c8e06cef3d21c2df SHA256 8347b3fa0c1cd1c88c3c8049462f3d0d752d6f7daa747a7d2a67667a3f55f190
-EBUILD vmware-player-3.0.1.227600.ebuild 5846 RMD160 5db1467424b05c6a8eb0fe87327bf362e085e7c6 SHA1 0ae6eb1e55992639677ba5849c2ee529934fa7d3 SHA256 a04465521066243444a4fca7ff2fe33a5ce88184daf44260e95559cbf60fdcf2
-MISC ChangeLog 825 RMD160 6d82b232c40013bf5fe3c22ac9ddd8df2d5bc152 SHA1 5385f8721a68a7aa6bfd510ac81f964ed9d9d657 SHA256 f94299832175bb48ab3d16dd7f70834d036196b58611b77b0886597278b3709a
+EBUILD vmware-player-3.0.1.227600-r1.ebuild 5799 RMD160 16716d99dba58a5512f42a2435aa5a3e1a036c0b SHA1 35192bf8fdb6713b855c92e89f33837eeedf9d03 SHA256 fb0fb0f0e882e343af284fc44d017985d5fdcc5c6012a9f067b5aeaaf1aa1d17
+EBUILD vmware-player-3.0.1.227600.ebuild 5852 RMD160 b6a1ba2e67a5ed38c3be96c7e31db9dfaf54d3ad SHA1 d910759939a4a977db9411470e32b78b6342ca03 SHA256 cf1722ec1f3be23f3a43f7360bf8f200f28ba24d856faadf32a7c0ef8f80b78a
+MISC ChangeLog 1215 RMD160 51d2b426d227f9fc3e87b34c3601020f63cbb714 SHA1 0ddd34fbb53f821c8a204722a1bc010ccb21c353 SHA256 c287da5b4adff1df106683299da8d19db39ece0fc174400783e671adc4530340
 MISC metadata.xml 159 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 SHA1 f46b02a39bcd0165558de67ff4256cfc812418a3 SHA256 8581ae1c90a48f50fa0542c7fb28cb8984baaf12f50fa18f33e467081effb215
diff --git a/app-emulation/vmware-player/files/vmware-3.0.rc b/app-emulation/vmware-player/files/vmware-3.0.rc
index 70757cc..46fe200 100644
--- a/app-emulation/vmware-player/files/vmware-3.0.rc
+++ b/app-emulation/vmware-player/files/vmware-3.0.rc
@@ -11,13 +11,13 @@ depend() {
 start() {
 	ebegin Starting VMware services
 	modprobe -a vmmon vmci vsock vmblock vmnet || eend $?
-	/opt/vmware/player/bin/vmware-networks --start
+	/usr/bin/vmware-networks --start
 	eend $?
 }
 
 stop() {
 	ebegin Stopping VMware services
-	/opt/vmware/player/bin/vmware-networks --stop || eend $?
+	/usr/bin/vmware-networks --stop || eend $?
 	modprobe -r vsock vmci vmmon vmblock vmnet
 	eend $?
 }
diff --git a/app-emulation/vmware-player/vmware-player-3.0.1.227600-r1.ebuild b/app-emulation/vmware-player/vmware-player-3.0.1.227600-r1.ebuild
new file mode 100644
index 0000000..62afd91
--- /dev/null
+++ b/app-emulation/vmware-player/vmware-player-3.0.1.227600-r1.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/vmware-player-2.5.3.185404.ebuild,v 1.4 2009/09/25 10:37:05 maekke Exp $
+
+EAPI="2"
+
+inherit eutils versionator fdo-mime gnome2-utils
+
+MY_PN="VMware-Player-$(replace_version_separator 3 - $PV)"
+
+DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
+HOMEPAGE="http://www.vmware.com/products/desktop/ws_features.html"
+SRC_URI="
+	x86? ( mirror://vmware/software/vmplayer/${MY_PN}.i386.bundle )
+	amd64? ( mirror://vmware/software/vmplayer/${MY_PN}.x86_64.bundle )
+	"
+
+LICENSE="vmware"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+RESTRICT="binchecks fetch strip"
+
+# vmware-workstation should not use virtual/libc as this is a
+# precompiled binary package thats linked to glibc.
+DEPEND="dev-libs/libxslt"
+RDEPEND="
+	~app-emulation/vmware-modules-1.0.0.26
+	dev-cpp/cairomm
+	dev-cpp/libgnomecanvasmm
+	dev-cpp/libsexymm
+	sys-libs/glibc
+	sys-apps/pciutils
+	>=x11-libs/libview-0.6.2
+	x11-libs/libXcursor
+	x11-libs/libXft
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	!app-emulation/vmware-server
+	!app-emulation/vmware-workstation
+	"
+
+S=${WORKDIR}
+VM_INSTALL_DIR="/opt/vmware"
+
+pkg_nofetch() {
+	if use x86; then
+		MY_P="${MY_PN}.i386"
+	elif use amd64; then
+		MY_P="${MY_PN}.x86_64"
+	fi
+
+	einfo "Please download the ${MY_P}.bundle from ${HOMEPAGE}"
+}
+
+src_unpack() {
+	bundle_extract_component "${DISTDIR}/${A}" vmware-player-app
+}
+
+src_prepare() {
+	rm -rf "${S}"/vmware-player-app/lib/modules/binary
+}
+
+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}")
+
+	cd "${S}"/vmware-player-app
+
+	# install the binaries
+	into /usr
+	dobin bin/*
+	dosbin sbin/*
+
+	# install the ancillaries
+	insinto /usr
+	doins -r share
+
+	# install the libraries
+	insinto "${VM_INSTALL_DIR}"
+	doins -r lib/*
+
+	# create symlinks for the various tools
+	local tool ; for tool in vmplayer{,-daemon} \
+			vmware-{acetool,unity-helper,modconfig{,-console},gksu,fuseUI} ; do
+		dosym appLoader "${VM_INSTALL_DIR}"/bin/"${tool}"
+	done
+	dosym "${VM_INSTALL_DIR}"/bin/vmplayer /usr/bin/vmplayer
+
+	# fix up permissions
+	chmod 0755 "${D}${VM_INSTALL_DIR}"/{bin/*,lib/{libgksu2.so.0/gksu-run-helper,wrapper-gtk24.sh}}
+	chmod 04711 "${D}"/usr/sbin/vmware-authd
+	chmod 04711 "${D}${VM_INSTALL_DIR}"/bin/vmware-vmx*
+
+	# create the configuration
+	dodir /etc/vmware
+
+	cat > "${D}"/etc/vmware/bootstrap <<-EOF
+		BINDIR='/usr/bin'
+		LIBDIR='/opt'
+	EOF
+
+	cat > "${D}"/etc/vmware/config <<-EOF 
+		bindir = "/usr/bin"
+		libdir = "${VM_INSTALL_DIR}"
+		initscriptdir = "/etc/init.d"
+		authd.fullpath = "/usr/sbin/vmware-authd"
+		gksu.rootMethod = "su"
+		VMCI_CONFED = "yes"
+		VMBLOCK_CONFED = "yes"
+		VSOCK_CONFED = "yes"
+		NETWORKING = "yes"
+		player.product.version = "${major_minor_revision}"
+		product.buildNumber = "${build}"
+	EOF
+
+	# install the init.d script
+	newinitd "${FILESDIR}/vmware-${major_minor}.rc" vmware
+
+	# fill in variable placeholders
+	sed -e "s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/libconf:g" \
+			-i "${D}${VM_INSTALL_DIR}"/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}}
+	sed -e "s:@@BINARY@@:/usr/bin/vmplayer:g" \
+			-i "${D}/usr/share/applications/${PN}.desktop"
+
+	# install documentation
+	dodoc doc/*
+}
+
+pkg_config() {
+	/usr/bin/vmware-networks --postinstall ${PN},old,new
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+
+	ewarn "Before you can use vmware-player, you must configure a default network setup."
+	ewarn "You can do this by running 'emerge --config ${PN}'."
+}
+
+pkg_prerm() {
+	einfo "Stopping ${PN} for safe unmerge"
+	/etc/init.d/vmware stop
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+bundle_extract_component() {
+	local -i bundle_size=$(stat -L -c'%s' "${1}")
+	local -i bundle_manifestOffset=$(od -An -j$((bundle_size-36)) -N4 -tu4 "${1}")
+	local -i bundle_manifestSize=$(od -An -j$((bundle_size-40)) -N4 -tu4 "${1}")
+	local -i bundle_dataOffset=$(od -An -j$((bundle_size-44)) -N4 -tu4 "${1}")
+	local -i bundle_dataSize=$(od -An -j$((bundle_size-52)) -N8 -tu8 "${1}")
+	tail -c+$((bundle_manifestOffset+1)) "${1}" 2> /dev/null | head -c$((bundle_manifestSize)) |
+		xsltproc "${FILESDIR}"/list-bundle-components.xsl - |
+		while read -r component_offset component_size component_name ; do
+			if [[ ${component_name} == ${2} ]] ; then
+				ebegin "Extracting '${component_name}' component from '$(basename "${1}")'"
+				declare -i component_manifestOffset=$(od -An -j$((bundle_dataOffset+component_offset+9)) -N4 -tu4 "${1}")
+				declare -i component_manifestSize=$(od -An -j$((bundle_dataOffset+component_offset+13)) -N4 -tu4 "${1}")
+				declare -i component_dataOffset=$(od -An -j$((bundle_dataOffset+component_offset+17)) -N4 -tu4 "${1}")
+				declare -i component_dataSize=$(od -An -j$((bundle_dataOffset+component_offset+21)) -N8 -tu8 "${1}")
+				tail -c+$((bundle_dataOffset+component_offset+component_manifestOffset+1)) "${1}" 2> /dev/null |
+					head -c$((component_manifestSize)) | xsltproc "${FILESDIR}"/list-component-files.xsl - |
+					while read -r file_offset file_compressedSize file_uncompressedSize file_path ; do
+						if [[ ${file_path} ]] ; then
+							echo -n '.'
+							file_path="${component_name}/${file_path}"
+							mkdir -p "$(dirname "${file_path}")"
+							tail -c+$((bundle_dataOffset+component_offset+component_dataOffset+file_offset+1)) "${1}" 2> /dev/null |
+								head -c$((file_compressedSize)) | gzip -cd > "${file_path}"
+						fi
+					done
+				echo ; eend
+			fi
+		done
+}
diff --git a/app-emulation/vmware-player/vmware-player-3.0.1.227600.ebuild b/app-emulation/vmware-player/vmware-player-3.0.1.227600.ebuild
index b640af2..43bd29f 100644
--- a/app-emulation/vmware-player/vmware-player-3.0.1.227600.ebuild
+++ b/app-emulation/vmware-player/vmware-player-3.0.1.227600.ebuild
@@ -19,7 +19,7 @@ LICENSE="vmware"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
-RESTRICT="strip binchecks"
+RESTRICT="strip fetch binchecks"
 
 # vmware-workstation should not use virtual/libc as this is a
 # precompiled binary package thats linked to glibc.