Version bump; many fixes included

(Portage version: 2.1.2_pre2-r9)

7 files changed, 148 insertions, 1 deletions

diff --git a/net-misc/nxclient/ChangeLog b/net-misc/nxclient/ChangeLog
index 1edb353b2a3e..e902b6a58908 100644
--- a/net-misc/nxclient/ChangeLog
+++ b/net-misc/nxclient/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/nxclient
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxclient/ChangeLog,v 1.30 2006/08/23 12:45:51 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxclient/ChangeLog,v 1.31 2006/11/08 20:38:22 stuart Exp $
+
+*nxclient-2.1.0 (08 Nov 2006)
+*nxclient-1.5.0-r5 (08 Nov 2006)
+
+  08 Nov 2006; Stuart Herbert <stuart@gentoo.org> +files/nxwrapper,
+  +nxclient-1.5.0-r5.ebuild, +nxclient-2.1.0.ebuild:
+  nxclient now uses its bundled binary libs once more.
+  Version bump to latest client
 
   23 Aug 2006; Caleb Tennis <caleb@gentoo.org> nxclient-1.4.0-r5.ebuild,
   nxclient-1.5.0-r2.ebuild, nxclient-1.5.0-r4.ebuild:
diff --git a/net-misc/nxclient/files/digest-nxclient-1.5.0-r4 b/net-misc/nxclient/files/digest-nxclient-1.5.0-r4
index 84c4f91cbe0a..6a2019416b40 100644
--- a/net-misc/nxclient/files/digest-nxclient-1.5.0-r4
+++ b/net-misc/nxclient/files/digest-nxclient-1.5.0-r4
@@ -1,2 +1,6 @@
 MD5 5eacad0dee7dc8ead5aef52cb3024ff5 nxclient-1.5.0-141.i386.rpm 3315783
+RMD160 5facb8ee0c9690ec9849c5badf0b2440a10e337c nxclient-1.5.0-141.i386.rpm 3315783
+SHA256 62b85d1bc38ec6a443b37803c3f78584cb4e666d699efa31e6c291e7ab452a33 nxclient-1.5.0-141.i386.rpm 3315783
 MD5 8169192dd74019fcd84da186358ba088 nxclient-xft-1.5.0-141.i386.rpm 3362203
