Require dev-libs/libedit for libedit support, as it's going to be removed from freebs...

Package-Manager: portage-2.1.2_rc2-r5

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index a1551a118e0ef24fc5a2b2e58894838f4177e612..1482dfa529d2576deb3988257a5f29905704c6a3 100644 (file)
--- 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/Manifest b/net-misc/openssh/Manifest
index cc79cc459cebaedb37286013e1725de7beb0bd0d..fdd685a8659829f4154cc56d8e16dba4467603f2 100644 (file)
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX openssh-3.9_p1-chroot.patch 3026 RMD160 23b2a1c819580b0f2fcb927c13c63e4f16387333 SHA1 78f85bc81c0034e03d06dd3c7ab91b9210fc18fb SHA256 014158a32c707b2a79ac606aeefb6bc09f24c3f07ce5df353ddad96095518597
 MD5 c4edd6a7aa1418ce5bf74aeb46627dbf files/openssh-3.9_p1-chroot.patch 3026
 RMD160 23b2a1c819580b0f2fcb927c13c63e4f16387333 files/openssh-3.9_p1-chroot.patch 3026
@@ -202,26 +205,26 @@ EBUILD openssh-4.2_p1-r1.ebuild 5417 RMD160 9972e84e89cbc4eeb570a4eb808102d8a092
 MD5 cb561ae050e1b3b24870c2315004a47a openssh-4.2_p1-r1.ebuild 5417
 RMD160 9972e84e89cbc4eeb570a4eb808102d8a092685a openssh-4.2_p1-r1.ebuild 5417
 SHA256 e1c867a0e83ad120a574dcc3f07a00fbdf22bea359500ed41b71be5db373eed9 openssh-4.2_p1-r1.ebuild 5417
