From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 91CFD139085 for ; Sat, 7 Jan 2017 21:35:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C4733E0D58; Sat, 7 Jan 2017 21:35:16 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 90746E0D58 for ; Sat, 7 Jan 2017 21:35:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C569D3411D7 for ; Sat, 7 Jan 2017 21:35:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8E2F0253B for ; Sat, 7 Jan 2017 21:35:14 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1483824909.2b7df23399d7b274f8029aedf7df00ee69243c13.robbat2@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/openssh/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/openssh/openssh-7.3_p1-r7.ebuild net-misc/openssh/openssh-7.3_p1-r8.ebuild net-misc/openssh/openssh-7.4_p1.ebuild X-VCS-Directories: net-misc/openssh/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 2b7df23399d7b274f8029aedf7df00ee69243c13 X-VCS-Branch: master Date: Sat, 7 Jan 2017 21:35:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9cea435e-693a-4833-8806-97edb8cb9e3e X-Archives-Hash: 00796f6ad782d268436743e5e74f6d6d commit: 2b7df23399d7b274f8029aedf7df00ee69243c13 Author: Bertrand Jacquin jacquin bzh> AuthorDate: Thu Jan 5 21:40:41 2017 +0000 Commit: Robin H. Johnson gentoo 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 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" ; }