From 7d47c8fd0679cdda919da4931076ac74a43338a5 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 14 Jan 2016 15:23:46 -0500 Subject: [PATCH] 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 584f3848d12d..40ee3c8aa5ef 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 69c064d05189..07f0e7fcf6d6 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%.*} -- 2.26.2