Version bump; many fixes included

Package-Manager: portage-2.1.2_pre2-r9

diff --git a/net-misc/nxclient/ChangeLog b/net-misc/nxclient/ChangeLog
index 1edb353b2a3e70601382a3ebc5e8f379da3e09d7..e902b6a589085aeb87cd42c4466a070a1cfbb9e7 100644 (file)
--- 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/Manifest b/net-misc/nxclient/Manifest
index 346c13dd12723a60b1ef77351c92368b7ea28a57..6fbcfbbdd5be9369df0f1112b6cadde1b1a149fb 100644 (file)
--- a/net-misc/nxclient/Manifest
+++ b/net-misc/nxclient/Manifest
@@ -6,10 +6,15 @@ AUX 1.5.0/50nxclient 38 RMD160 6d29978719f6b46dfa07f9ebcc8c04c9c5a48fbf SHA1 020
 MD5 f44884663100850b12e1fdb12b55645b files/1.5.0/50nxclient 38
 RMD160 6d29978719f6b46dfa07f9ebcc8c04c9c5a48fbf files/1.5.0/50nxclient 38
 SHA256 e90d501d1600a5cd811e6da1a2a1ffdecaa4dfbeb58df3352313ac1100bc9f28 files/1.5.0/50nxclient 38
+AUX nxwrapper 128 RMD160 ee3e96fb8e3def2b211defac5ef6731f309f7718 SHA1 af6c7d133dd6ca84b8e6b87a9a9da0c289236c03 SHA256 a0e4bfd47f857dd85b60b0802ba7daeb798cad3e6310aaf3582df9b233137a5a
+MD5 722d473cbcec099515ea389f2327acde files/nxwrapper 128
+RMD160 ee3e96fb8e3def2b211defac5ef6731f309f7718 files/nxwrapper 128
+SHA256 a0e4bfd47f857dd85b60b0802ba7daeb798cad3e6310aaf3582df9b233137a5a files/nxwrapper 128
 DIST nxclient-1.4.0-91.i386.rpm 955590
 DIST nxclient-1.5.0-135.i386.rpm 3334053
-DIST nxclient-1.5.0-141.i386.rpm 3315783
-DIST nxclient-xft-1.5.0-141.i386.rpm 3362203
+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-xft-1.5.0-141.i386.rpm 3362203 RMD160 12f32ca294428a77f58bc912a0376db30ddb678b SHA1 7d3f30fc414e2a0463d5d757104549a6c38434f2 SHA256 ba3f9ec121d4133a9f85c5ed419fc3c59049db77075c40c8181845249eb99cdd
 EBUILD nxclient-1.4.0-r5.ebuild 1695 RMD160 834b856c2b9af898a315b40088938361b4eda299 SHA1 a1a1e0643381dfef0133013c1a12a3e3dbd0cf52 SHA256 65bc3c060a03969f41917807c1f7f2d811d2a5ec244b6bfd8f7655097c7777d6
 MD5 516031fcc8c45a9ba72c39ebf29caee7 nxclient-1.4.0-r5.ebuild 1695
 RMD160 834b856c2b9af898a315b40088938361b4eda299 nxclient-1.4.0-r5.ebuild 1695
@@ -22,10 +27,18 @@ EBUILD nxclient-1.5.0-r4.ebuild 2397 RMD160 100106d4c4f7d8bc869929f48b1c22042ce4
 MD5 670366b62dce2db402cb38a5d405e0d5 nxclient-1.5.0-r4.ebuild 2397
 RMD160 100106d4c4f7d8bc869929f48b1c22042ce4491a nxclient-1.5.0-r4.ebuild 2397
 SHA256 46129bde9e2fb8d743d334031f935ddbb21aa2d99b6d7bc8a898cbe94ef52041 nxclient-1.5.0-r4.ebuild 2397
-MISC ChangeLog 4978 RMD160 fa2bc4a862af44473c3000e362c2f81d50511cb6 SHA1 b4c8e5e1125789b7124fa73d6ba265880b7cfb39 SHA256 7b955a2d46871c870539530f20f08463f682d79a341aec23c769e857353fd813
-MD5 f6dd7e58ef01c3aa29296755f1d472fe ChangeLog 4978
-RMD160 fa2bc4a862af44473c3000e362c2f81d50511cb6 ChangeLog 4978
-SHA256 7b955a2d46871c870539530f20f08463f682d79a341aec23c769e857353fd813 ChangeLog 4978
+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
+MISC ChangeLog 5252 RMD160 4bcadafc0a3815bb5ae2e161261092b9c0c31048 SHA1 d14e90c7be45e26d3622e395745b826ea174c8f5 SHA256 daa45a3d1790e8f6039d124f23af981b9cada4f64f857b81ad0ec051be226eb7
+MD5 4393515c2d7132990db233c73b72d208 ChangeLog 5252
+RMD160 4bcadafc0a3815bb5ae2e161261092b9c0c31048 ChangeLog 5252
+SHA256 daa45a3d1790e8f6039d124f23af981b9cada4f64f857b81ad0ec051be226eb7 ChangeLog 5252
 MISC metadata.xml 455 RMD160 4be2c66d765fbe16df201f981c76f0c10265b921 SHA1 bdb9734ed1233e16fdf50c88060a54d5d280880f SHA256 f1b98d76aa41c8483716a7ec1b48a7c70a943edfc07ae39bac23d95bd5ce27cd
 MD5 c1c67a77261d3b3fede94b41a9d0ce1e metadata.xml 455
 RMD160 4be2c66d765fbe16df201f981c76f0c10265b921 metadata.xml 455
@@ -36,6 +49,12 @@ SHA256 81db6b132b8d9207677faa33916c8afa3be3eebc23b8bd40eb26fb6b6240f2b0 files/di
 MD5 142a71ee05218b6014d4d8872bc9cd7e files/digest-nxclient-1.5.0-r2 73
 RMD160 54c1c36eada0e5b52d6b7a195e201150272af928 files/digest-nxclient-1.5.0-r2 73
 SHA256 6102246c13cd6e58ddc17a005f40f54159d067d651101635f2734d9b62a1f1b9 files/digest-nxclient-1.5.0-r2 73
-MD5 1c18975ce0c3b75b08def80ec4846342 files/digest-nxclient-1.5.0-r4 150
-RMD160 6b0cefcb965b1c3f0b52ba25f976e8002f9f3166 files/digest-nxclient-1.5.0-r4 150
-SHA256 95c104f9cf8c834661ddd082d41f20ebd8cf5c2c7caf9b0d1a0dc1ef23c3a3d8 files/digest-nxclient-1.5.0-r4 150
+MD5 c90c769e6058fc8c559478b0a8747dc3 files/digest-nxclient-1.5.0-r4 542
+RMD160 06b3558faff18dcec237cde0a619fa40fec24ab2 files/digest-nxclient-1.5.0-r4 542
+SHA256 5a2bfbeab6bbc64ac9ef385e487d414707ca9c73de82530b38b9cfe819b75080 files/digest-nxclient-1.5.0-r4 542
+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

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 84c4f91cbe0af35061bcb5e6c3061a8e124158a8..6a2019416b402ddc497a01aca59fd75c135209c1 100644 (file)
--- 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 (file)
index 0000000..f3cc992
--- /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 (file)
index 0000000..4ae36e0
--- /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 (file)
index 0000000..13e3284
--- /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 (file)
index 0000000..61ad4c8
--- /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 (file)
index 0000000..2687dca
--- /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
+}