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

[Robin H. Johnson]

commit:     2b7df23399d7b274f8029aedf7df00ee69243c13
Author:     Bertrand Jacquin <bertrand <AT> jacquin <DOT> bzh>
AuthorDate: Thu Jan  5 21:40:41 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Jan  7 21:35:09 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b7df233

net-misc/openssh: Use pkg_pretend() to detect earlier unsupported features

Package-Manager: portage-2.3.0
(cherry picked from commit 4862b9b82b4722272da4639999f757d733d67335)
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 net-misc/openssh/openssh-7.3_p1-r7.ebuild | 4 ++--
 net-misc/openssh/openssh-7.3_p1-r8.ebuild | 4 ++--
 net-misc/openssh/openssh-7.4_p1.ebuild    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/net-misc/openssh/openssh-7.3_p1-r7.ebuild 
b/net-misc/openssh/openssh-7.3_p1-r7.ebuild
index 0f8d774..6c9b324 100644
--- a/net-misc/openssh/openssh-7.3_p1-r7.ebuild
+++ b/net-misc/openssh/openssh-7.3_p1-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -76,7 +76,7 @@ RDEPEND="${RDEPEND}
 
 S=${WORKDIR}/${PARCH}
 
-pkg_setup() {
+pkg_pretend() {
        # this sucks, but i'd rather have people unable to `emerge -u openssh`
        # than not be able to log in to their server any more
        maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; }

diff --git a/net-misc/openssh/openssh-7.3_p1-r8.ebuild 
b/net-misc/openssh/openssh-7.3_p1-r8.ebuild
index f886839..164f4e1 100644
--- a/net-misc/openssh/openssh-7.3_p1-r8.ebuild
+++ b/net-misc/openssh/openssh-7.3_p1-r8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -71,7 +71,7 @@ RDEPEND="${RDEPEND}
 
 S=${WORKDIR}/${PARCH}
 
-pkg_setup() {
+pkg_pretend() {
        # this sucks, but i'd rather have people unable to `emerge -u openssh`
        # than not be able to log in to their server any more
        maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; }

diff --git a/net-misc/openssh/openssh-7.4_p1.ebuild 
b/net-misc/openssh/openssh-7.4_p1.ebuild
index 110f1bf..4f6efad 100644
--- a/net-misc/openssh/openssh-7.4_p1.ebuild
+++ b/net-misc/openssh/openssh-7.4_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -70,7 +70,7 @@ RDEPEND="${RDEPEND}
 
 S=${WORKDIR}/${PARCH}
 
-pkg_setup() {
+pkg_pretend() {
        # this sucks, but i'd rather have people unable to `emerge -u openssh`
        # than not be able to log in to their server any more
        maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; }