vmplayer: migrated to EAPI 4, added thinprint, QA fixes

svn path=/trunk/; revision=521

4 files changed, 27 insertions, 20 deletions

diff --git a/app-emulation/vmware-player/Manifest b/app-emulation/vmware-player/Manifest
index 2abf08b..0164ecd 100644
--- a/app-emulation/vmware-player/Manifest
+++ b/app-emulation/vmware-player/Manifest
@@ -10,5 +10,5 @@ DIST VMware-Player-4.0.1-528992.i386.bundle 131763315 RMD160 bd26399b4044079fc95
 DIST VMware-Player-4.0.1-528992.x86_64.bundle 129509694 RMD160 c530e38d42222c2eec0f63e24ee24057b8d3dce9 SHA1 7332763867b6ed1978271a3335c7e135a1293210 SHA256 57f5e22c28827e4edf000aa44054cf62d886ed4c174cbb0ebe5e0e0eb6e9995c
 EBUILD vmware-player-3.1.5.491717.ebuild 6334 RMD160 ee39299fbfb01c28c1890c862d3f39a4e3d7c163 SHA1 8b90cfe522e17a5c15b742afbc139d60decf9ca6 SHA256 ea378d1d5d1308689bacf2104f618dec655f732eff2c3e52ee11acb26656c57e
 EBUILD vmware-player-4.0.0.471780-r1.ebuild 6119 RMD160 95de6fc511bb09642221952dcd3bfc4027c482c1 SHA1 ec7687005ff737ce51da4b5a1cc414d8a47ccb52 SHA256 e07af6b3fbddfb6491fb0e04d9927b03164d5b248f7b0fe4b6b68d5fc10e40a5
-EBUILD vmware-player-4.0.1.528992-r1.ebuild 6138 RMD160 d2cc0278be65039eeb04fa79b70c1f4b4ef81e43 SHA1 8e507b032862d676288a5b552d53ac1ba531a5e7 SHA256 a521c524326a8532c7d1b65737a5ad5aad04b1e7c844d6ad437dc5e21448b216
+EBUILD vmware-player-4.0.1.528992-r1.ebuild 6073 RMD160 b3bbd7a05be46a68f493059124f90b338d1621ef SHA1 e279dc0d32d80121dfffb744f7cfc277cd93b510 SHA256 bc7e540bbb5b752d9d1184fc2b4ef6f6a7c7403ee2f0238bfc0411683bd4043a
 MISC metadata.xml 238 RMD160 beef158e0603e5808d104743feba4be3e7a7e8c4 SHA1 276217c6f03ae24c0196519197240031a6961254 SHA256 8374f3a2a8f05bf0690ab35f79a20980026aefa9fabae93fe81442f54291018b
diff --git a/app-emulation/vmware-player/vmware-player-4.0.1.528992-r1.ebuild b/app-emulation/vmware-player/vmware-player-4.0.1.528992-r1.ebuild
index 766a76b..e1a8fa9 100644
--- a/app-emulation/vmware-player/vmware-player-4.0.1.528992-r1.ebuild
+++ b/app-emulation/vmware-player/vmware-player-4.0.1.528992-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 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.4.385536.ebuild,v 1.1 2011/04/15 12:33:18 vadimk Exp $
+# $Header: $
 
-EAPI="2"
+EAPI="4"
 
 inherit eutils versionator fdo-mime gnome2-utils vmware-bundle
 
@@ -20,7 +20,7 @@ SRC_URI="
 LICENSE="vmware"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="doc +vmware-tools"
+IUSE="cups doc +vmware-tools"
 RESTRICT="binchecks fetch strip"
 
 # vmware-workstation should not use virtual/libc as this is a
@@ -47,6 +47,7 @@ RDEPEND="dev-cpp/cairomm
 	media-libs/libart_lgpl
 	=media-libs/libpng-1.2*
 	net-misc/curl
+	cups? ( net-print/cups )
 	sys-devel/gcc
 	sys-fs/fuse
 	sys-libs/glibc
