Version bump

26 files changed, 72 insertions, 255 deletions

diff --git a/net-misc/nxcomp/ChangeLog b/net-misc/nxcomp/ChangeLog
index 37a1fa0ad69e..fad1bdef32b3 100644
--- a/net-misc/nxcomp/ChangeLog
+++ b/net-misc/nxcomp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/nxcomp
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxcomp/ChangeLog,v 1.10 2004/03/11 11:18:24 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxcomp/ChangeLog,v 1.11 2004/05/13 21:41:22 stuart Exp $
+
+*nxcomp-1.3.2 (13 May 2004)
+
+  13 May 2004; Stuart Herbert <stuart@gentoo.org> nxcomp-1.2.2.ebuild,
+  nxcomp-1.3.0_beta2.ebuild, nxcomp-1.3.2.ebuild:
+  Added nxcomp-1.3.2, for nxserver 1.3.2.  Removed older versions
 
   11 Mar 2004; David Holm <dholm@gentoo.org> nxcomp-1.3.0.ebuild:
   Added to ~ppc.
diff --git a/net-misc/nxcomp/Manifest b/net-misc/nxcomp/Manifest
index c27934ace890..cac167b2f042 100644
--- a/net-misc/nxcomp/Manifest
+++ b/net-misc/nxcomp/Manifest
@@ -1,10 +1,12 @@
-MD5 cdfc1a19c338f6cc231a550f238daeb0 ChangeLog 1199
 MD5 39430c7d3895dd6b7a9981e094a2e357 nxcomp-1.2.2.ebuild 760
-MD5 8e92b9291198042d907534cb08b013f8 metadata.xml 361
-MD5 0e1abb6c67b5b6d7b0013faee293669e nxcomp-1.2.2-r1.ebuild 763
 MD5 b53c5302c2eae44e89d613d9f3193cdd nxcomp-1.3.0_beta2.ebuild 785
 MD5 20f0cb78f52ee9fcd6390ecdffdc2ec4 nxcomp-1.3.0.ebuild 956
-MD5 b7ad142d655c6e9ae50d78bf227a1248 files/digest-nxcomp-1.2.2 67
+MD5 0e1abb6c67b5b6d7b0013faee293669e nxcomp-1.2.2-r1.ebuild 763
+MD5 cdfc1a19c338f6cc231a550f238daeb0 ChangeLog 1199
+MD5 8e92b9291198042d907534cb08b013f8 metadata.xml 361
+MD5 36416a787dd44d5d2445b0ddd63e53c9 nxcomp-1.3.2.ebuild 955
 MD5 93171603dadf0e06996bd9fd833c5064 files/digest-nxcomp-1.2.2-r1 67
 MD5 5081cbda1915917e07fab844eec70fa6 files/digest-nxcomp-1.3.0_beta2 67
+MD5 b7ad142d655c6e9ae50d78bf227a1248 files/digest-nxcomp-1.2.2 67
 MD5 a766a8d9478498b282f0852b5e38377d files/digest-nxcomp-1.3.0 67
