Version bump

25 files changed, 300 insertions, 51 deletions

diff --git a/net-misc/nx-x11/ChangeLog b/net-misc/nx-x11/ChangeLog
index 92d888327fa5..c9e1a3ebdd1e 100644
--- a/net-misc/nx-x11/ChangeLog
+++ b/net-misc/nx-x11/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/nx-x11
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nx-x11/ChangeLog,v 1.5 2004/09/12 09:51:51 stuart Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx-x11/ChangeLog,v 1.6 2005/01/02 09:34:56 stuart Exp $
+
+*nx-x11-1.4.0-r3 (02 Jan 2005)
+
+  02 Jan 2005; Stuart Herbert <stuart@gentoo.org> nx-x11-1.4.0-r2.ebuild,
+  +nx-x11-1.4.0-r3.ebuild:
+  Version bump; thanks to Christian Oyarzun for his help; see bug #71694
 
   12 Sep 2004; Stuart Herbert <stuart@gentoo.org> nx-x11-1.4.0-r1.ebuild,
   nx-x11-1.4.0-r2.ebuild:
diff --git a/net-misc/nx-x11/Manifest b/net-misc/nx-x11/Manifest
index ccfa34fba134..d41f5796d98d 100644
--- a/net-misc/nx-x11/Manifest
+++ b/net-misc/nx-x11/Manifest
@@ -1,9 +1,11 @@
 MD5 9b863994334acfa97e4aa0dd00e64249 ChangeLog 1127
 MD5 77fd36d93b0a1b9f35abbe6a1c146561 metadata.xml 482
-MD5 057e5ecca55a5a1d996c8e74723ae750 nx-x11-1.4.0-r1.ebuild 2587
-MD5 ba0dee977cb28c9e5afaaddfd30f115e nx-x11-1.4.0-r2.ebuild 2599
 MD5 0b65ce6ab6116489fb06ca8851607f9a nx-x11-1.4.0.ebuild 2429
+MD5 057e5ecca55a5a1d996c8e74723ae750 nx-x11-1.4.0-r1.ebuild 2587
+MD5 7c7629d2c02dbe0a0f8979dd89ceb19b nx-x11-1.4.0-r2.ebuild 2662
+MD5 4f57873c3727576aac03265a1134e3f8 nx-x11-1.4.0-r3.ebuild 2849
 MD5 eb14e3a21decffbcb4e290c0419bbf3f files/digest-nx-x11-1.4.0 538
 MD5 6164854275d3f2f7c032776cabb5fca5 files/digest-nx-x11-1.4.0-r1 538
-MD5 fabad2586a6b5100bedc1c5bc5ef2c44 files/digest-nx-x11-1.4.0-r2 539
+MD5 6164854275d3f2f7c032776cabb5fca5 files/digest-nx-x11-1.4.0-r2 538
 MD5 d2caae40bdf5748d68ca46ad1d0ec951 files/nx-x11-1.4.0.xprint.patch 341
+MD5 b1b175fda7a68efc0ea21ac829c6449c files/digest-nx-x11-1.4.0-r3 539
diff --git a/net-misc/nx-x11/files/digest-nx-x11-1.4.0-r2 b/net-misc/nx-x11/files/digest-nx-x11-1.4.0-r2
index 6fdc98480b92..6b9e40f84345 100644
--- a/net-misc/nx-x11/files/digest-nx-x11-1.4.0-r2
+++ b/net-misc/nx-x11/files/digest-nx-x11-1.4.0-r2
@@ -1,7 +1,7 @@
 MD5 9ea3175d3c7ba81603aef53528ba00af nx-X11-1.4.0-3.tar.gz 32306338
 MD5 d15c60ecec428da9e6c6d9650bd4c4db nxagent-1.4.0-47.tar.gz 302273
 MD5 ea3b8b2b1b31c8cb33b47821ee1958a3 nxauth-1.4.0-1.tar.gz 23085
