Updated nxclient to latest version

Added desktop entries and icons
RDEPEND cleanup
Replaced nxwrapper by make_wrapper

svn path=/testing/; revision=119

3 files changed, 44 insertions, 35 deletions

diff --git a/net-misc/nxclient/Manifest b/net-misc/nxclient/Manifest
index 62eca3e..fd6787d 100644
--- a/net-misc/nxclient/Manifest
+++ b/net-misc/nxclient/Manifest
@@ -3,15 +3,15 @@ MD5 722d473cbcec099515ea389f2327acde files/nxwrapper 128
 RMD160 ee3e96fb8e3def2b211defac5ef6731f309f7718 files/nxwrapper 128
 SHA256 a0e4bfd47f857dd85b60b0802ba7daeb798cad3e6310aaf3582df9b233137a5a files/nxwrapper 128
 DIST nxclient-1.5.0-141.i386.rpm 3315783 RMD160 5facb8ee0c9690ec9849c5badf0b2440a10e337c SHA1 5645a78126f851db8d8eaf4d2db9a143715114ab SHA256 62b85d1bc38ec6a443b37803c3f78584cb4e666d699efa31e6c291e7ab452a33
-DIST nxclient-2.1.0-9.i386.tar.gz 3479744 RMD160 31acc314235cdf470ee7857801af3912c314d440 SHA1 3696e903ffb4f820e256d498215494a577b1cf37 SHA256 9d7d723e501495114a8a2d5bf1902cb22b4734e5f044c17a4ec2927ad4aadb9d
+DIST nxclient-2.1.0-11.i386.tar.gz 3505596 RMD160 5e877f993621e655ef2ad0228717a156a815690b SHA1 dca34c63dbb2321de6802f83a4707cf11d657d90 SHA256 c114f1e125494fd0ad1c4ad8371bbd8b97f3c4b24f0c43ca09a2b68b8eb5fe1f
 EBUILD nxclient-1.5.0-r5.ebuild 1730 RMD160 768a251ef04a5e054a9fdb12c77264539b304ce2 SHA1 5bd9704ad99c507c81f92e09055fbd8bedd8908c SHA256 1748a569084e3f7c3a6a28c7dedd0f66020c7e03611343416b0e36076290625a
 MD5 7074211c0f3f90f89e1be29e52c289b6 nxclient-1.5.0-r5.ebuild 1730
 RMD160 768a251ef04a5e054a9fdb12c77264539b304ce2 nxclient-1.5.0-r5.ebuild 1730
 SHA256 1748a569084e3f7c3a6a28c7dedd0f66020c7e03611343416b0e36076290625a nxclient-1.5.0-r5.ebuild 1730
-EBUILD nxclient-2.1.0.ebuild 1337 RMD160 23cff4d05b89eb2d935f4c1874c33e9ba018fb3b SHA1 b14e33504c8ae07e08d3273f9eaafb6844e238d3 SHA256 6bf43452de6fb7718be40675c0a89f280c7c37056b6499052c49eb85decdbc32
-MD5 7fa43e2f3b68fbb76c2175aea9a6a3bd nxclient-2.1.0.ebuild 1337
-RMD160 23cff4d05b89eb2d935f4c1874c33e9ba018fb3b nxclient-2.1.0.ebuild 1337
-SHA256 6bf43452de6fb7718be40675c0a89f280c7c37056b6499052c49eb85decdbc32 nxclient-2.1.0.ebuild 1337
+EBUILD nxclient-2.1.0.ebuild 1832 RMD160 de244831038714a0775cb549cec0e521bc39ae5a SHA1 6bc7c55359b3c13ae11d98bd5544ae8cf4a88869 SHA256 6a74adbf2f922dafcb64b62f0c9ddbfb1252f1a0cff97ea5ce6b2de52d3c445e
+MD5 35ff9f5e4e64c58b011b7c5648c28305 nxclient-2.1.0.ebuild 1832
+RMD160 de244831038714a0775cb549cec0e521bc39ae5a nxclient-2.1.0.ebuild 1832
+SHA256 6a74adbf2f922dafcb64b62f0c9ddbfb1252f1a0cff97ea5ce6b2de52d3c445e nxclient-2.1.0.ebuild 1832
 MISC ChangeLog 5072 RMD160 117161023f9641b108332febc4ac657908e9702c SHA1 0c7f97a13fe107057b0ca11b021dba5937d080d6 SHA256 76d5e8085a09ec95da808305ef2ad44f523dfeb06470db6f833d15456f8988b9
 MD5 6965ed2278762f3aa2cd50c5510e906c ChangeLog 5072
 RMD160 117161023f9641b108332febc4ac657908e9702c ChangeLog 5072
@@ -23,6 +23,6 @@ SHA256 f1b98d76aa41c8483716a7ec1b48a7c70a943edfc07ae39bac23d95bd5ce27cd metadata
 MD5 13cfbaf87e4730eda4331abfcf68a0b8 files/digest-nxclient-1.5.0-r5 265
 RMD160 08f7537fdf08a5f624cac94231c83f5525207d0d files/digest-nxclient-1.5.0-r5 265
 SHA256 42500aea7d04fefc192582fcdaccbd22dbeef7c536374467506958771cbe549c files/digest-nxclient-1.5.0-r5 265
