summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2006-04-04 09:13:30 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2006-04-04 09:13:30 +0000
commit3663dfa8c23db7d1a3e949f80f8134b90c9abd81 (patch)
treea3676da4497265d45d36446c31375ae8b04d8eb0 /net-misc/openssh
parentFixing metadata.xml (there was a bracket '>' too much in maintainer's email) (diff)
downloadgentoo-2-3663dfa8c23db7d1a3e949f80f8134b90c9abd81.tar.gz
gentoo-2-3663dfa8c23db7d1a3e949f80f8134b90c9abd81.tar.bz2
gentoo-2-3663dfa8c23db7d1a3e949f80f8134b90c9abd81.zip
Allow using freebsd-lib's libedit with libedit useflag.
(Portage version: 2.1_pre7-r3)
Diffstat (limited to 'net-misc/openssh')
-rw-r--r--net-misc/openssh/ChangeLog6
-rw-r--r--net-misc/openssh/openssh-4.3_p2-r1.ebuild4
2 files changed, 7 insertions, 3 deletions
diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index b49e3a9dd838..de9a6ca77d7d 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-misc/openssh
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.161 2006/03/30 17:47:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.162 2006/04/04 09:13:30 flameeyes Exp $
+
+ 04 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+ openssh-4.3_p2-r1.ebuild:
+ Allow using freebsd-lib's libedit with libedit useflag.
30 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
openssh-4.3_p2-r1.ebuild:
diff --git a/net-misc/openssh/openssh-4.3_p2-r1.ebuild b/net-misc/openssh/openssh-4.3_p2-r1.ebuild
index e6b83cc08aa9..f84c8c1d70fa 100644
--- a/net-misc/openssh/openssh-4.3_p2-r1.ebuild
+++ b/net-misc/openssh/openssh-4.3_p2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.3_p2-r1.ebuild,v 1.4 2006/03/30 17:47:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.3_p2-r1.ebuild,v 1.5 2006/04/04 09:13:30 flameeyes Exp $
inherit eutils flag-o-matic ccc pam
@@ -31,7 +31,7 @@ RDEPEND="pam? ( virtual/pam )
selinux? ( >=sys-libs/libselinux-1.28 )
skey? ( >=app-admin/skey-1.1.5-r1 )
ldap? ( net-nds/openldap )
- libedit? ( dev-libs/libedit )
+ libedit? ( || ( dev-libs/libedit sys-freebsd/freebsd-lib ) )
>=dev-libs/openssl-0.9.6d
>=sys-libs/zlib-1.2.3
smartcard? ( dev-libs/opensc )