Version bump #80317 by Jonas Bofjäll.

(Portage version: 2.0.51-r15)

5 files changed, 84 insertions, 15 deletions

diff --git a/net-misc/lsh/ChangeLog b/net-misc/lsh/ChangeLog
index 56954c9d9322..56a8531eccc8 100644
--- a/net-misc/lsh/ChangeLog
+++ b/net-misc/lsh/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/lsh
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/lsh/ChangeLog,v 1.1 2004/11/23 02:47:12 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/lsh/ChangeLog,v 1.2 2005/02/06 10:32:10 vapier Exp $
+
+*lsh-2.0 (06 Feb 2005)
+
+  06 Feb 2005; Mike Frysinger <vapier@gentoo.org> +lsh-2.0.ebuild:
+  Version bump #80317 by Jonas Bofjäll.
 
   22 Nov 2004; Mike Frysinger <vapier@gentoo.org>
   +files/1.4.3-configure.patch, +files/1.4.3-gcc34.patch, +files/lsh.confd,
diff --git a/net-misc/lsh/Manifest b/net-misc/lsh/Manifest
index e26cdda05fe7..5d15a02edec2 100644
--- a/net-misc/lsh/Manifest
+++ b/net-misc/lsh/Manifest
@@ -1,17 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 cbb7fda0951ecafb177dc48b3345fa39 ChangeLog 1447
-MD5 43eb7bfa547fb49084632dcac166051b lsh-1.4.3-r1.ebuild 1504
+MD5 43eb7bfa547fb49084632dcac166051b lsh-2.0.ebuild 1504
 MD5 48f92b7cf2f5538a6e68145828e8f8ad files/lsh.confd 367
 MD5 12d8d84a70281a27cccb14cc8e2c83e2 files/digest-lsh-1.4.3-r1 62
 MD5 e2a988c83f0406d964502a58a4f58cd3 files/1.4.3-gcc34.patch 2002
 MD5 91dd5c1841fefcad0a619dbead9a79de files/1.4.3-configure.patch 656
 MD5 3e325f3a64bf91a900f317fd2e49a4c2 files/lsh.rc 814
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFB3iaBroRuSHgZdywRAmR/AJ9bdTIPcFR8Q2YXzIQp9wP0jU5UbgCgkuyO
-8bYTUKyeFPMWZbycfeKvMF4=
-=gFZ5
------END PGP SIGNATURE-----
+MD5 edf93c20b3588a9885905dfd22a01caf files/digest-lsh-2.0 60
diff --git a/net-misc/lsh/files/digest-lsh-2.0 b/net-misc/lsh/files/digest-lsh-2.0
new file mode 100644
index 000000000000..9c86a7ecbcb6
--- /dev/null
+++ b/net-misc/lsh/files/digest-lsh-2.0
@@ -0,0 +1 @@
+MD5 ea0057457df96c31e87eefcefbcd0ea9 lsh-2.0.tar.gz 1866227
diff --git a/net-misc/lsh/lsh-1.4.3-r1.ebuild b/net-misc/lsh/lsh-1.4.3-r1.ebuild
index d0f2f8f1fad6..206beecf6018 100644
--- a/net-misc/lsh/lsh-1.4.3-r1.ebuild
+++ b/net-misc/lsh/lsh-1.4.3-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/lsh/lsh-1.4.3-r1.ebuild,v 1.2 2005/01/07 06:04:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/lsh/lsh-1.4.3-r1.ebuild,v 1.3 2005/02/06 10:32:10 vapier Exp $
 
 inherit eutils
 
diff --git a/net-misc/lsh/lsh-2.0.ebuild b/net-misc/lsh/lsh-2.0.ebuild
new file mode 100644
index 000000000000..a780e5722681
--- /dev/null
+++ b/net-misc/lsh/lsh-2.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/lsh/lsh-2.0.ebuild,v 1.1 2005/02/06 10:32:10 vapier Exp $
+
+inherit eutils
+
+DESCRIPTION="A GNU implementation of the Secure Shell protocols"
+HOMEPAGE="http://www.lysator.liu.se/~nisse/lsh/"
+SRC_URI="ftp://ftp.lysator.liu.se/pub/security/lsh/${P}.tar.gz
+	http://www.lysator.liu.se/~nisse/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="pam tcpd ipv6 zlib X"
+
+RDEPEND="dev-libs/gmp
+	dev-libs/liboop
+	dev-libs/nettle
+	zlib? ( sys-libs/zlib )
+	X? ( virtual/x11 )
+	tcpd? ( sys-apps/tcp-wrappers )
+	pam? ( sys-libs/pam )"
+#	kerberos? ( virtual/krb5 )
+DEPEND="${RDEPEND}
+	>=sys-apps/portage-2.0.51"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# remove bundled nettle crap #56156 ... this is pretty ugly sed foo,
+	# but the alternative is a bigger, uglier patch which would probably 
+	# need updating with every version :/
+	sed -i -e '/src\/nettle/d' configure || die "sed configure failed"
+	sed -i \
+		-e '/^SUBDIRS/s:nettle::' \
+		-e '/^LDADD/s:nettle/libnettle\.a:-lnettle:' \
+		-e 's:nettle/libnettle\.a::' \
+		src/Makefile.in || die "sed src failed"
+	sed -i \
+		-e 's:\.\./\.\./nettle/libnettle\.a::' \
+		src/spki/tools/Makefile.in || die "sed spki failed"
+	sed -i \
+		-e '/^LDADD/s:\.\./nettle/libnettle\.a:-lnettle:' \
+		-e 's:\.\./nettle/libnettle\.a::' \
+		src/testsuite/Makefile.in || die "sed test failed"
+	rm -r src/nettle
+}
+
+src_compile() {
+	# configure script checks /dev/ptmx in order to enable
+	# proper unix pty support ... so lets fake that it works :)
+	addpredict /dev/ptmx
+#		$(use_enable kerberos)
+	econf \
+		--disable-kerberos \
+		$(use_enable pam) \
+		$(use_enable ipv6) \
+		$(use_with zlib) \
+		$(use_with tcpd tcpwrappers) \
+		$(use_with X x) \
+		|| die
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "install failed"
+	dodoc ANNOUNCE AUTHORS ChangeLog FAQ NEWS README
+
+	newinitd "${FILESDIR}"/lsh.rc lshd
+	newconfd "${FILESDIR}"/lsh.confd lshd
+}