+MD5 bbbdf1a4b71647d0606017837bb7fc69 files/digest-nxcomp-1.3.2 66
diff --git a/net-misc/nxcomp/files/digest-nxcomp-1.2.2 b/net-misc/nxcomp/files/digest-nxcomp-1.2.2
deleted file mode 100644
index 5b0d12a684aa..000000000000
--- a/net-misc/nxcomp/files/digest-nxcomp-1.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b27d13ede847884b571f27b4cd1c6b21 nxcomp-1.2.2-55.tar.gz 402433
diff --git a/net-misc/nxcomp/files/digest-nxcomp-1.3.0_beta2 b/net-misc/nxcomp/files/digest-nxcomp-1.3.0_beta2
deleted file mode 100644
index 79b2642082cc..000000000000
--- a/net-misc/nxcomp/files/digest-nxcomp-1.3.0_beta2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b3ca4f2dd58fcd29167c8edd0c1ee4ca nxcomp-1.3.0-34.tar.gz 426349
diff --git a/net-misc/nxcomp/files/digest-nxcomp-1.3.2 b/net-misc/nxcomp/files/digest-nxcomp-1.3.2
new file mode 100644
index 000000000000..6753c94d74cd
--- /dev/null
+++ b/net-misc/nxcomp/files/digest-nxcomp-1.3.2
@@ -0,0 +1 @@
+MD5 1790feafa93c3ca58af117ab6f1f5bca nxcomp-1.3.2-4.tar.gz 432456
diff --git a/net-misc/nxcomp/nxcomp-1.3.0_beta2.ebuild b/net-misc/nxcomp/nxcomp-1.3.0_beta2.ebuild
deleted file mode 100644
index cc38cb3a8799..000000000000
--- a/net-misc/nxcomp/nxcomp-1.3.0_beta2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxcomp/nxcomp-1.3.0_beta2.ebuild,v 1.2 2003/11/24 22:31:26 stuart Exp $
-
-MY_P="${PN}-1.3.0-34"
-DESCRIPTION="X11 protocol compression library"
-HOMEPAGE="http://www.nomachine.com/"
-SRC_URI="http://www.nomachine.com/download/beta/nxclient-sources-beta2/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-DEPEND=""
-# Run-time dependencies, same as DEPEND if RDEPEND isn't defined:
-#RDEPEND=""
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	./configure
-	emake || die "compile problem"
-}
-
-src_install() {
-	insinto /usr/NX/lib
-	dolib libXcomp.so.1.3.0
-
-	dodoc README README-IPAQ LICENSE VERSION
-
-	insinto /usr/NX/include
-	doins NX.h
-}
diff --git a/net-misc/nxcomp/nxcomp-1.2.2.ebuild b/net-misc/nxcomp/nxcomp-1.3.2.ebuild
index a490a0c7658c..15c743a58dc2 100644
--- a/net-misc/nxcomp/nxcomp-1.2.2.ebuild
+++ b/net-misc/nxcomp/nxcomp-1.3.2.ebuild
@@ -1,15 +1,21 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxcomp/nxcomp-1.2.2.ebuild,v 1.3 2003/09/09 13:37:21 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxcomp/nxcomp-1.3.2.ebuild,v 1.1 2004/05/13 21:41:22 stuart Exp $
 
-MY_P="${P}-55"
+MY_P="${PN}-1.3.2-4"
 DESCRIPTION="X11 protocol compression library"
 HOMEPAGE="http://www.nomachine.com/"
 SRC_URI="http://www.nomachine.com/download/nxsources/nxcomp/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
-DEPEND=""
+KEYWORDS="x86 ~ppc"
+DEPEND=">=media-libs/jpeg-6b-r3
+>=media-libs/libpng-1.2.5-r4
+>=sys-devel/gcc-3.2.3-r2
+>=sys-libs/glibc-2.3.2-r3
+>=sys-libs/zlib-1.1.4-r2
+virtual/x11"
+
 # Run-time dependencies, same as DEPEND if RDEPEND isn't defined:
 #RDEPEND=""
 
