mail-mta/netqmail: fix build without ssl

Closes: https://bugs.gentoo.org/649854
Closes: https://bugs.gentoo.org/674688
Signed-off-by: Rolf Eike Beer <eike@sf-mail.de>
Closes: https://github.com/gentoo/gentoo/pull/12630
Signed-off-by: Joonas Niilola <juippis@gentoo.org>

diff --git a/mail-mta/netqmail/netqmail-1.06-r4.ebuild b/mail-mta/netqmail/netqmail-1.06-r4.ebuild
index 1f750f0f171729bf462921fe396939850583f3fa..aa64d3d57d5e1e412476e4f8eb90e332501294b6 100644 (file)
--- a/mail-mta/netqmail/netqmail-1.06-r4.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r4.ebuild
@@ -101,12 +101,14 @@ src_prepare() {
        ht_fix_file Makefile*
 
        if ! use vanilla; then
-               # This patch contains relative paths and needs to be cleaned up.
-               sed 's~^--- ../../~--- ~g' \
-                       <"${DISTDIR}"/${QMAIL_TLS_F} \
-                       >"${T}"/${QMAIL_TLS_F} || die
-               use ssl        && epatch "${T}"/${QMAIL_TLS_F}
-               use ssl        && epatch "${DISTDIR}"/${QMAIL_TLS_CVE}
+               if use ssl; then
+                       # This patch contains relative paths and needs to be cleaned up.
+                       sed 's~^--- ../../~--- ~g' \
+                               < "${DISTDIR}"/${QMAIL_TLS_F} \
+                               > "${T}"/${QMAIL_TLS_F} || die
+                       epatch "${T}"/${QMAIL_TLS_F}
+                       epatch "${DISTDIR}"/${QMAIL_TLS_CVE}
+               fi
                use highvolume && epatch "${DISTDIR}"/${QMAIL_BIGTODO_F}
 
                if use qmail-spp; then

diff --git a/mail-mta/netqmail/netqmail-1.06-r5.ebuild b/mail-mta/netqmail/netqmail-1.06-r5.ebuild
index 31387c27673a02ec6bd144988d7612bde8f193da..f6f4cfb3deecf6ddfe1449777d2bb8fe3f7008d2 100644 (file)
--- a/mail-mta/netqmail/netqmail-1.06-r5.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r5.ebuild
@@ -105,12 +105,14 @@ src_prepare() {
        ht_fix_file Makefile*
 
        if ! use vanilla; then
-               # This patch contains relative paths and needs to be cleaned up.
-               sed 's~^--- ../../~--- ~g' \
-                       <"${DISTDIR}"/${QMAIL_TLS_F} \
-                       >"${T}"/${QMAIL_TLS_F} || die
-               use ssl        && epatch "${T}"/${QMAIL_TLS_F}
-               use ssl        && epatch "${DISTDIR}"/${QMAIL_TLS_CVE}
+               if use ssl; then
+                       # This patch contains relative paths and needs to be cleaned up.
+                       sed 's~^--- ../../~--- ~g' \
+                               < "${DISTDIR}"/${QMAIL_TLS_F} \
+                               > "${T}"/${QMAIL_TLS_F} || die
+                       epatch "${T}"/${QMAIL_TLS_F}
+                       epatch "${DISTDIR}"/${QMAIL_TLS_CVE}
+               fi
                use highvolume && epatch "${DISTDIR}"/${QMAIL_BIGTODO_F}
 
                if use qmail-spp; then
@@ -127,7 +129,7 @@ src_prepare() {
 
        cd "${WORKDIR}" || die
        epatch "${FILESDIR}"/use-new-path-for-functions.sh.patch
-       epatch "${FILESDIR}"/qmail-smtputf8.patch
+       use ssl && epatch "${FILESDIR}"/qmail-smtputf8.patch
        cd - || die
 
        qmail_src_postunpack

diff --git a/mail-mta/netqmail/netqmail-1.06-r6.ebuild b/mail-mta/netqmail/netqmail-1.06-r6.ebuild
index ea0d2b7b10ce7f445f4ea6b361c9a762a19719b3..f78baf94aacbc5c40fa25f836e114f4a61e4a0ec 100644 (file)
--- a/mail-mta/netqmail/netqmail-1.06-r6.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r6.ebuild
@@ -105,12 +105,14 @@ src_prepare() {
        ht_fix_file Makefile*
 
        if ! use vanilla; then
-               # This patch contains relative paths and needs to be cleaned up.
-               sed 's~^--- ../../~--- ~g' \
-                       <"${DISTDIR}"/${QMAIL_TLS_F} \
-                       >"${T}"/${QMAIL_TLS_F} || die
-               use ssl        && epatch "${T}"/${QMAIL_TLS_F}
-               use ssl        && epatch "${DISTDIR}"/${QMAIL_TLS_CVE}
+               if use ssl; then
+                       # This patch contains relative paths and needs to be cleaned up.
+                       sed 's~^--- ../../~--- ~g' \
+                               < "${DISTDIR}"/${QMAIL_TLS_F} \
+                               > "${T}"/${QMAIL_TLS_F} || die
+                       epatch "${T}"/${QMAIL_TLS_F}
+                       epatch "${DISTDIR}"/${QMAIL_TLS_CVE}
+               fi
                use highvolume && epatch "${DISTDIR}"/${QMAIL_BIGTODO_F}
 
                if use qmail-spp; then
@@ -127,7 +129,7 @@ src_prepare() {
 
        cd "${WORKDIR}" || die
        epatch "${FILESDIR}"/use-new-path-for-functions.sh.patch
-       epatch "${FILESDIR}"/qmail-smtputf8.patch
+       use ssl && epatch "${FILESDIR}"/qmail-smtputf8.patch
        cd - || die
 
        qmail_src_postunpack