added use flag doc, fixed dependencies, added bunch of "or die"

svn path=/trunk/; revision=395

4 files changed, 33 insertions, 23 deletions

diff --git a/app-emulation/vmware-player/ChangeLog b/app-emulation/vmware-player/ChangeLog
index a797df2..b832b48 100644
--- a/app-emulation/vmware-player/ChangeLog
+++ b/app-emulation/vmware-player/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  24 Mar 2010; Vadim Kuznetsov <vadimk@gentoo.org>
+  vmware-player-3.0.1.227600-r3.ebuild:
+  added use flag doc, fixed dependencies, added bunch of "or die"
+
   09 Mar 2010; Vadim Kuznetsov <vadimk@gentoo.org>
   vmware-player-3.0.1.227600-r3.ebuild:
   minor changes.
diff --git a/app-emulation/vmware-player/Manifest b/app-emulation/vmware-player/Manifest
index 40086d3..86f320e 100644
--- a/app-emulation/vmware-player/Manifest
+++ b/app-emulation/vmware-player/Manifest
@@ -4,8 +4,8 @@ AUX list-component-files.xsl 545 RMD160 46747c300daf5c6b2c143f02840a94a409f381c4
 AUX vmware-3.0.rc 776 RMD160 21380174fda9e6bdc2a720ecd4c1742bf76b9439 SHA1 c6ec74a605b31cbb4f1f73a0639b8068545e8f33 SHA256 9a99d7c5a860893061f36ad2655f89340761cfbc3f58d7d633b3726b0cb5a7d0
 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-r1.ebuild 5799 RMD160 16716d99dba58a5512f42a2435aa5a3e1a036c0b SHA1 35192bf8fdb6713b855c92e89f33837eeedf9d03 SHA256 fb0fb0f0e882e343af284fc44d017985d5fdcc5c6012a9f067b5aeaaf1aa1d17
-EBUILD vmware-player-3.0.1.227600-r3.ebuild 6402 RMD160 fed7aaeee9a096e29c0d4031b154876c67cd4590 SHA1 fdc0b6a2b6934596e962d82d4553a62cca9cc414 SHA256 82f0ee8accf8e5f076b2f7c57589fd768dbb6e34a142d19915e69e16cc47535e
+EBUILD vmware-player-3.0.1.227600-r1.ebuild 5798 RMD160 bfce84bbc42bbba9b701ece7e34eff34d073bbc5 SHA1 85e9235bfba89d9365cb81f9e1ee429cb9e46c41 SHA256 3e7084d363f1d76ee987db9d0bfc4dd11afec6410db3b8ba9f5d5e8bad93f65e
+EBUILD vmware-player-3.0.1.227600-r3.ebuild 6714 RMD160 00f429adeb8cfe613094a03bdad2f2e3776724e7 SHA1 5baebb1a8e187bb57727b688cbd3c4486531bd83 SHA256 d952cafac7ccd592eda49ad3549da7e1545c730eaf6b67be859eb06656fd38d1
 EBUILD vmware-player-3.0.1.227600.ebuild 5852 RMD160 b6a1ba2e67a5ed38c3be96c7e31db9dfaf54d3ad SHA1 d910759939a4a977db9411470e32b78b6342ca03 SHA256 cf1722ec1f3be23f3a43f7360bf8f200f28ba24d856faadf32a7c0ef8f80b78a
