Add USE=libedit support #94410 by Joe Wells.

Package-Manager: portage-2.0.51.22-r1

4 files changed, 16 insertions, 8 deletions

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index c0fe8efde152..fe62ca42f229 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/openssh
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.122 2005/05/29 10:48:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.123 2005/05/29 22:29:07 vapier Exp $
+
+  29 May 2005; Mike Frysinger <vapier@gentoo.org> openssh-4.0_p1-r1.ebuild,
+  openssh-4.1_p1.ebuild:
+  Add USE=libedit support #94410 by Joe Wells.
 
 *openssh-4.1_p1 (29 May 2005)
 
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 27135b29882e..fab7d20de334 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -1,9 +1,9 @@
-MD5 c5bf4736f46cb5bb3d8777466ef6b2df ChangeLog 20624
+MD5 d7bd4957b2469a9793d6dbcedcdca305 ChangeLog 20773
 MD5 0feff9b09e482567359625301bddce1c metadata.xml 1329
-MD5 5def73b80a3eaa6198c64d0feeb4842b openssh-4.1_p1.ebuild 5053
+MD5 19922d5a303c121f60f0446b96498b5d openssh-4.1_p1.ebuild 5116
 MD5 ee9586511d4aaca7efc989e10f468c2d openssh-3.8.1_p1-r1.ebuild 4552
 MD5 f948995dff7e8d3cf8074533e71dc62b openssh-3.9_p1-r2.ebuild 4836
-MD5 fc81c8a0443e0e6440442c2949eaf900 openssh-4.0_p1-r1.ebuild 5061
+MD5 c10be0fc46eb43074eb2bad73cbb8fe3 openssh-4.0_p1-r1.ebuild 5124
 MD5 a838d5092e4bce1a4e1d1b976cce347e files/digest-openssh-3.8.1_p1-r1 216
 MD5 03897042175223579b97e42d6c70c6bd files/digest-openssh-4.0_p1-r1 292
 MD5 daf6bd48fcdbe11037342b2ad6d72dcc files/digest-openssh-4.1_p1 292
diff --git a/net-misc/openssh/openssh-4.0_p1-r1.ebuild b/net-misc/openssh/openssh-4.0_p1-r1.ebuild
index 8131fd419a1e..aeb55bd5af28 100644
--- a/net-misc/openssh/openssh-4.0_p1-r1.ebuild
+++ b/net-misc/openssh/openssh-4.0_p1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.0_p1-r1.ebuild,v 1.8 2005/05/29 22:23:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.0_p1-r1.ebuild,v 1.9 2005/05/29 22:29:07 vapier Exp $
 
 inherit eutils flag-o-matic ccc pam
 
@@ -24,13 +24,14 @@ SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="ipv6 static pam tcpd kerberos skey selinux chroot X509 ldap smartcard nocxx sftplogging"
+IUSE="ipv6 static pam tcpd kerberos skey selinux chroot X509 ldap smartcard nocxx sftplogging libedit"
 
 RDEPEND="pam? ( virtual/pam )
 	kerberos? ( virtual/krb5 )
 	selinux? ( sys-libs/libselinux )
 	skey? ( >=app-admin/skey-1.1.5-r1 )
 	ldap? ( net-nds/openldap )
+	libedit? ( dev-libs/libedit )
 	>=dev-libs/openssl-0.9.6d
 	>=sys-libs/zlib-1.1.4
 	smartcard? ( dev-libs/opensc )
@@ -108,6 +109,7 @@ src_compile() {
 		--with-privsep-path=/var/empty \
 		--with-privsep-user=sshd \
 		--with-md5-passwords \
+		$(use_with libedit) \
 		$(use_with kerberos kerberos5 /usr) \
 		$(use_with tcpd tcp-wrappers) \
 		$(use_with skey) \
diff --git a/net-misc/openssh/openssh-4.1_p1.ebuild b/net-misc/openssh/openssh-4.1_p1.ebuild
index 7e5a32425108..d47d6c7ac75b 100644
--- a/net-misc/openssh/openssh-4.1_p1.ebuild
+++ b/net-misc/openssh/openssh-4.1_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.1_p1.ebuild,v 1.2 2005/05/29 22:23:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.1_p1.ebuild,v 1.3 2005/05/29 22:29:07 vapier Exp $
 
 inherit eutils flag-o-matic ccc pam
 
@@ -24,13 +24,14 @@ SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="ipv6 static pam tcpd kerberos skey selinux chroot X509 ldap smartcard nocxx sftplogging"
+IUSE="ipv6 static pam tcpd kerberos skey selinux chroot X509 ldap smartcard nocxx sftplogging libedit"
 
 RDEPEND="pam? ( virtual/pam )
 	kerberos? ( virtual/krb5 )
 	selinux? ( sys-libs/libselinux )
 	skey? ( >=app-admin/skey-1.1.5-r1 )
 	ldap? ( net-nds/openldap )
+	libedit? ( dev-libs/libedit )
 	>=dev-libs/openssl-0.9.6d
 	>=sys-libs/zlib-1.1.4
 	smartcard? ( dev-libs/opensc )
@@ -109,6 +110,7 @@ src_compile() {
 		--with-privsep-path=/var/empty \
 		--with-privsep-user=sshd \
 		--with-md5-passwords \
+		$(use_with libedit) \
 		$(use_with kerberos kerberos5 /usr) \
 		$(use_with tcpd tcp-wrappers) \
 		$(use_with skey) \