@@ -17,12 +23,12 @@ S=${WORKDIR}/${PN}
 
 src_compile() {
 	./configure
-	emake || die "compile problem"
+	DISTCC_HOSTS="localhost" CCACHE_DISABLE="1" emake || die "compile problem"
 }
 
 src_install() {
 	insinto /usr/NX/lib
-	dolib libXcomp.so.1.2.2
+	dolib libXcomp.so.1.3.0
 
 	dodoc README README-IPAQ LICENSE VERSION
 
diff --git a/net-misc/nxproxy/ChangeLog b/net-misc/nxproxy/ChangeLog
index f48561d91c5c..b3ceb6402900 100644
--- a/net-misc/nxproxy/ChangeLog
+++ b/net-misc/nxproxy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/nxproxy
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxproxy/ChangeLog,v 1.6 2004/03/11 11:19:18 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxproxy/ChangeLog,v 1.7 2004/05/13 21:44:21 stuart Exp $
+
+*nxproxy-1.3.2 (13 May 2004)
+
+  13 May 2004; Stuart Herbert <stuart@gentoo.org> nxproxy-1.2.2-r1.ebuild,
+  nxproxy-1.2.2.ebuild, nxproxy-1.3.0_beta2.ebuild, nxproxy-1.3.2.ebuild:
+  Version bump
 
   11 Mar 2004; David Holm <dholm@gentoo.org> nxproxy-1.3.0.ebuild:
   Added to ~ppc.
diff --git a/net-misc/nxproxy/Manifest b/net-misc/nxproxy/Manifest
index 6cb91e161dc7..60c2f389d129 100644
--- a/net-misc/nxproxy/Manifest
+++ b/net-misc/nxproxy/Manifest
@@ -1,11 +1,13 @@
-MD5 edf3cdbcfe1efb4de32fa675aabe33e7 ChangeLog 876
 MD5 fe79333f414352ed26ee0431b5c0e5c4 nxproxy-1.2.2.ebuild 953
+MD5 1a6fc1c71bbb9bcddf465580813fc37d nxproxy-1.3.0.ebuild 966
+MD5 46193cc0d9c0032d23c2bc4749adb670 nxproxy-1.3.0_beta2.ebuild 985
+MD5 edf3cdbcfe1efb4de32fa675aabe33e7 ChangeLog 876
 MD5 a50ecb98a1a261895a4d34af6cda6b3c metadata.xml 369
 MD5 8c34626069827f49a630ec73bd2cb84d nxproxy-1.2.2-r1.ebuild 959
-MD5 46193cc0d9c0032d23c2bc4749adb670 nxproxy-1.3.0_beta2.ebuild 985
-MD5 1a6fc1c71bbb9bcddf465580813fc37d nxproxy-1.3.0.ebuild 966
-MD5 d7c92d02795ad3ecf951731efaac6b03 files/1.2.2-Makefile.in.patch 421
+MD5 af45344c34b9a6cc6f2ec4c91fcaa486 nxproxy-1.3.2.ebuild 966
 MD5 0738e13fa3f4d0504c8419991333f8d3 files/digest-nxproxy-1.2.2 66
+MD5 16f01143f4d6dd7959a1ffd920722af5 files/digest-nxproxy-1.3.0 66
+MD5 d7c92d02795ad3ecf951731efaac6b03 files/1.2.2-Makefile.in.patch 421
 MD5 3a6e47c8c627da5f53608c28eb48277a files/digest-nxproxy-1.2.2-r1 66
 MD5 d089c2e92093141239874020c790117d files/digest-nxproxy-1.3.0_beta2 66
-MD5 16f01143f4d6dd7959a1ffd920722af5 files/digest-nxproxy-1.3.0 66
+MD5 34472d4d8979c06122ccb8e42633b27d files/digest-nxproxy-1.3.2 66
diff --git a/net-misc/nxproxy/files/digest-nxproxy-1.2.2 b/net-misc/nxproxy/files/digest-nxproxy-1.2.2
deleted file mode 100644
index 300dfccdaa29..000000000000
--- a/net-misc/nxproxy/files/digest-nxproxy-1.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8c75e3d71b5da8b724b24111de6099d1 nxproxy-1.2.2-5.tar.gz 24937
diff --git a/net-misc/nxproxy/files/digest-nxproxy-1.2.2-r1 b/net-misc/nxproxy/files/digest-nxproxy-1.2.2-r1
deleted file mode 100644
index dbe171e8186b..000000000000
--- a/net-misc/nxproxy/files/digest-nxproxy-1.2.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5924d4071dabff472c4c663b435fae7f nxproxy-1.2.2-6.tar.gz 24972
diff --git a/net-misc/nxproxy/files/digest-nxproxy-1.3.0_beta2 b/net-misc/nxproxy/files/digest-nxproxy-1.3.0_beta2
deleted file mode 100644
index dfb06ccad4ac..000000000000
--- a/net-misc/nxproxy/files/digest-nxproxy-1.3.0_beta2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d4a384077986fadf5b1636880b3842b8 nxproxy-1.3.0-6.tar.gz 74396
diff --git a/net-misc/nxproxy/files/digest-nxproxy-1.3.2 b/net-misc/nxproxy/files/digest-nxproxy-1.3.2
new file mode 100644
index 000000000000..90e88bb39998
--- /dev/null
+++ b/net-misc/nxproxy/files/digest-nxproxy-1.3.2
@@ -0,0 +1 @@
+MD5 5efdfe1a54b45e6ebce08f711d565100 nxproxy-1.3.2-1.tar.gz 74865
diff --git a/net-misc/nxproxy/nxproxy-1.2.2-r1.ebuild b/net-misc/nxproxy/nxproxy-1.2.2-r1.ebuild
deleted file mode 100644
index df7f8476bb62..000000000000
--- a/net-misc/nxproxy/nxproxy-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxproxy/nxproxy-1.2.2-r1.ebuild,v 1.1 2003/09/10 16:09:29 stuart Exp $
-
-MY_P="${P}-6"
-DESCRIPTION="X11 protocol compression library wrapper"
-HOMEPAGE="http://www.nomachine.com/"
-SRC_URI="http://www.nomachine.com/download/nxsources/${PN}/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-DEPEND=">=net-misc/nxcomp-1.2.2-r1
-	sys-devel/patch
-	>=media-libs/jpeg-6b-r3
-	>=sys-libs/glibc-2.3.2-r1
-	>=sys-libs/zlib-1.1.4-r1"
-
-# Run-time dependencies, same as DEPEND if RDEPEND isn't defined:
-#RDEPEND=""
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	patch Makefile.in < ${FILESDIR}/1.2.2-Makefile.in.patch
-}
-
-src_compile() {
-	./configure
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	exeinto /usr/NX/bin
-	doexe nxproxy
-
-	dodoc README README-IPAQ README-VALGRIND VERSION LICENSE
-}
diff --git a/net-misc/nxproxy/nxproxy-1.2.2.ebuild b/net-misc/nxproxy/nxproxy-1.2.2.ebuild
deleted file mode 100644
index bbc8540cf870..000000000000
--- a/net-misc/nxproxy/nxproxy-1.2.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxproxy/nxproxy-1.2.2.ebuild,v 1.3 2003/09/09 13:38:51 stuart Exp $
-
-MY_P="${P}-5"
-DESCRIPTION="X11 protocol compression library wrapper"
-HOMEPAGE="http://www.nomachine.com/"
-SRC_URI="http://www.nomachine.com/download/nxsources/${PN}/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-DEPEND=">=net-misc/nxcomp-1.2.2
-	sys-devel/patch
-	>=media-libs/jpeg-6b-r3
-	>=sys-libs/glibc-2.3.2-r1
-	>=sys-libs/zlib-1.1.4-r1"
-
-# Run-time dependencies, same as DEPEND if RDEPEND isn't defined:
-#RDEPEND=""
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	patch Makefile.in < ${FILESDIR}/1.2.2-Makefile.in.patch
-}
-
-src_compile() {
-	./configure
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	exeinto /usr/NX/bin
-	doexe nxproxy
-
-	dodoc README README-IPAQ README-VALGRIND VERSION LICENSE
-}
diff --git a/net-misc/nxproxy/nxproxy-1.3.0_beta2.ebuild b/net-misc/nxproxy/nxproxy-1.3.2.ebuild
index 271fad14875e..9dd77584131f 100644
--- a/net-misc/nxproxy/nxproxy-1.3.0_beta2.ebuild
+++ b/net-misc/nxproxy/nxproxy-1.3.2.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxproxy/nxproxy-1.3.0_beta2.ebuild,v 1.1 2003/11/13 21:10:18 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxproxy/nxproxy-1.3.2.ebuild,v 1.1 2004/05/13 21:44:21 stuart Exp $
 
