net-misc/openssh: fix patch failures when USE="-hpn X509"

diff --git a/net-misc/openssh/openssh-7.1_p1-r2.ebuild b/net-misc/openssh/openssh-7.1_p1-r2.ebuild
index 584f3848d12d45e24bc4960aa7e977138e330ba4..40ee3c8aa5efdc3d0ce3f58700f84b1fecc5c016 100644 (file)
--- 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 69c064d0518902898616a900595ba305d0a68840..07f0e7fcf6d6497aa6bfd6dca8e72f78df21d05c 100644 (file)
--- 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%.*}