-MD5 3c45afe2a911468a2b07f69fd7123a59 nxcomp-1.4.0-23.tar.gz 452882
+MD5 1790feafa93c3ca58af117ab6f1f5bca nxcomp-1.3.2-4.tar.gz 432456
 MD5 ab12f1f32329f5da0f53dd0969fe897e nxcompext-1.4.0-3.tar.gz 111409
 MD5 1a323b08280863efbcd8ba0cc8197f22 nxviewer-1.4.0-2.tar.gz 84443
 MD5 adfc84a6a6ccd1a6b3b8ff4212b34980 nxdesktop-1.4.0-36.tar.gz 223822
diff --git a/net-misc/nx-x11/files/digest-nx-x11-1.4.0-r3 b/net-misc/nx-x11/files/digest-nx-x11-1.4.0-r3
new file mode 100644
index 000000000000..0cdb31710bcb
--- /dev/null
+++ b/net-misc/nx-x11/files/digest-nx-x11-1.4.0-r3
@@ -0,0 +1,8 @@
+MD5 01901e24b60907c2aefaae569ec02b28 nx-X11-1.4.0-7.tar.gz 32311470
+MD5 4a99a336094e181ae750479a8f7eac6e nxagent-1.4.0-64.tar.gz 305136
+MD5 274319eb06fbab8bbd486836668e1e0a nxauth-1.4.0-2.tar.gz 23070
+MD5 3b659bb177f3706f0b19589d56b120f8 nxcomp-1.4.0-30.tar.gz 454833
+MD5 ab12f1f32329f5da0f53dd0969fe897e nxcompext-1.4.0-3.tar.gz 111409
+MD5 629f90c1f8ef50517e8b1de2c30adcb4 nxviewer-1.4.0-4.tar.gz 84538
+MD5 9399fa94c59fbde2a158618e507635d7 nxdesktop-1.4.0-61.tar.gz 235550
+MD5 b30d7d94e6d98bb503750bab77c19295 nxesd-1.4.0-1.tar.gz 621023
diff --git a/net-misc/nx-x11/nx-x11-1.4.0-r1.ebuild b/net-misc/nx-x11/nx-x11-1.4.0-r1.ebuild
index 2609a9ee0202..725f814dcacf 100644
--- a/net-misc/nx-x11/nx-x11-1.4.0-r1.ebuild
+++ b/net-misc/nx-x11/nx-x11-1.4.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nx-x11/nx-x11-1.4.0-r1.ebuild,v 1.3 2004/09/12 09:51:51 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx-x11/nx-x11-1.4.0-r1.ebuild,v 1.4 2005/01/02 09:34:56 stuart Exp $
 
 inherit eutils
 
diff --git a/net-misc/nx-x11/nx-x11-1.4.0-r2.ebuild b/net-misc/nx-x11/nx-x11-1.4.0-r2.ebuild
index f8fc79d9b231..a65ff9da2bd4 100644
--- a/net-misc/nx-x11/nx-x11-1.4.0-r2.ebuild
+++ b/net-misc/nx-x11/nx-x11-1.4.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nx-x11/nx-x11-1.4.0-r2.ebuild,v 1.3 2004/09/13 00:33:37 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx-x11/nx-x11-1.4.0-r2.ebuild,v 1.4 2005/01/02 09:34:56 stuart Exp $
 
 inherit eutils
 
@@ -13,12 +13,13 @@ URI_BASE2="http://www.nomachine.com/download/nxsources/"
 SRC_NX_X11="${MY_PN}-${MY_PV}.tar.gz"
 SRC_NXAGENT="nxagent-1.4.0-47.tar.gz"
 SRC_NXAUTH="nxauth-1.4.0-1.tar.gz"
-SRC_NXCOMP="nxcomp-1.4.0-23.tar.gz"
+SRC_NXCOMP_3="nxcomp-1.3.2-4.tar.gz"
+SRC_NXCOMP_4="nxcomp-1.4.0-23.tar.gz"
 SRC_NXCOMPEXT="nxcompext-1.4.0-3.tar.gz"
 SRC_NXVIEWER="nxviewer-1.4.0-2.tar.gz"
 SRC_NXDESKTOP="nxdesktop-1.4.0-36.tar.gz"
 SRC_NXESD="nxesd-1.4.0-1.tar.gz"