-MY_P="${PN}-1.3.0-6"
+MY_P="${PN}-1.3.2-1"
 DESCRIPTION="X11 protocol compression library wrapper"
 HOMEPAGE="http://www.nomachine.com/"
-SRC_URI="http://www.nomachine.com/download/beta/nxclient-sources-beta2/${MY_P}.tar.gz"
+SRC_URI="http://www.nomachine.com/download/nxsources/nxproxy/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-DEPEND=">=net-misc/nxcomp-1.3.0_beta2
+KEYWORDS="x86 ~ppc"
+DEPEND=">=net-misc/nxcomp-1.3.2
 	sys-devel/patch
 	>=media-libs/jpeg-6b-r3
 	>=sys-libs/glibc-2.3.2-r1
diff --git a/net-misc/nxssh/ChangeLog b/net-misc/nxssh/ChangeLog
index 31a60e083a4a..1c642bc8d258 100644
--- a/net-misc/nxssh/ChangeLog
+++ b/net-misc/nxssh/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/nxssh
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxssh/ChangeLog,v 1.7 2004/03/11 11:24:04 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxssh/ChangeLog,v 1.8 2004/05/13 21:47:18 stuart Exp $
+
+*nxssh-1.3.2 (13 May 2004)
+
+  13 May 2004; Stuart Herbert <stuart@gentoo.org> nxssh-1.2.2-r1.ebuild,
+  nxssh-1.2.2.ebuild, nxssh-1.3.0.ebuild, nxssh-1.3.0_beta2.ebuild,
+  nxssh-1.3.2.ebuild:
+  Version bump
 
   11 Mar 2004; David Holm <dholm@gentoo.org> nxssh-1.3.0.ebuild:
   Added to ~ppc.