-MD5 89aec034087c0a06ce80d1903f7db9f8 files/digest-nxclient-2.1.0 268
-RMD160 f5afc4f0bdb5c74df45b88ade1fbf4746764022d files/digest-nxclient-2.1.0 268
-SHA256 9c2998b909fcd582b709d6065f62a47a850e40f120909eb69e9ba4820f98d84c files/digest-nxclient-2.1.0 268
+MD5 91bb04c92903db3a22756bfae25ea46b files/digest-nxclient-2.1.0 271
+RMD160 b8bbced6f3bef51a28fadc9790171149a0c6af52 files/digest-nxclient-2.1.0 271
+SHA256 7b5d375754643040f5f7e55a47482f6a307018fcb7d41a0c5d2d1668c5a43493 files/digest-nxclient-2.1.0 271
diff --git a/net-misc/nxclient/files/digest-nxclient-2.1.0 b/net-misc/nxclient/files/digest-nxclient-2.1.0
index 4ae36e0..3c57f15 100644
--- a/net-misc/nxclient/files/digest-nxclient-2.1.0
+++ b/net-misc/nxclient/files/digest-nxclient-2.1.0
@@ -1,3 +1,3 @@
-MD5 4eff1e6fbc9c188f30563453d4b27e3a nxclient-2.1.0-9.i386.tar.gz 3479744
-RMD160 31acc314235cdf470ee7857801af3912c314d440 nxclient-2.1.0-9.i386.tar.gz 3479744
-SHA256 9d7d723e501495114a8a2d5bf1902cb22b4734e5f044c17a4ec2927ad4aadb9d nxclient-2.1.0-9.i386.tar.gz 3479744
+MD5 21874088bc40ab447493fffd647ed87c nxclient-2.1.0-11.i386.tar.gz 3505596
+RMD160 5e877f993621e655ef2ad0228717a156a815690b nxclient-2.1.0-11.i386.tar.gz 3505596
+SHA256 c114f1e125494fd0ad1c4ad8371bbd8b97f3c4b24f0c43ca09a2b68b8eb5fe1f nxclient-2.1.0-11.i386.tar.gz 3505596
diff --git a/net-misc/nxclient/nxclient-2.1.0.ebuild b/net-misc/nxclient/nxclient-2.1.0.ebuild
index 2687dca..5e0a7ae 100644
--- a/net-misc/nxclient/nxclient-2.1.0.ebuild
+++ b/net-misc/nxclient/nxclient-2.1.0.ebuild
@@ -2,36 +2,39 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-misc/nxclient/nxclient-2.1.0.ebuild,v 1.1 2006/11/08 20:38:22 stuart Exp $
 
+inherit eutils
+
 DESCRIPTION="NXClient is a X11/VNC/NXServer client especially tuned for using
 remote desktops over low-bandwidth links such as the Internet"
 HOMEPAGE="http://www.nomachine.com/"
-SRC_URI="http://64.34.161.181/download/2.1.0/Linux/nxclient-2.1.0-9.i386.tar.gz"
+SRC_URI="http://64.34.161.181/download/2.1.0/Linux/nxclient-2.1.0-11.i386.tar.gz"
 LICENSE="nomachine"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="nostrip"
 
 DEPEND=""
 RDEPEND="
-	dev-libs/expat
-	dev-libs/openssl
-	media-libs/audiofile
-	media-libs/jpeg
-	media-libs/libpng
-	media-libs/freetype
-	media-libs/fontconfig
-	net-analyzer/gnu-netcat
-	net-print/cups
-	x11-libs/libXft
-	x11-libs/libX11
-	x11-libs/libXdmcp
-	x11-libs/libXrender
-	x11-libs/libXau
-	x11-libs/libXext
-	=x11-libs/qt-3*
-	sys-libs/lib-compat
-	sys-libs/zlib
+	x86? ( dev-libs/expat
+		dev-libs/openssl
+		media-libs/audiofile
+		media-libs/jpeg
+		media-libs/libpng
+		media-libs/freetype
+		media-libs/fontconfig
+		net-print/cups
+		x11-libs/libXft
+		x11-libs/libX11
+		x11-libs/libXdmcp
+		x11-libs/libXrender
+		x11-libs/libXau
+		x11-libs/libXext
+		sys-libs/lib-compat
+		sys-libs/zlib )
+	amd64? ( app-emulation/emul-linux-x86-compat
+		app-emulation/emul-linux-x86-soundlibs
+		app-emulation/emul-linux-x86-xlibs )
 "
 
 S=${WORKDIR}/NX
@@ -47,13 +50,19 @@ src_install()
 		into /usr/NX
 		dobin bin/$x || die
 		into /usr
-		newbin ${FILESDIR}/nxwrapper $x || die
+		make_wrapper $x ./$x /usr/NX/bin /usr/NX/lib || die
 	done
 
-	into /usr/NX
-	dolib lib/libXcompsh.so*
-	dolib lib/libXcomp.so*
+	dodir /usr/NX/lib
+	cp lib/libXcompsh.so* ${D}/usr/NX/lib || die
+	cp lib/libXcomp.so* ${D}/usr/NX/lib || die
 
 	dodir /usr/NX/share
 	cp -R share ${D}/usr/NX
+
+	# Add icons/desktop entries (missing in the tarball)
+	doicon share/icons/*.png
+	make_desktop_entry "nxclient" "NX Client" nx-desktop.png
+	make_desktop_entry "nxclient -admin" "NX Session Administrator" nxclient-admin.png
+	make_desktop_entry "nxclient -wizard" "NX Connection Wizard" nxclient-wizard.png
 }