[gentoo-commits] repo/gentoo:master commit in: net-misc/openssh/

[Richard Farina]

commit:     19cf898d8015af6347040689b837dc848c7dd260
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 13 02:34:57 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Sun Sep 13 02:34:57 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19cf898d

net-misc/openssh: revert improper 4411ff42539dc7917a8db314327c6fbe699a616f

Package-Manager: portage-2.2.20.1

 net-misc/openssh/openssh-6.9_p1-r2.ebuild | 3 +--
 net-misc/openssh/openssh-7.0_p1.ebuild    | 3 +--
 net-misc/openssh/openssh-7.1_p1.ebuild    | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/net-misc/openssh/openssh-6.9_p1-r2.ebuild 
b/net-misc/openssh/openssh-6.9_p1-r2.ebuild
index e80d708..ead3926 100644
--- a/net-misc/openssh/openssh-6.9_p1-r2.ebuild
+++ b/net-misc/openssh/openssh-6.9_p1-r2.ebuild
@@ -48,8 +48,7 @@ LIB_DEPEND="
        selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
        skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] )
        ssl? (
-               !bindist? ( >=dev-libs/openssl-0.9.8f:0[-bindist] )
-               bindist? ( >=dev-libs/openssl-0.9.8f:0 )
+               >=dev-libs/openssl-0.9.8f:0[bindist=]
                dev-libs/openssl[static-libs(+)]
        )
        >=sys-libs/zlib-1.2.3[static-libs(+)]"

diff --git a/net-misc/openssh/openssh-7.0_p1.ebuild 
b/net-misc/openssh/openssh-7.0_p1.ebuild
index 702e196..7a71f85 100644
--- a/net-misc/openssh/openssh-7.0_p1.ebuild
+++ b/net-misc/openssh/openssh-7.0_p1.ebuild
@@ -48,8 +48,7 @@ LIB_DEPEND="
        selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
        skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] )
        ssl? (
-               !bindist? ( >=dev-libs/openssl-0.9.8f:0[-bindist] )
-               bindist? ( >=dev-libs/openssl-0.9.8f:0 )
+               >=dev-libs/openssl-0.9.8f:0[bindist=]
                dev-libs/openssl[static-libs(+)]
        )
        >=sys-libs/zlib-1.2.3[static-libs(+)]"

diff --git a/net-misc/openssh/openssh-7.1_p1.ebuild 
b/net-misc/openssh/openssh-7.1_p1.ebuild
index 2614574..5c7f373 100644
--- a/net-misc/openssh/openssh-7.1_p1.ebuild
+++ b/net-misc/openssh/openssh-7.1_p1.ebuild
@@ -48,8 +48,7 @@ LIB_DEPEND="
        selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
        skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] )
        ssl? (
-               !bindist? ( >=dev-libs/openssl-0.9.8f:0[-bindist] )
-               bindist? ( >=dev-libs/openssl-0.9.8f:0 )
+               >=dev-libs/openssl-0.9.8f:0[bindist=]
                dev-libs/openssl[static-libs(+)]
        )
        >=sys-libs/zlib-1.2.3[static-libs(+)]"