diff --git a/net-misc/nxssh/Manifest b/net-misc/nxssh/Manifest
index 403e34f1b167..61d6920e2d43 100644
--- a/net-misc/nxssh/Manifest
+++ b/net-misc/nxssh/Manifest
@@ -1,10 +1,12 @@
-MD5 8de9a546d845bc3381be7fda9d55842a ChangeLog 849
 MD5 2efca95cb96408fa104941c779481fbf nxssh-1.2.2.ebuild 1367
-MD5 0d90a3579c4f3a0310c775b71e87fb2a metadata.xml 370
-MD5 3ac8346a284f12bc14098433f37a2ad5 nxssh-1.2.2-r1.ebuild 1370
+MD5 8c6c2f25101ce77e6b2890ea28f2bd85 nxssh-1.3.0.ebuild 1417
 MD5 df865a146fd43896711c079363970b28 nxssh-1.3.0_beta2.ebuild 1394
-MD5 7fbdef43cfc749d846a41cf07884fecd nxssh-1.3.0.ebuild 1373
-MD5 f6305e9a9358e4b8a76fc81c45775fce files/digest-nxssh-1.2.2 65
-MD5 3bc36d6521860bd0266bccc0e9ea3ad6 files/digest-nxssh-1.2.2-r1 65
+MD5 3ac8346a284f12bc14098433f37a2ad5 nxssh-1.2.2-r1.ebuild 1370
+MD5 8de9a546d845bc3381be7fda9d55842a ChangeLog 849
+MD5 0d90a3579c4f3a0310c775b71e87fb2a metadata.xml 370
+MD5 69a8bba7e495d33365d842d7bf111bb3 nxssh-1.3.2.ebuild 1417
 MD5 86260dbef1a3c70e78196bb5b196a922 files/digest-nxssh-1.3.0_beta2 65
+MD5 f6305e9a9358e4b8a76fc81c45775fce files/digest-nxssh-1.2.2 65
 MD5 1cd2c50e87d03e6f71bc28d3ef794d56 files/digest-nxssh-1.3.0 65