-MISC ChangeLog 1797 RMD160 947ba0e7bd210bfcefded359ca0d08a4c3c04d79 SHA1 c088cb574772c4e5c60fe2a50dad88b516f7adcb SHA256 7b2847b37d1e045e95a227ea3c1819c05cfa93b47bfd4f33da2645a8dc053587
+MISC ChangeLog 1955 RMD160 93f3c89a11b913e226e8a997d770344f5c581d38 SHA1 aaf923aefe32ffb963115551a855ece78a9df1f5 SHA256 991233151d1d0f992ea08bf3e71ea51b887c99258035c9c4bda8bf0c34ec85f8
 MISC metadata.xml 159 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 SHA1 f46b02a39bcd0165558de67ff4256cfc812418a3 SHA256 8581ae1c90a48f50fa0542c7fb28cb8984baaf12f50fa18f33e467081effb215
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
index 62afd91..085756e 100644
--- 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
@@ -102,7 +102,7 @@ src_install() {
 		LIBDIR='/opt'
 	EOF
 
-	cat > "${D}"/etc/vmware/config <<-EOF 
+	cat > "${D}"/etc/vmware/config <<-EOF
 		bindir = "/usr/bin"
 		libdir = "${VM_INSTALL_DIR}"
 		initscriptdir = "/etc/init.d"
diff --git a/app-emulation/vmware-player/vmware-player-3.0.1.227600-r3.ebuild b/app-emulation/vmware-player/vmware-player-3.0.1.227600-r3.ebuild
index d2d62c6..eb34f33 100644
--- a/app-emulation/vmware-player/vmware-player-3.0.1.227600-r3.ebuild
+++ b/app-emulation/vmware-player/vmware-player-3.0.1.227600-r3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 LICENSE="vmware"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
+IUSE="doc"
 RESTRICT="binchecks fetch strip"
 
 # vmware-workstation should not use virtual/libc as this is a
@@ -31,8 +31,12 @@ RDEPEND="
 	dev-cpp/cairomm
 	dev-cpp/libgnomecanvasmm
 	dev-cpp/libsexymm
-	sys-libs/glibc
+	dev-libs/xmlrpc-c
+	net-misc/curl[ares]
+	sys-apps/hal
 	sys-apps/pciutils
+	sys-fs/fuse
+	sys-libs/glibc
 	>=x11-libs/libview-0.6.2
 	x11-libs/libXcursor
 	x11-libs/libXft
@@ -76,23 +80,28 @@ src_install() {
 
 	# install the binaries
 	into "${VM_INSTALL_DIR}"
-	dobin bin/*
-	dosbin sbin/*
+	dobin bin/* || die "failed to install bin"
+	dosbin sbin/* || die "failed to install sbin"
 
 	# install the libraries
 	insinto "${VM_INSTALL_DIR}"/lib/vmware
-	doins -r lib/*
+	doins -r lib/* || die "failed to install lib"
 
 	# install the ancillaries
 	insinto /usr
-	doins -r share
+	doins -r share || die "failed to install share"
+
+	# install documentation
+	if use doc; then
+		dodoc doc/* || die "failed to install docs"
+	fi
 
 	# 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}"/lib/vmware/bin/"${tool}"
+		dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}" || die
 	done
-	dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer "${VM_INSTALL_DIR}"/bin/vmplayer
+	dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer "${VM_INSTALL_DIR}"/bin/vmplayer || die
 
 	# fix up permissions
 	chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware/{bin/*,lib/{libgksu2.so.0/gksu-run-helper,wrapper-gtk24.sh}}
@@ -105,17 +114,17 @@ src_install() {
 		PATH='${VM_INSTALL_DIR}/bin'
 		ROOTPATH='${VM_INSTALL_DIR}/bin'
 	EOF
-	doenvd "${envd}"
+	doenvd "${envd}" || die
 
 	# create the configuration
-	dodir /etc/vmware
+	dodir /etc/vmware || die
 
 	cat > "${D}"/etc/vmware/bootstrap <<-EOF
 		BINDIR='${VM_INSTALL_DIR}/bin'
 		LIBDIR='${VM_INSTALL_DIR}/lib'
 	EOF
 
-	cat > "${D}"/etc/vmware/config <<-EOF 
+	cat > "${D}"/etc/vmware/config <<-EOF
 		bindir = "${VM_INSTALL_DIR}/bin"
 		libdir = "${VM_INSTALL_DIR}/lib/vmware"
 		initscriptdir = "/etc/init.d"
@@ -133,17 +142,14 @@ src_install() {
 	local initscript="${T}/vmware.rc"
 
 	sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
-		"${FILESDIR}/vmware-${major_minor}.rc" > ${initscript}
-	newinitd "${initscript}" vmware
+		"${FILESDIR}/vmware-${major_minor}.rc" > ${initscript} || die
+	newinitd "${initscript}" vmware || die
 
 	# 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}}
+		-i "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}} || die
 	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \
-		-i "${D}/usr/share/applications/${PN}.desktop"
-
-	# install documentation
-	dodoc doc/*
+		-i "${D}/usr/share/applications/${PN}.desktop" || die
 }
 
 pkg_config() {
@@ -158,7 +164,7 @@ pkg_postinst() {
 	fdo-mime_desktop_database_update
 	gnome2_icon_cache_update
 
-	ewarn "env.d was updated. Please run:"
+	ewarn "/etc/env.d was updated. Please run:"
 	ewarn "env-update && source /etc/profile"
 	ewarn ""
 	ewarn "Before you can use vmware-player, you must configure a default network setup."