From 8c3963bfb197ed371f535dccfcae6004888b2f9c Mon Sep 17 00:00:00 2001 From: Rolf Eike Beer Date: Thu, 19 Sep 2019 21:04:30 +0200 Subject: [PATCH] mail-mta/netqmail: clean up ebuild and patch Signed-off-by: Rolf Eike Beer Closes: https://github.com/gentoo/gentoo/pull/12975 Signed-off-by: Joonas Niilola --- mail-mta/netqmail/files/1.06-fbsd-utmpx.patch | 4 ++-- mail-mta/netqmail/netqmail-1.06-r6.ebuild | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/mail-mta/netqmail/files/1.06-fbsd-utmpx.patch b/mail-mta/netqmail/files/1.06-fbsd-utmpx.patch index 8500eb53e3ee..0307a0d19412 100644 --- a/mail-mta/netqmail/files/1.06-fbsd-utmpx.patch +++ b/mail-mta/netqmail/files/1.06-fbsd-utmpx.patch @@ -1,5 +1,5 @@ ---- qbiff.c.orig 2010-04-06 08:43:28.000000000 -0300 -+++ qbiff.c 2010-04-06 08:44:35.000000000 -0300 +--- a/qbiff.c 2010-04-06 08:43:28.000000000 -0300 ++++ b/qbiff.c 2010-04-06 08:44:35.000000000 -0300 @@ -1,13 +1,6 @@ #include #include diff --git a/mail-mta/netqmail/netqmail-1.06-r6.ebuild b/mail-mta/netqmail/netqmail-1.06-r6.ebuild index f58a3c0abad7..ccdc0866b463 100644 --- a/mail-mta/netqmail/netqmail-1.06-r6.ebuild +++ b/mail-mta/netqmail/netqmail-1.06-r6.ebuild @@ -28,12 +28,14 @@ HOMEPAGE=" SRC_URI="mirror://qmail/${P}.tar.gz https://dev.gentoo.org/~hollow/distfiles/${GENQMAIL_F} https://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS} - http://inoa.net/qmail-tls/${QMAIL_TLS_CVE} - http://arnt.gulbrandsen.priv.no/qmail/qmail-smtputf8.patch !vanilla? ( highvolume? ( mirror://qmail/${QMAIL_BIGTODO_F} ) qmail-spp? ( mirror://sourceforge/qmail-spp/${QMAIL_SPP_F} ) - ssl? ( https://mirror.alexh.name/qmail/netqmail/${QMAIL_TLS_F} ) + ssl? ( + https://mirror.alexh.name/qmail/netqmail/${QMAIL_TLS_F} + http://inoa.net/qmail-tls/${QMAIL_TLS_CVE} + https://arnt.gulbrandsen.priv.no/qmail/qmail-smtputf8.patch + ) ) " @@ -81,7 +83,7 @@ pkg_setup() { eerror eerror "The QMAIL_PATCH_DIR variable for custom patches" eerror "has been removed from ${PN}. If you need custom patches" - eerror "you should create a copy of this ebuild in an overlay." + eerror "see 'user patches' in the portage manual." eerror die "QMAIL_PATCH_DIR is not supported anymore" fi -- 2.26.2