+MD5 3bc36d6521860bd0266bccc0e9ea3ad6 files/digest-nxssh-1.2.2-r1 65
+MD5 1621d9205e3725cfc24ccf19006e9699 files/digest-nxssh-1.3.2 65
diff --git a/net-misc/nxssh/files/digest-nxssh-1.2.2 b/net-misc/nxssh/files/digest-nxssh-1.2.2
deleted file mode 100644
index f0e12f7c7c53..000000000000
--- a/net-misc/nxssh/files/digest-nxssh-1.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ad942b49798c6f236b54a3644d37875a nxssh-1.2.2-5.tar.gz 879067
diff --git a/net-misc/nxssh/files/digest-nxssh-1.2.2-r1 b/net-misc/nxssh/files/digest-nxssh-1.2.2-r1
deleted file mode 100644
index ca1530245be4..000000000000
--- a/net-misc/nxssh/files/digest-nxssh-1.2.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cf40aed4082bf9d3bb8647935ca602d8 nxssh-1.2.2-6.tar.gz 881847
diff --git a/net-misc/nxssh/files/digest-nxssh-1.3.0_beta2 b/net-misc/nxssh/files/digest-nxssh-1.3.0_beta2
deleted file mode 100644
index 085701f2c614..000000000000
--- a/net-misc/nxssh/files/digest-nxssh-1.3.0_beta2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7a34c3475644372c844ff4f51b8eaad4 nxssh-1.3.0-3.tar.gz 873839
diff --git a/net-misc/nxssh/files/digest-nxssh-1.3.2 b/net-misc/nxssh/files/digest-nxssh-1.3.2
new file mode 100644
index 000000000000..0a4b878212f7
--- /dev/null
+++ b/net-misc/nxssh/files/digest-nxssh-1.3.2
@@ -0,0 +1 @@
+MD5 decac210921ba3d1ec68c247636f52e2 nxssh-1.3.2-3.tar.gz 873726
diff --git a/net-misc/nxssh/nxssh-1.2.2-r1.ebuild b/net-misc/nxssh/nxssh-1.2.2-r1.ebuild
deleted file mode 100644
index 00351d75d9d0..000000000000
--- a/net-misc/nxssh/nxssh-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxssh/nxssh-1.2.2-r1.ebuild,v 1.1 2003/09/10 16:11:33 stuart Exp $
-
-MY_P="${P}-6"
-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 -sparc -mips -alpha"
-DEPEND=""
-# Run-time dependencies, same as DEPEND if RDEPEND isn't defined:
-#RDEPEND=""
-IUSE="tcpd pam kerberos"
-
-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.3.0.ebuild b/net-misc/nxssh/nxssh-1.3.0.ebuild
index 9ddce65ec81c..55dda748e046 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 Technologies, Inc.
 # 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.2 2004/03/11 11:24:04 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxssh/nxssh-1.3.0.ebuild,v 1.3 2004/05/13 21:47:18 stuart Exp $
 
 MY_P="${PN}-1.3.0-4"
 DESCRIPTION="Modified openssh client, used by nxclient"
@@ -40,7 +40,7 @@ src_compile() {
 		--with-md5-passwords \
 		--host=${CHOST} ${myconf} || die "bad configure"
 
-	emake || die "compile problem"
+	DISTCC_HOSTS="localhost" CCACHE_DISABLE='1' emake || die "compile problem"
 }
 
 src_install() {
diff --git a/net-misc/nxssh/nxssh-1.3.0_beta2.ebuild b/net-misc/nxssh/nxssh-1.3.0_beta2.ebuild
deleted file mode 100644
index d19faa2c450e..000000000000
--- a/net-misc/nxssh/nxssh-1.3.0_beta2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxssh/nxssh-1.3.0_beta2.ebuild,v 1.1 2003/11/13 21:08:27 stuart Exp $
-
-MY_P="${PN}-1.3.0-3"
-DESCRIPTION="Modified openssh client, used by nxclient"
-HOMEPAGE="http://www.nomachine.com/"
-SRC_URI="http://www.nomachine.com/download/beta/nxclient-sources-beta2//${MY_P}.tar.gz"
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~x86 -ppc -sparc -mips -alpha"
-DEPEND=""
-# Run-time dependencies, same as DEPEND if RDEPEND isn't defined:
-#RDEPEND=""
-IUSE="tcpd pam kerberos"
-
-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.2.2.ebuild b/net-misc/nxssh/nxssh-1.3.2.ebuild
index 18663e6d18a8..14a4a4c1b498 100644
--- a/net-misc/nxssh/nxssh-1.2.2.ebuild
+++ b/net-misc/nxssh/nxssh-1.3.2.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxssh/nxssh-1.2.2.ebuild,v 1.2 2003/09/02 09:42:01 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxssh/nxssh-1.3.2.ebuild,v 1.1 2004/05/13 21:47:18 stuart Exp $
 
-MY_P="${P}-5"
+MY_P="${PN}-1.3.2-3"
 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 -sparc -mips -alpha"
+KEYWORDS="x86 ~ppc -sparc -mips -alpha"
 DEPEND=""
 # Run-time dependencies, same as DEPEND if RDEPEND isn't defined:
 #RDEPEND=""
@@ -40,7 +40,7 @@ src_compile() {
 		--with-md5-passwords \
 		--host=${CHOST} ${myconf} || die "bad configure"
 
-	emake || die "compile problem"
+	DISTCC_HOSTS="localhost" CCACHE_DISABLE='1' emake || die "compile problem"
 }
 
 src_install() {