-EBUILD openssh-4.3_p2-r1.ebuild 5574 RMD160 d93ae64663af5f66a255a5fc5b9bd35fbae57ff2 SHA1 046f6ce5c43945fb48b84e80626ba2d37c2a053d SHA256 8c4d3ccfaeb3a8e415c4271c0be334aad662d4dd825edc0859029d35c5b8e905
-MD5 9fb1c05f0986b8167a47a05d8754e80b openssh-4.3_p2-r1.ebuild 5574
-RMD160 d93ae64663af5f66a255a5fc5b9bd35fbae57ff2 openssh-4.3_p2-r1.ebuild 5574
-SHA256 8c4d3ccfaeb3a8e415c4271c0be334aad662d4dd825edc0859029d35c5b8e905 openssh-4.3_p2-r1.ebuild 5574
-EBUILD openssh-4.3_p2-r5.ebuild 5957 RMD160 77b9c4c5c6aed23d5ab63596aa9fd76d40a2f65b SHA1 a301419eecde2a1c0f8d5bccefc860785dde703c SHA256 beb5826bd7e1fc08ddfead5d5fa2114cf653fde315cc0264219373ea480e848c
-MD5 8b4bf9176c47593391f6a25cf40ee932 openssh-4.3_p2-r5.ebuild 5957
-RMD160 77b9c4c5c6aed23d5ab63596aa9fd76d40a2f65b openssh-4.3_p2-r5.ebuild 5957
-SHA256 beb5826bd7e1fc08ddfead5d5fa2114cf653fde315cc0264219373ea480e848c openssh-4.3_p2-r5.ebuild 5957
-EBUILD openssh-4.4_p1-r6.ebuild 5448 RMD160 e623f30986463e39807708031ed6a5b5b3a37618 SHA1 bed965a7c91c10bf4e9d2cfdf428654d0009eb64 SHA256 f880a606ba5a96b3aedebdd925808cb61bfba5bad95e37a43c44608d8162edf1
-MD5 94bf4d275dca64bdd08cf3c437a9944c openssh-4.4_p1-r6.ebuild 5448
-RMD160 e623f30986463e39807708031ed6a5b5b3a37618 openssh-4.4_p1-r6.ebuild 5448
-SHA256 f880a606ba5a96b3aedebdd925808cb61bfba5bad95e37a43c44608d8162edf1 openssh-4.4_p1-r6.ebuild 5448
-EBUILD openssh-4.5_p1.ebuild 5397 RMD160 6e194f570214a11300e24705f21c48f3ce28b400 SHA1 bf295aaae96c0d6c45a8c53bfed1f634fe4c3fc1 SHA256 42c6c5557a50d56030ce9be9e96668780345298bc57e54048190a3a913e88685
-MD5 fbc1e6d7db157080d98088e37f85a1ae openssh-4.5_p1.ebuild 5397
-RMD160 6e194f570214a11300e24705f21c48f3ce28b400 openssh-4.5_p1.ebuild 5397
-SHA256 42c6c5557a50d56030ce9be9e96668780345298bc57e54048190a3a913e88685 openssh-4.5_p1.ebuild 5397
-MISC ChangeLog 35262 RMD160 8d06736bd014b82e60d3acba9283c95a8c2c1cd0 SHA1 1d071a7f34356dbabe902fea04e4c89bec600c8d SHA256 8e369cacadc668e389d79f46bdc207d21aac93b137a8285e98e94041a01295ec
-MD5 53b7641c262ac368ccd3539e41c9ac72 ChangeLog 35262
-RMD160 8d06736bd014b82e60d3acba9283c95a8c2c1cd0 ChangeLog 35262
-SHA256 8e369cacadc668e389d79f46bdc207d21aac93b137a8285e98e94041a01295ec ChangeLog 35262
+EBUILD openssh-4.3_p2-r1.ebuild 5546 RMD160 f7e7ad47da97532100e36d30b96d1166801ff048 SHA1 9a230ce3829c970a5c3c6f9b85bf047edb7fd60c SHA256 d96dc2d76b8915c4832bac798a37e4d53ef7e73b6764bc646ef0d3facd368b5f
+MD5 cafaf1c74e6f6a9a70b0a9c6be33b88c openssh-4.3_p2-r1.ebuild 5546
+RMD160 f7e7ad47da97532100e36d30b96d1166801ff048 openssh-4.3_p2-r1.ebuild 5546
+SHA256 d96dc2d76b8915c4832bac798a37e4d53ef7e73b6764bc646ef0d3facd368b5f openssh-4.3_p2-r1.ebuild 5546
+EBUILD openssh-4.3_p2-r5.ebuild 5929 RMD160 6f569096a36a49de345e4a36dc50da71e6e46b5e SHA1 93dcaf884cfbef27e42e27cd3bbb722cdf3e50f9 SHA256 f2710cebb8eed21c730b975d98b37af6f10d8a44fce41b783c2a6e2d1b6a3967
+MD5 76d5582f607c34857928e9426c824e78 openssh-4.3_p2-r5.ebuild 5929
+RMD160 6f569096a36a49de345e4a36dc50da71e6e46b5e openssh-4.3_p2-r5.ebuild 5929
+SHA256 f2710cebb8eed21c730b975d98b37af6f10d8a44fce41b783c2a6e2d1b6a3967 openssh-4.3_p2-r5.ebuild 5929
+EBUILD openssh-4.4_p1-r6.ebuild 5421 RMD160 ec6b6eb9c861f814a1b18805f3315ccab1b7be33 SHA1 886f94e655cdc4cfc15769437100ba6bc2330b5a SHA256 b49ca4b6f13e9b917e673729d9cbbe511d7964cc546417a7aa427b8486a4b669
+MD5 51264a3c25579caa0bcfabbdbccc36a8 openssh-4.4_p1-r6.ebuild 5421
+RMD160 ec6b6eb9c861f814a1b18805f3315ccab1b7be33 openssh-4.4_p1-r6.ebuild 5421
+SHA256 b49ca4b6f13e9b917e673729d9cbbe511d7964cc546417a7aa427b8486a4b669 openssh-4.4_p1-r6.ebuild 5421
+EBUILD openssh-4.5_p1.ebuild 5369 RMD160 c736a77c5f176cd8930e4b5da21378788d7709cd SHA1 a6d3430e4ed803bd2445199aaf5e7c691e6a291f SHA256 4bd9472fcb1ce59eeb153f9c74d99d4dc2d7044d508df283e172f798ca0fc05f
+MD5 6be415f696200dc0c2bcb39be59d95fa openssh-4.5_p1.ebuild 5369
+RMD160 c736a77c5f176cd8930e4b5da21378788d7709cd openssh-4.5_p1.ebuild 5369
+SHA256 4bd9472fcb1ce59eeb153f9c74d99d4dc2d7044d508df283e172f798ca0fc05f openssh-4.5_p1.ebuild 5369
+MISC ChangeLog 35567 RMD160 415286bd2d0dfc8a4442c10b6d889c865453a81a SHA1 1492bc9cf98e60957897f0b475001419ac366ef3 SHA256 18cc96129a1d5694145c7427241834ca8cda12163ed0333349716f847ee927b9
+MD5 0fd55a2e593144e98698e945c80f50b8 ChangeLog 35567
+RMD160 415286bd2d0dfc8a4442c10b6d889c865453a81a ChangeLog 35567
+SHA256 18cc96129a1d5694145c7427241834ca8cda12163ed0333349716f847ee927b9 ChangeLog 35567
 MISC metadata.xml 1287 RMD160 9be6778c10712b2613792647256f309898f52828 SHA1 38d05973334ed37cb9ee3778df3cf3b1369b6b81 SHA256 fbd731005f40dec6baf09aae0ba15a994e1ae448f4aa70ecd078db4b1a2feda3
 MD5 d536c311ded25994241e9708f293c9f7 metadata.xml 1287
 RMD160 9be6778c10712b2613792647256f309898f52828 metadata.xml 1287
@@ -250,3 +253,10 @@ SHA256 81ff3d47e3f63ad4d4c31f6208d7926654b98b6a7cf6d3b937847faae6117d0e files/di
 MD5 0ca190bda15710a44d4366729d477879 files/digest-openssh-4.5_p1 1331
 RMD160 2f6a27bb47bbd33d28287317add65fa2b947f1cd files/digest-openssh-4.5_p1 1331
 SHA256 b53182301e34ffc9004ad9c4eaff9e252567f2550c6f3df7f5a631bab9d2493d files/digest-openssh-4.5_p1 1331
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFFd9RzAiZjviIA2XgRAjs1AKCiz1QkQBpu6qgz3z6bO2WaGKWNSQCeKGac
+Vxm95D9uWAMAmgf6GspsMj0=
+=8mWs
+-----END PGP SIGNATURE-----

diff --git a/net-misc/openssh/openssh-4.3_p2-r1.ebuild b/net-misc/openssh/openssh-4.3_p2-r1.ebuild
index 5aa33d9c28c46dc829d4d6ea53074ba188275e0f..d3613b6626cd788a993b6d63bce22e80213863c4 100644 (file)
--- 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 0b8f674cf3b164c6c305e3b48b694d4a49045151..e7d5e6c53b42709b01b4b9390b4e03fd365803c8 100644 (file)
--- 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 09fe70365099442ae00cf1827191d266b8def3c4..98829823b3e79e1adc1a25be00d1f2c077336689 100644 (file)
--- 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 bc0146d453c5779470f39c3ff946a1ac494961e6..32153f6150c513488230eaeac7e09d6b32129568 100644 (file)
--- 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 )