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

[Mike Frysinger]

commit:     7d47c8fd0679cdda919da4931076ac74a43338a5
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 14 20:23:46 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> 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%.*}