-SRC_URI="$URI_BASE/${SRC_NX_X11} $URI_BASE/${SRC_NXAGENT} $URI_BASE/${SRC_NXAUTH} $URI_BASE/${SRC_NXCOMP} $URI_BASE/${SRC_NXCOMPEXT} $URI_BASE/${SRC_NXVIEWER} $URI_BASE/${SRC_NXDESKTOP} $URI_BASE/${SRC_NXESD}"
+SRC_URI="$URI_BASE/${SRC_NX_X11} $URI_BASE/${SRC_NXAGENT} $URI_BASE/${SRC_NXAUTH} $URI_BASE2/${SRC_NXCOMP_3} $URI_BASE/${SRC_NXCOMPEXT} $URI_BASE/${SRC_NXVIEWER} $URI_BASE/${SRC_NXDESKTOP} $URI_BASE/${SRC_NXESD}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
@@ -33,7 +34,7 @@ src_unpack() {
 	unpack ${SRC_NX_X11}
 	unpack ${SRC_NXAGENT}
 	unpack ${SRC_NXAUTH}
-	unpack ${SRC_NXCOMP}
+	unpack ${SRC_NXCOMP_4}
 	unpack ${SRC_NXCOMPEXT}
 	unpack ${SRC_NXVIEWER}
 	unpack ${SRC_NXDESKTOP}
@@ -72,7 +73,7 @@ src_install() {
 	dobin ../nxviewer/nxpasswd/nxpasswd
 	dobin ../nxdesktop/nxdesktop
 
-	dolib ../nxcomp/libXcomp.so
+	newlib ../nxcomp/libXcomp.so libXcomp-1.4.0.so
 	dolib ../nxcompext/libXcompext.so
 	dolib lib/X11/libX11.so
 	dolib lib/Xext/libXext.so
diff --git a/net-misc/nx-x11/nx-x11-1.4.0-r3.ebuild b/net-misc/nx-x11/nx-x11-1.4.0-r3.ebuild
new file mode 100644
index 000000000000..3aaa4ca4a584
--- /dev/null
+++ b/net-misc/nx-x11/nx-x11-1.4.0-r3.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx-x11/nx-x11-1.4.0-r3.ebuild,v 1.1 2005/01/02 09:34:56 stuart Exp $
+
+inherit eutils
+
+MY_PN="${PN//x11/X11}"
+MY_PV="${PV}-7"
+DESCRIPTION="A special version of the X11 libraries supporting NX compression technology"
+HOMEPAGE="http://www.nomachine.com/developers.php"
+URI_BASE="http://www.nomachine.com/download/nxsources/"
+URI_BASE2="http://www.nomachine.com/download/nxsources/"
+SRC_NX_X11="${MY_PN}-${MY_PV}.tar.gz"
+SRC_NXAGENT="nxagent-1.4.0-64.tar.gz"
+SRC_NXAUTH="nxauth-1.4.0-2.tar.gz"
+SRC_NXCOMP="nxcomp-1.4.0-30.tar.gz"
+SRC_NXCOMPEXT="nxcompext-1.4.0-3.tar.gz"
+SRC_NXVIEWER="nxviewer-1.4.0-4.tar.gz"
+SRC_NXDESKTOP="nxdesktop-1.4.0-61.tar.gz"
+SRC_NXESD="nxesd-1.4.0-1.tar.gz"
+SRC_URI="$URI_BASE/nx-X11/${SRC_NX_X11} $URI_BASE/nxagent/${SRC_NXAGENT} $URI_BASE/nxauth/${SRC_NXAUTH} $URI_BASE/nxcomp/${SRC_NXCOMP} $URI_BASE/nxcompext/${SRC_NXCOMPEXT} $URI_BASE/nxviewer/${SRC_NXVIEWER} $URI_BASE/nxdesktop/${SRC_NXDESKTOP} $URI_BASE/nxesd/${SRC_NXESD}"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+#RESTRICT="nostrip"
+DEPEND="virtual/x11"
+#RDEPEND=""
+S=${WORKDIR}/${MY_PN}
+
+src_unpack() {
+	# we can't use ${A} because of bug #61977
+	unpack ${SRC_NX_X11}
+	unpack ${SRC_NXAGENT}
+	unpack ${SRC_NXAUTH}
+	unpack ${SRC_NXCOMP}
+	unpack ${SRC_NXCOMPEXT}
+	unpack ${SRC_NXVIEWER}
+	unpack ${SRC_NXDESKTOP}
+	unpack ${SRC_NXESD}
+
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-${PV}.xprint.patch
+}
+
+src_compile() {
+	emake World || die "unable to build nx-11"
+
+	cd ../nxviewer
+	xmkmf || die "unable to create makefile for nxviewer"
+	emake World || die "unable to make nxviewer"
+
+	cd ../nxdesktop
+	./configure --prefix=/usr/NX --mandir=/usr/share/man --sharedir=/usr/share || die "Unable to configure nxdesktop"
+	emake || die "Unable to build nxdesktop"
+
+	return
+
+	# mxesd support will have to wait for a later release
+
+	cd ../nxesd
+	econf --prefix=/usr/NX || die "Unable to configure nxesd"
+	emake || die "Unable to build nxesd"
+}
+
+src_install() {
+	into /usr/NX
+
+	dobin programs/Xserver/nxagent
+	dobin programs/nxauth/nxauth
+	dobin ../nxviewer/nxviewer/nxviewer
+	dobin ../nxviewer/nxpasswd/nxpasswd
+	dobin ../nxdesktop/nxdesktop
+
+	pushd lib/X11/
+	dolib libX11.so.6.2
+	dolib libX11.so
+	popd
+
+	pushd lib/Xext/
+	dolib libXext.so.6.4
+	dolib libXext.so
+	popd
+
+	pushd lib/Xrender/
+	dolib libXrender.so.1.2
+	dolib libXrender.so
+	popd
+
+	pushd ../nxcomp/
+	dolib libXcomp.so.1.4.0
+	dolib libXcomp.so
+	popd
+
+	pushd ../nxcompext/
+	dolib libXcompext.so.1.4.0
+	dolib libXcompext.so
+	popd
+
+	preplib /usr/NX
+
+	insinto /usr/X11R6/include
+	doins ../nxcomp/NX.h
+
+	dodir /var/lib/nxserver
+
+	return
+
+	# nxesd support will have to wait for a later release
+
+	cd ../nxesd
+	emake DESTDIR=${D} install || die "unable to install nxesd"
+}
diff --git a/net-misc/nx-x11/nx-x11-1.4.0.ebuild b/net-misc/nx-x11/nx-x11-1.4.0.ebuild
index 6fd35cee3768..6532e24cc8a8 100644
--- a/net-misc/nx-x11/nx-x11-1.4.0.ebuild
+++ b/net-misc/nx-x11/nx-x11-1.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nx-x11/nx-x11-1.4.0.ebuild,v 1.3 2004/09/07 20:48:50 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx-x11/nx-x11-1.4.0.ebuild,v 1.4 2005/01/02 09:34:56 stuart Exp $
 
 MY_PN="${PN//x11/X11}"
 MY_PV="${PV}-3"
diff --git a/net-misc/nxclient/ChangeLog b/net-misc/nxclient/ChangeLog
index 4e597be150cb..1f68a0915ddd 100644
--- a/net-misc/nxclient/ChangeLog
+++ b/net-misc/nxclient/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/nxclient
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxclient/ChangeLog,v 1.16 2004/09/13 09:53:49 stuart Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxclient/ChangeLog,v 1.17 2005/01/02 09:38:31 stuart Exp $
+
+*nxclient-1.4.0-r3 (02 Jan 2005)
+
+  02 Jan 2005; Stuart Herbert <stuart@gentoo.org> +nxclient-1.4.0-r3.ebuild:
+  Version bump
 
 *nxclient-1.4.0-r2 (13 Sep 2004)
 
diff --git a/net-misc/nxclient/Manifest b/net-misc/nxclient/Manifest
index c802f9a52918..8769755be88f 100644
--- a/net-misc/nxclient/Manifest
+++ b/net-misc/nxclient/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 5e37a8f6435892221388bb42a063ae24 ChangeLog 2374
 MD5 c1c67a77261d3b3fede94b41a9d0ce1e metadata.xml 455
 MD5 fba25798d989531f2795bf0c0df18f45 nxclient-1.3.0.ebuild 1704
@@ -9,17 +6,12 @@ MD5 c81c2bfdd46cafe437d129277d9b0f5f nxclient-1.4.0.ebuild 1759
 MD5 0a3f5eed8f2922298bf483661c50c3e3 nxclient-1.4.0-r1.ebuild 1784
 MD5 9bdf149f0a214565c788b70ed44d9789 nxclient-1.3.2-r1.ebuild 1766
 MD5 08d17e7d889512da8a09da6ca956545a nxclient-1.4.0-r2.ebuild 1784
+MD5 b10436d5f241cf24d94abedec182ccc2 nxclient-1.4.0-r3.ebuild 1784
 MD5 5e85c900da1930890c8987a364976127 files/digest-nxclient-1.3.0 71
 MD5 05726c6d42d87195bcf8f5b5c76de1d3 files/digest-nxclient-1.3.2 70
 MD5 14c91b7df82e02def9a6d4c013e5c6eb files/digest-nxclient-1.4.0 72
 MD5 42aa33a6699a0b549cf5d3eaee9d8852 files/digest-nxclient-1.4.0-r1 72
 MD5 05726c6d42d87195bcf8f5b5c76de1d3 files/digest-nxclient-1.3.2-r1 70
 MD5 14c91b7df82e02def9a6d4c013e5c6eb files/digest-nxclient-1.4.0-r2 72
+MD5 6532e2cbed5e3c88e36520dc46b1be4b files/digest-nxclient-1.4.0-r3 71
 MD5 a2e15c37686ddad8dd3854b2b9b70700 files/1.3.0/50nxclient 57
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBYHOSI1lqEGTUzyQRArpTAJ9bF/3W9PUTmAujqymD+XqioHiAXQCfWi/W
-iiLaaoGMmMI9CUo248JyyyQ=
-=g1rC
------END PGP SIGNATURE-----
diff --git a/net-misc/nxclient/files/digest-nxclient-1.4.0-r3 b/net-misc/nxclient/files/digest-nxclient-1.4.0-r3
new file mode 100644
index 000000000000..867e79e093ed
--- /dev/null
+++ b/net-misc/nxclient/files/digest-nxclient-1.4.0-r3
@@ -0,0 +1 @@
+MD5 d22d72a98880e70ba6c94649a8f85192 nxclient-1.4.0-91.i386.rpm 955590
diff --git a/net-misc/nxclient/nxclient-1.3.0.ebuild b/net-misc/nxclient/nxclient-1.3.0.ebuild
index 3b2ffc7ceb33..ff55a4b20d24 100644
--- a/net-misc/nxclient/nxclient-1.3.0.ebuild
+++ b/net-misc/nxclient/nxclient-1.3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxclient/nxclient-1.3.0.ebuild,v 1.5 2004/10/03 21:47:56 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxclient/nxclient-1.3.0.ebuild,v 1.6 2005/01/02 09:38:31 stuart Exp $
 
 inherit rpm
 
diff --git a/net-misc/nxclient/nxclient-1.3.2-r1.ebuild b/net-misc/nxclient/nxclient-1.3.2-r1.ebuild
index 3299c910637a..edc09760f143 100644
--- a/net-misc/nxclient/nxclient-1.3.2-r1.ebuild
+++ b/net-misc/nxclient/nxclient-1.3.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxclient/nxclient-1.3.2-r1.ebuild,v 1.2 2004/10/03 21:47:56 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxclient/nxclient-1.3.2-r1.ebuild,v 1.3 2005/01/02 09:38:31 stuart Exp $
 
 inherit rpm
 
diff --git a/net-misc/nxclient/nxclient-1.3.2.ebuild b/net-misc/nxclient/nxclient-1.3.2.ebuild
index 70da9cdabf80..42f303d1ed16 100644
--- a/net-misc/nxclient/nxclient-1.3.2.ebuild
+++ b/net-misc/nxclient/nxclient-1.3.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxclient/nxclient-1.3.2.ebuild,v 1.6 2004/10/03 21:47:56 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxclient/nxclient-1.3.2.ebuild,v 1.7 2005/01/02 09:38:31 stuart Exp $
 
 inherit rpm
 
diff --git a/net-misc/nxclient/nxclient-1.4.0-r1.ebuild b/net-misc/nxclient/nxclient-1.4.0-r1.ebuild
index 88de26057ebe..7b96164d4e24 100644
--- a/net-misc/nxclient/nxclient-1.4.0-r1.ebuild
+++ b/net-misc/nxclient/nxclient-1.4.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxclient/nxclient-1.4.0-r1.ebuild,v 1.3 2004/09/13 09:53:49 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxclient/nxclient-1.4.0-r1.ebuild,v 1.4 2005/01/02 09:38:31 stuart Exp $
 
 inherit rpm
 
diff --git a/net-misc/nxclient/nxclient-1.4.0-r2.ebuild b/net-misc/nxclient/nxclient-1.4.0-r2.ebuild
index 4e91977bf08b..1d1a9ee9895f 100644
--- a/net-misc/nxclient/nxclient-1.4.0-r2.ebuild
+++ b/net-misc/nxclient/nxclient-1.4.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxclient/nxclient-1.4.0-r2.ebuild,v 1.1 2004/09/13 09:53:49 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxclient/nxclient-1.4.0-r2.ebuild,v 1.2 2005/01/02 09:38:31 stuart Exp $
 
 inherit rpm
 
diff --git a/net-misc/nxclient/nxclient-1.4.0-r3.ebuild b/net-misc/nxclient/nxclient-1.4.0-r3.ebuild
new file mode 100644
index 000000000000..69f589b6476e
--- /dev/null
+++ b/net-misc/nxclient/nxclient-1.4.0-r3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxclient/nxclient-1.4.0-r3.ebuild,v 1.1 2005/01/02 09:38:31 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="as-is"
+SLOT="0"
+KEYWORDS="~x86 -ppc -sparc -alpha -mips"
+RESTRICT="nostrip"
+
+MY_PV="${PV}-91"
+SRC_URI="http://www.nomachine.com/download/nxclient/1.4.0/RedHat-9.0/${PN}-${MY_PV}.i386.rpm"
+
+DEPEND=">=media-libs/jpeg-6b-r3
+	>=sys-libs/glibc-2.3.2-r1
+	>=sys-libs/zlib-1.1.4-r1
+	virtual/x11
+	>=dev-libs/expat-1.95.6-r1
+	>=media-libs/fontconfig-2.2.0-r2
+	>=media-libs/freetype-2.1.4
+	>=media-libs/jpeg-6b-r3
+	>=x11-libs/qt-3.3.2
+	net-misc/nx-x11
+	>=net-misc/nxproxy-1.4.0
+	net-analyzer/gnu-netcat"
+
+S="${WORKDIR}"
+
+src_install() {
+	exeinto /usr/NX/bin
+#	doexe usr/NX/bin/nxartsdstatus
+	doexe usr/NX/bin/nxclient
+#	doexe usr/NX/bin/nxproxy
+#	doexe usr/NX/bin/nxssh
+
+#	insinto /usr/NX/lib
+#	dolib usr/NX/lib/libXcomp.so.1.2.2
+
+	insinto /usr/NX/share
+	doins usr/NX/share/client.id_dsa.key
+	doins usr/NX/share/keyboards
+	insinto /usr/NX/share/icons
+	doins usr/NX/share/icons/*
+	insinto /usr/NX/share/images
+	doins usr/NX/share/images/*.png
+
+	insinto /etc/env.d
+	doins ${FILESDIR}/1.3.0/50nxclient
+
+	for x in `echo /usr/kde/*` ; do
+		insinto $x/share/applnk/Internet
+		doins "usr/NX/share/applnk/NX Client for Linux/nxclient-admin.desktop"
+		doins "usr/NX/share/applnk/NX Client for Linux/nxclient-help.desktop"
+		doins "usr/NX/share/applnk/NX Client for Linux/nxclient-wizard.desktop"
+		doins "usr/NX/share/applnk/NX Client for Linux/nxclient.desktop"
+	done
+}
diff --git a/net-misc/nxclient/nxclient-1.4.0.ebuild b/net-misc/nxclient/nxclient-1.4.0.ebuild
index 5dcae67bd89e..33aa9bd43361 100644
--- a/net-misc/nxclient/nxclient-1.4.0.ebuild
+++ b/net-misc/nxclient/nxclient-1.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxclient/nxclient-1.4.0.ebuild,v 1.5 2004/10/03 21:47:56 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxclient/nxclient-1.4.0.ebuild,v 1.6 2005/01/02 09:38:31 stuart Exp $
 
 inherit rpm
 
diff --git a/net-misc/nxssh/ChangeLog b/net-misc/nxssh/ChangeLog
index c85b9ac2974e..60b59c9a2992 100644
--- a/net-misc/nxssh/ChangeLog
+++ b/net-misc/nxssh/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/nxssh
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxssh/ChangeLog,v 1.10 2004/08/30 20:20:13 stuart Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxssh/ChangeLog,v 1.11 2005/01/02 09:40:02 stuart Exp $
+
+*nxssh-1.4.0-r1 (02 Jan 2005)
+
+  02 Jan 2005; Stuart Herbert <stuart@gentoo.org> +nxssh-1.4.0-r1.ebuild:
+  Version bump
 
 *nxssh-1.4.0 (30 Aug 2004)
 
diff --git a/net-misc/nxssh/Manifest b/net-misc/nxssh/Manifest
index df7a89e478b8..0bfcacfd0b67 100644
--- a/net-misc/nxssh/Manifest
+++ b/net-misc/nxssh/Manifest
@@ -1,8 +1,10 @@
-MD5 51e64ab41ee022626f7df367c54a756f nxssh-1.4.0.ebuild 1473
-MD5 8326cbb0c0f4c978ab06c40384fd98a8 nxssh-1.3.0.ebuild 1416
 MD5 e92f4776ace639aeb8b988443b77f0ab ChangeLog 1186
 MD5 0d90a3579c4f3a0310c775b71e87fb2a metadata.xml 370
+MD5 8326cbb0c0f4c978ab06c40384fd98a8 nxssh-1.3.0.ebuild 1416
 MD5 6b4ea8e275e86e7a7b680ab219be80ce nxssh-1.3.2.ebuild 1416
-MD5 57639a0edd55fdfb2e6e4814ac5fe796 files/digest-nxssh-1.4.0 66
+MD5 51e64ab41ee022626f7df367c54a756f nxssh-1.4.0.ebuild 1473
+MD5 02072d254d724c79a2c3bf7f072589db nxssh-1.4.0-r1.ebuild 1450
 MD5 1cd2c50e87d03e6f71bc28d3ef794d56 files/digest-nxssh-1.3.0 65
 MD5 1621d9205e3725cfc24ccf19006e9699 files/digest-nxssh-1.3.2 65
+MD5 57639a0edd55fdfb2e6e4814ac5fe796 files/digest-nxssh-1.4.0 66
+MD5 c55a5bd8cb8ece91220fc12237304f61 files/digest-nxssh-1.4.0-r1 66
diff --git a/net-misc/nxssh/files/digest-nxssh-1.4.0-r1 b/net-misc/nxssh/files/digest-nxssh-1.4.0-r1
new file mode 100644
index 000000000000..26514324c25b
--- /dev/null
+++ b/net-misc/nxssh/files/digest-nxssh-1.4.0-r1
@@ -0,0 +1 @@
+MD5 6adec34c605414b1f9ebe1f70992014a nxssh-1.4.0-21.tar.gz 844883
diff --git a/net-misc/nxssh/nxssh-1.3.0.ebuild b/net-misc/nxssh/nxssh-1.3.0.ebuild
index e097ac5f1185..b8697173e15e 100644
--- a/net-misc/nxssh/nxssh-1.3.0.ebuild
+++ b/net-misc/nxssh/nxssh-1.3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxssh/nxssh-1.3.0.ebuild,v 1.5 2004/07/15 03:14:51 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxssh/nxssh-1.3.0.ebuild,v 1.6 2005/01/02 09:40:02 stuart Exp $
 
 MY_P="${PN}-1.3.0-4"
 DESCRIPTION="Modified openssh client, used by nxclient"
diff --git a/net-misc/nxssh/nxssh-1.3.2.ebuild b/net-misc/nxssh/nxssh-1.3.2.ebuild
index 2ab4a15c39a8..e538c1dd163f 100644
--- a/net-misc/nxssh/nxssh-1.3.2.ebuild
+++ b/net-misc/nxssh/nxssh-1.3.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxssh/nxssh-1.3.2.ebuild,v 1.3 2004/07/15 03:14:51 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxssh/nxssh-1.3.2.ebuild,v 1.4 2005/01/02 09:40:02 stuart Exp $
 
 MY_P="${PN}-1.3.2-3"
 DESCRIPTION="Modified openssh client, used by nxclient"
diff --git a/net-misc/nxssh/nxssh-1.4.0-r1.ebuild b/net-misc/nxssh/nxssh-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..57540bcc4ba7
--- /dev/null
+++ b/net-misc/nxssh/nxssh-1.4.0-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxssh/nxssh-1.4.0-r1.ebuild,v 1.1 2005/01/02 09:40:02 stuart Exp $
+
+MY_P="${PN}-${PV}-21"
+DESCRIPTION="Modified openssh client, used by nxclient"
+HOMEPAGE="http://www.nomachine.com/"
+SRC_URI="http://www.nomachine.com/download/nxsources/nxssh/${MY_P}.tar.gz"
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+DEPEND=">=dev-libs/openssl-0.9.7d-r1
+	    >=sys-libs/glibc-2.3.3.20040420-r1
+	    >=sys-libs/zlib-1.2.1-r2"
+# Run-time dependencies, same as DEPEND if RDEPEND isn't defined:
+#RDEPEND=""
+IUSE="ipv6 kerberos pam tcpd"
+
+S=${WORKDIR}/${PN}
+
+src_compile() {
+	local myconf
+
+	use tcpd || myconf="${myconf} --without-tcp-wrappers"
+	use tcpd && myconf="${myconf} --with-tcp-wrappers"
+	use pam  || myconf="${myconf} --without-pam"
+	use pam  && myconf="${myconf} --with-pam"
+	use ipv6 || myconf="${myconf} --with-ipv4-default"
+
+	# app-crypt/mit-krb5
+	use kerberos && myconf="${myconf} --with-kerberos5"
+
+	./configure \
+	    --prefix=/usr \
+		--sysconfdir=/etc/ssh \
+		--mandir=/usr/share/man \
+		--libexecdir=/usr/lib/misc \
+		--datadir=/usr/share/openssh \
+		--disable-suid-ssh \
+		--with-privsep-path=/var/empty \
+		--with-privsep-user=sshd \
+		--with-md5-passwords \
+		--host=${CHOST} ${myconf} || die "bad configure"
+
+	emake || die "compile problem"
+}
+
+src_install() {
+	exeinto /usr/NX/bin
+	doexe nxssh
+}
diff --git a/net-misc/nxssh/nxssh-1.4.0.ebuild b/net-misc/nxssh/nxssh-1.4.0.ebuild
index 63d5435e9833..0dd2b0120ce1 100644
--- a/net-misc/nxssh/nxssh-1.4.0.ebuild
+++ b/net-misc/nxssh/nxssh-1.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxssh/nxssh-1.4.0.ebuild,v 1.1 2004/08/30 20:20:13 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxssh/nxssh-1.4.0.ebuild,v 1.2 2005/01/02 09:40:02 stuart Exp $
 
 MY_P="${PN}-${PV}-15"
 DESCRIPTION="Modified openssh client, used by nxclient"