@@ -138,27 +139,35 @@ src_install() {
 
 	# install the libraries
 	insinto "${VM_INSTALL_DIR}"/lib/vmware
-	doins -r lib/* || die "failed to install lib"
+	doins -r lib/*
 
 	# install the ancillaries
 	insinto /usr
-	doins -r share || die "failed to install share"
+	doins -r share
+
+	if use cups; then
+		exeinto $(cups-config --serverbin)/filter
+		doexe extras/thnucups
+
+		insinto /etc/cups
+		doins -r etc/cups/*
+	fi
 
 	# install documentation
 	if use doc; then
-		dodoc doc/* || die "failed to install docs"
+		dodoc doc/*
 	fi
 
 	# create symlinks for the various tools
-	local tool ; for tool in vmplayer{,-daemon} \
+	local tool ; for tool in thnuclnt vmplayer{,-daemon} \
 			vmware-{acetool,unity-helper,modconfig{,-console},gksu,fuseUI} ; do
-		dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}" || die
+		dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}"
 	done
-	dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer "${VM_INSTALL_DIR}"/bin/vmplayer || die
+	dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer "${VM_INSTALL_DIR}"/bin/vmplayer
 
 	# fix up permissions
-	chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware/{bin/*,lib/wrapper-gtk24.sh}
-	chmod 04711 "${D}${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx*
+	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/{bin/*,lib/wrapper-gtk24.sh}
+	fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx*
 
 	# create the environment
 	local envd="${T}/90vmware"
diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
index 82df207..24b54dd 100644
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@@ -11,5 +11,5 @@ DIST VMware-Workstation-Full-8.0.1-528992.i386.bundle 338993938 RMD160 57eac2aa9
 DIST VMware-Workstation-Full-8.0.1-528992.x86_64.bundle 338744697 RMD160 71ca85cd6f61de4152f0b7204764ef6851a03a06 SHA1 14a4f66c881a6a163bda0dfcaa3fa1240c061679 SHA256 33d2418aca44d9effa45a56804e7fc9e1dabc9e0b74ee188fc8b3a16ba4292fe
 EBUILD vmware-workstation-7.1.5.491717.ebuild 8264 RMD160 a90d1e633561f0d47aa252b63812e6c5e331ee94 SHA1 2a73547f67b10dda1d97d8d1c78f0231ebfdfc9f SHA256 b30027da9c1e27f88eb6edf69a53d38cc1f21e8e6d4b92164f5efea8e7111d2f
 EBUILD vmware-workstation-8.0.0.471780-r5.ebuild 13391 RMD160 bbd4d982057794d7772cda62c3f3c099f9054d35 SHA1 ed34dce95df0b771f59dd44c40bd9d9e4952b545 SHA256 5c32643dd2feeed6e2c52ce53404b4e6521200ae3638df65c67b4d3ed4e1612d
-EBUILD vmware-workstation-8.0.1.528992.ebuild 13391 RMD160 e9344cc58ed1f3a432582f8c888949ef4a61485f SHA1 7ab88c1fdf5258b568981e097222afaef5eb8d1b SHA256 92061ed54876676a6331a455bb767b395713a5e7c22583c615fbc1a76c511c78
+EBUILD vmware-workstation-8.0.1.528992.ebuild 13283 RMD160 0b06e09f2015111a8a3423cd66198d464f3cc6cd SHA1 3245c4b41f819da1618edd222664f74e8c38155f SHA256 49a5478eb550cc38f9b52eec9f0a2510a67b42fcf07d267487904195450524b1
 MISC metadata.xml 821 RMD160 3fe06e26c1f6550712d29d27dbbe1bde8eeb3d29 SHA1 4cacecf9b113a8c46e921e1738d5c191bf693872 SHA256 b5634de5978f816c03495e72d4ee1cb72b372209ee7b8a8e88cec8963aa38647
diff --git a/app-emulation/vmware-workstation/vmware-workstation-8.0.1.528992.ebuild b/app-emulation/vmware-workstation/vmware-workstation-8.0.1.528992.ebuild
index 96812b1..5d39428 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-8.0.1.528992.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-8.0.1.528992.ebuild
@@ -289,24 +289,22 @@ src_install() {
 
 	# fixing gksu problem
 	if use gnome; then
-		rm "${D}${VM_INSTALL_DIR}"/bin/vmware-gksu
 		dosym /usr/bin/gksu "${VM_INSTALL_DIR}"/bin/vmware-gksu
 	fi
 	if use kde; then
-		rm "${D}${VM_INSTALL_DIR}"/bin/vmware-gksu
 		dosym /usr/bin/kdesu "${VM_INSTALL_DIR}"/bin/vmware-gksu
 	fi
 
 	# fix up permissions
-	chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware/{bin/*,lib/wrapper-gtk24.sh,lib/libgksu2.so.0/gksu-run-helper,setup/*}
-	chmod 04711 "${D}${VM_INSTALL_DIR}"/bin/vmware-mount
+	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/{bin/*,lib/wrapper-gtk24.sh,lib/libgksu2.so.0/gksu-run-helper,setup/*}
+	fperms 4711 "${VM_INSTALL_DIR}"/bin/vmware-mount
 	if use server; then
-		chmod 04711 "${D}${VM_INSTALL_DIR}"/sbin/vmware-authd
+		fperms 4711 "${VM_INSTALL_DIR}"/sbin/vmware-authd
 	fi
-	chmod 04711 "${D}${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx*
+	fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx*
 
 	if use vix; then
-		chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware-vix/setup/*
+		fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware-vix/setup/*
 	fi
 
 	# create the environment