+RMD160 12f32ca294428a77f58bc912a0376db30ddb678b nxclient-xft-1.5.0-141.i386.rpm 3362203
+SHA256 ba3f9ec121d4133a9f85c5ed419fc3c59049db77075c40c8181845249eb99cdd nxclient-xft-1.5.0-141.i386.rpm 3362203
diff --git a/net-misc/nxclient/files/digest-nxclient-1.5.0-r5 b/net-misc/nxclient/files/digest-nxclient-1.5.0-r5
new file mode 100644
index 000000000000..f3cc992c8225
--- /dev/null
+++ b/net-misc/nxclient/files/digest-nxclient-1.5.0-r5
@@ -0,0 +1,3 @@
+MD5 5eacad0dee7dc8ead5aef52cb3024ff5 nxclient-1.5.0-141.i386.rpm 3315783
+RMD160 5facb8ee0c9690ec9849c5badf0b2440a10e337c nxclient-1.5.0-141.i386.rpm 3315783
+SHA256 62b85d1bc38ec6a443b37803c3f78584cb4e666d699efa31e6c291e7ab452a33 nxclient-1.5.0-141.i386.rpm 3315783
diff --git a/net-misc/nxclient/files/digest-nxclient-2.1.0 b/net-misc/nxclient/files/digest-nxclient-2.1.0
new file mode 100644
index 000000000000..4ae36e022e25
--- /dev/null
+++ b/net-misc/nxclient/files/digest-nxclient-2.1.0
@@ -0,0 +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
diff --git a/net-misc/nxclient/files/nxwrapper b/net-misc/nxclient/files/nxwrapper
new file mode 100644
index 000000000000..13e328405fc9
--- /dev/null
+++ b/net-misc/nxclient/files/nxwrapper
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+NXCOMMAND=$(basename $0)
+
+export LD_LIBRARY_PATH=/usr/NX/lib:$LD_LIBRARY_PATH
+exec /usr/NX/bin/$NXCOMMAND ${1+"$@"}
+
diff --git a/net-misc/nxclient/nxclient-1.5.0-r5.ebuild b/net-misc/nxclient/nxclient-1.5.0-r5.ebuild
new file mode 100644
index 000000000000..61ad4c893349
--- /dev/null
+++ b/net-misc/nxclient/nxclient-1.5.0-r5.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxclient/nxclient-1.5.0-r5.ebuild,v 1.1 2006/11/08 20:38:22 stuart Exp $
+
+inherit rpm
+
+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"
+
+IUSE=""
+LICENSE="nomachine"
+SLOT="0"
+RESTRICT="nostrip"
+SRC_URI="http://web04.nomachine.com/download/1.5.0/client/${P}-141.i386.rpm"
+
+# This is only supported upstream on 32-bit x86.
+# Do _not_ mark it for any other arches.
+KEYWORDS="~x86"
+
+DEPEND="
+	net-analyzer/gnu-netcat
+	amd64? (
+		app-emulation/emul-linux-x86-compat
+		>=app-emulation/emul-linux-x86-baselibs-2.1.4
+		>=app-emulation/emul-linux-x86-xlibs-2.2.1
+		>=app-emulation/emul-linux-x86-qtlibs-2.1.1
+	)
+	x86? (
+		>=dev-libs/expat-1.95.7
+		>=media-libs/fontconfig-2.2.2
+		>=media-libs/freetype-2.1.9
+		=x11-libs/qt-3*
+		sys-libs/lib-compat
+	)"
+
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}
+
+src_unpack() {
+	rpm_src_unpack
+}
+
+src_install()
+{
+	# we install nxclient into /usr/NX ;
+	# this location is reserved for NoMachine's binary releases only
+	cp -dPR usr ${D}
+
+	# install a wrapper script for nxclient
+	newbin ${FILESDIR}/nxwrapper nxclient
+
+	# FIXME: Of the options in the applnk directory, the desktop files in the
+	# "network" directory seem to make the most sense.  I have no idea if this
+	# works for KDE or just for Gnome.
+	declare applnk=/usr/NX/share/applnk apps=/usr/share/applications
+	if [[ -d ${D}${applnk} ]]; then
+		dodir ${apps}
+		mv ${D}${applnk}/network/*.desktop ${D}${apps}
+		rm ${D}${apps}/nxclient-help.desktop
+		rm -rf ${D}${applnk}
+	fi
+}
diff --git a/net-misc/nxclient/nxclient-2.1.0.ebuild b/net-misc/nxclient/nxclient-2.1.0.ebuild
new file mode 100644
index 000000000000..2687dca55b44
--- /dev/null
+++ b/net-misc/nxclient/nxclient-2.1.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2006 Gentoo Foundation
+# 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 $
+
+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"
+LICENSE="nomachine"
+SLOT="0"
+KEYWORDS="~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
+"
+
+S=${WORKDIR}/NX
+
+src_install()
+{
+	cd ${S}
+
+	# we install nxclient into /usr/NX, to make sure it doesn't clash
+	# with libraries installed for FreeNX
+
+	for x in nxclient nxesd nxkill nxprint nxservice nxssh ; do
+		into /usr/NX
+		dobin bin/$x || die
+		into /usr
+		newbin ${FILESDIR}/nxwrapper $x || die
+	done
+
+	into /usr/NX
+	dolib lib/libXcompsh.so*
+	dolib lib/libXcomp.so*
+
+	dodir /usr/NX/share
+	cp -R share ${D}/usr/NX
+}