Sync with overlay

(Portage version: 2203-svn)

4 files changed, 71 insertions, 12 deletions

diff --git a/net-misc/nxssh/ChangeLog b/net-misc/nxssh/ChangeLog
index 30096612cdca..37e8c5d30826 100644
--- a/net-misc/nxssh/ChangeLog
+++ b/net-misc/nxssh/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/nxssh
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxssh/ChangeLog,v 1.15 2005/10/20 21:54:54 agriffis Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxssh/ChangeLog,v 1.16 2006/04/30 18:33:28 stuart Exp $
+
+*nxssh-1.5.0-r2 (30 Apr 2006)
+
+  30 Apr 2006; Stuart Herbert <stuart@gentoo.org> +nxssh-1.5.0-r2.ebuild:
+  Huge thanks to Jon Scruggs for these changes:
+  
+  * Updated build number
+  * Cleaned up the dependencies
+  * Added configure fix to point ot the correct include directory.
 
   20 Oct 2005; Aron Griffis <agriffis@gentoo.org> nxssh-1.5.0.ebuild:
   Need to get nxcomp's NX.h from /usr/NX/include
diff --git a/net-misc/nxssh/Manifest b/net-misc/nxssh/Manifest
index b24f71e1bd6f..94dcb60a5081 100644
--- a/net-misc/nxssh/Manifest
+++ b/net-misc/nxssh/Manifest
@@ -1,18 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 aa91fe98b4f8b3ac60151a0c95dc887e ChangeLog 1811
 MD5 1621d9205e3725cfc24ccf19006e9699 files/digest-nxssh-1.3.2 65
 MD5 c55a5bd8cb8ece91220fc12237304f61 files/digest-nxssh-1.4.0-r1 66
 MD5 e7a08594cb696a58c52235c237075986 files/digest-nxssh-1.5.0 66
+MD5 2f676e03e8a82529d30c13e5e4e2fb33 files/digest-nxssh-1.5.0-r2 66
 MD5 0d90a3579c4f3a0310c775b71e87fb2a metadata.xml 370
 MD5 26d3d3c58c8b586790a97578d1a14367 nxssh-1.3.2.ebuild 1414
 MD5 739cb79eee52b9f08d4ce9e7782bdb73 nxssh-1.4.0-r1.ebuild 1425
+MD5 cce6c5894d05dab7b94d3fb952ef7860 nxssh-1.5.0-r2.ebuild 1353
 MD5 ab525ac2ba03e913b44286c1bf658454 nxssh-1.5.0.ebuild 1216
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDXCn+JrHF4yAQTrARArsPAJ9qhxPBXsVUa3SfjCm8b5cBGjwLygCgwUAY
-jluq07oXurjUxqViKKSaL9U=
-=vPjU
------END PGP SIGNATURE-----
diff --git a/net-misc/nxssh/files/digest-nxssh-1.5.0-r2 b/net-misc/nxssh/files/digest-nxssh-1.5.0-r2
new file mode 100644
index 000000000000..441b756150e6
--- /dev/null
+++ b/net-misc/nxssh/files/digest-nxssh-1.5.0-r2
@@ -0,0 +1 @@
+MD5 86df9d5f03bd7e1e1930f129fe87347d nxssh-1.5.0-23.tar.gz 867499
diff --git a/net-misc/nxssh/nxssh-1.5.0-r2.ebuild b/net-misc/nxssh/nxssh-1.5.0-r2.ebuild
new file mode 100644
index 000000000000..c9371003061b
--- /dev/null
+++ b/net-misc/nxssh/nxssh-1.5.0-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxssh/nxssh-1.5.0-r2.ebuild,v 1.1 2006/04/30 18:33:28 stuart Exp $
+
+inherit multilib flag-o-matic
+
+DESCRIPTION="Modified openssh client, used by nxclient"
+HOMEPAGE="http://www.nomachine.com/"
+
+IUSE="ipv6 pam tcpd"
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc"
+
+SRC_URI="http://web04.nomachine.com/download/1.5.0/sources/nxssh-$PV-23.tar.gz"
+
+DEPEND="~net-misc/nxcomp-1.5.0
+	>=dev-libs/openssl-0.9.7
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	pam? ( >=sys-libs/pam-0.77 )"
+
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# unfortunately this package doesn't honor environment variables correctly
+	# in configure, so append-flags doesn't work.
+	sed -i 's/-I *..\/nxcomp/-I\/usr\/NX\/include/' configure
+}
+
+src_compile() {
+	append-flags -I/usr/NX/include
+	append-ldflags -L/usr/NX/$(get_libdir)
+	./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 \
+		$(use_with tcpd tcp-wrappers) \
+		$(use_with pam) \
+		$(use_with !ipv6 ipv4-default) \
+		|| die "configure nxssh failed"
+	emake || die "emake nxssh failed"
+}
+
+src_install() {
+	into /usr/NX
+	dobin nxssh
+}