From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B9CBD1388BF for ; Thu, 14 Jan 2016 20:59:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DF227E07D6; Thu, 14 Jan 2016 20:59:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7D0C8E07D6 for ; Thu, 14 Jan 2016 20:59:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 492FC3408B8 for ; Thu, 14 Jan 2016 20:59:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 60C50A91 for ; Thu, 14 Jan 2016 20:59:46 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1452805171.7d47c8fd0679cdda919da4931076ac74a43338a5.vapier@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.1_p1-r2.ebuild net-misc/openssh/openssh-7.1_p1-r3.ebuild X-VCS-Directories: net-misc/openssh/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 7d47c8fd0679cdda919da4931076ac74a43338a5 X-VCS-Branch: master Date: Thu, 14 Jan 2016 20:59:46 +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: 5dc1d172-a02e-4d72-af8e-bbb273df1ce5 X-Archives-Hash: 2cbf2333106c85c1d66e1807c5279955 commit: 7d47c8fd0679cdda919da4931076ac74a43338a5 Author: Mike Frysinger gentoo org> AuthorDate: Thu Jan 14 20:23:46 2016 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Thu Jan 14 20:59:31 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d47c8fd net-misc/openssh: fix patch failures when USE="-hpn X509" net-misc/openssh/openssh-7.1_p1-r2.ebuild | 8 +++++--- net-misc/openssh/openssh-7.1_p1-r3.ebuild | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/net-misc/openssh/openssh-7.1_p1-r2.ebuild b/net-misc/openssh/openssh-7.1_p1-r2.ebuild index 584f384..40ee3c8 100644 --- a/net-misc/openssh/openssh-7.1_p1-r2.ebuild +++ b/net-misc/openssh/openssh-7.1_p1-r2.ebuild @@ -116,9 +116,11 @@ src_prepare() { if use X509 ; then pushd .. >/dev/null - pushd ${HPN_PATCH%.*.*} >/dev/null - epatch "${FILESDIR}"/${PN}-7.1_p1-hpn-x509-glue.patch - popd >/dev/null + if use hpn ; then + pushd ${HPN_PATCH%.*.*} >/dev/null + epatch "${FILESDIR}"/${PN}-7.1_p1-hpn-x509-glue.patch + popd >/dev/null + fi epatch "${FILESDIR}"/${PN}-7.0_p1-sctp-x509-glue.patch popd >/dev/null epatch "${WORKDIR}"/${X509_PATCH%.*} diff --git a/net-misc/openssh/openssh-7.1_p1-r3.ebuild b/net-misc/openssh/openssh-7.1_p1-r3.ebuild index 69c064d..07f0e7f 100644 --- a/net-misc/openssh/openssh-7.1_p1-r3.ebuild +++ b/net-misc/openssh/openssh-7.1_p1-r3.ebuild @@ -115,9 +115,11 @@ src_prepare() { if use X509 ; then pushd .. >/dev/null - pushd ${HPN_PATCH%.*.*} >/dev/null - epatch "${FILESDIR}"/${PN}-7.1_p1-hpn-x509-glue.patch - popd >/dev/null + if use hpn ; then + pushd ${HPN_PATCH%.*.*} >/dev/null + epatch "${FILESDIR}"/${PN}-7.1_p1-hpn-x509-glue.patch + popd >/dev/null + fi epatch "${FILESDIR}"/${PN}-7.0_p1-sctp-x509-glue.patch popd >/dev/null epatch "${WORKDIR}"/${X509_PATCH%.*}