Require dev-libs/libedit for libedit support, as it's going to be removed from freebsd-lib in favour of a merged dev-libs/libedit ebuild.

(Portage version: 2.1.2_rc2-r5)

5 files changed, 15 insertions, 9 deletions

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index a1551a118e0e..1482dfa529d2 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,12 @@
 # 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.222 2006/11/08 23:15:58 iluxa Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.223 2006/12/07 08:44:26 flameeyes Exp $
+
+  07 Dec 2006; Diego Pettenò <flameeyes@gentoo.org>
+  openssh-4.3_p2-r1.ebuild, openssh-4.3_p2-r5.ebuild,
+  openssh-4.4_p1-r6.ebuild, openssh-4.5_p1.ebuild:
+  Require dev-libs/libedit for libedit support, as it's going to be removed
+  from freebsd-lib in favour of a merged dev-libs/libedit ebuild.
 
   08 Nov 2006; Ilya A. Volynets-Evenbakh <iluxa@gentoo.org>
   openssh-4.4_p1-r6.ebuild:
diff --git a/net-misc/openssh/openssh-4.3_p2-r1.ebuild b/net-misc/openssh/openssh-4.3_p2-r1.ebuild
index 5aa33d9c28c4..d3613b6626cd 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.18 2006/06/27 01:09:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.3_p2-r1.ebuild,v 1.19 2006/12/07 08:44:26 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 sys-freebsd/freebsd-lib ) )
+	libedit? ( dev-libs/libedit )
 	>=dev-libs/openssl-0.9.6d
 	>=sys-libs/zlib-1.2.3
 	smartcard? ( dev-libs/opensc )
diff --git a/net-misc/openssh/openssh-4.3_p2-r5.ebuild b/net-misc/openssh/openssh-4.3_p2-r5.ebuild
index 0b8f674cf3b1..e7d5e6c53b42 100644
--- a/net-misc/openssh/openssh-4.3_p2-r5.ebuild
+++ b/net-misc/openssh/openssh-4.3_p2-r5.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-r5.ebuild,v 1.9 2006/09/29 20:04:26 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.3_p2-r5.ebuild,v 1.10 2006/12/07 08:44:26 flameeyes Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -33,7 +33,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 sys-freebsd/freebsd-lib ) )
+	libedit? ( dev-libs/libedit )
 	>=dev-libs/openssl-0.9.6d
 	>=sys-libs/zlib-1.2.3
 	smartcard? ( dev-libs/opensc )
diff --git a/net-misc/openssh/openssh-4.4_p1-r6.ebuild b/net-misc/openssh/openssh-4.4_p1-r6.ebuild
index 09fe70365099..98829823b3e7 100644
--- a/net-misc/openssh/openssh-4.4_p1-r6.ebuild
+++ b/net-misc/openssh/openssh-4.4_p1-r6.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.4_p1-r6.ebuild,v 1.4 2006/11/08 23:15:58 iluxa Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.4_p1-r6.ebuild,v 1.5 2006/12/07 08:44:26 flameeyes Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -34,7 +34,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 sys-freebsd/freebsd-lib ) )
+	libedit? ( dev-libs/libedit )
 	>=dev-libs/openssl-0.9.6d
 	>=sys-libs/zlib-1.2.3
 	smartcard? ( dev-libs/opensc )
diff --git a/net-misc/openssh/openssh-4.5_p1.ebuild b/net-misc/openssh/openssh-4.5_p1.ebuild
index bc0146d453c5..32153f6150c5 100644
--- a/net-misc/openssh/openssh-4.5_p1.ebuild
+++ b/net-misc/openssh/openssh-4.5_p1.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.5_p1.ebuild,v 1.4 2006/11/08 20:06:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.5_p1.ebuild,v 1.5 2006/12/07 08:44:26 flameeyes Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -34,7 +34,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 sys-freebsd/freebsd-lib ) )
+	libedit? ( dev-libs/libedit )
 	>=dev-libs/openssl-0.9.6d
 	>=sys-libs/zlib-1.2.3
 	smartcard? ( dev-libs/opensc )