[gentoo-commits] repo/gentoo:master commit in: mail-mta/courier/, mail-mta/courier/files/

[gentoo-commits] repo/gentoo:master commit in: mail-mta/courier/, mail-mta/courier/files/

[Sam James]

commit:     a650c8a85921a0c68870ead1b2dc6bfbcbb9fd7e
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Mar  8 15:01:30 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar  8 15:12:23 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a650c8a8

mail-mta/courier: fix patching, remove unused eclass

Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://bugs.gentoo.org/774870
Closes: https://github.com/gentoo/gentoo/pull/19832
Signed-off-by: Sam James <sam <AT> gentoo.org>

 mail-mta/courier/courier-1.0.13.ebuild | 7 ++++---
 mail-mta/courier/courier-1.0.14.ebuild | 7 ++++---
 mail-mta/courier/courier-1.0.17.ebuild | 5 +++--
 mail-mta/courier/courier-1.0.5.ebuild  | 7 ++++---
 mail-mta/courier/files/norewrite.patch | 4 ++--
 5 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/mail-mta/courier/courier-1.0.13.ebuild b/mail-mta/courier/courier-1.0.13.ebuild
index 4451b6d47e0..c05f3387c09 100644
--- a/mail-mta/courier/courier-1.0.13.ebuild
+++ b/mail-mta/courier/courier-1.0.13.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit eutils flag-o-matic multilib
+
+inherit flag-o-matic multilib
 
 DESCRIPTION="An MTA designed specifically for maildirs"
 HOMEPAGE="https://www.courier-mta.org/"
@@ -65,7 +66,7 @@ PDEPEND="pam? ( net-mail/mailbase )
 	crypt? ( >=app-crypt/gnupg-1.0.4 )"
 
 src_prepare() {
-	use norewrite && epatch "${FILESDIR}/norewrite.patch"
+	use norewrite && eapply "${FILESDIR}/norewrite.patch"
 	default
 }
 

diff --git a/mail-mta/courier/courier-1.0.14.ebuild b/mail-mta/courier/courier-1.0.14.ebuild
index 7919c9f2358..795a78c203b 100644
--- a/mail-mta/courier/courier-1.0.14.ebuild
+++ b/mail-mta/courier/courier-1.0.14.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit eutils flag-o-matic multilib
+
+inherit flag-o-matic multilib
 
 DESCRIPTION="An MTA designed specifically for maildirs"
 HOMEPAGE="https://www.courier-mta.org/"
@@ -65,7 +66,7 @@ PDEPEND="pam? ( net-mail/mailbase )
 	crypt? ( >=app-crypt/gnupg-1.0.4 )"
 
 src_prepare() {
-	use norewrite && epatch "${FILESDIR}/norewrite.patch"
+	use norewrite && eapply "${FILESDIR}/norewrite.patch"
 	default
 }
 

diff --git a/mail-mta/courier/courier-1.0.17.ebuild b/mail-mta/courier/courier-1.0.17.ebuild
index 8b9ae5cab58..18202c44d22 100644
--- a/mail-mta/courier/courier-1.0.17.ebuild
+++ b/mail-mta/courier/courier-1.0.17.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit eutils flag-o-matic multilib
+
+inherit flag-o-matic multilib
 
 DESCRIPTION="An MTA designed specifically for maildirs"
 HOMEPAGE="https://www.courier-mta.org/"
@@ -65,7 +66,7 @@ PDEPEND="pam? ( net-mail/mailbase )
 	crypt? ( >=app-crypt/gnupg-1.0.4 )"
 
 src_prepare() {
-	use norewrite && epatch "${FILESDIR}/norewrite.patch"
+	use norewrite && eapply "${FILESDIR}/norewrite.patch"
 	default
 }
 

diff --git a/mail-mta/courier/courier-1.0.5.ebuild b/mail-mta/courier/courier-1.0.5.ebuild
index ce3d563a4d0..470c2a9a78f 100644
--- a/mail-mta/courier/courier-1.0.5.ebuild
+++ b/mail-mta/courier/courier-1.0.5.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit eutils flag-o-matic multilib
+
+inherit flag-o-matic multilib
 
 DESCRIPTION="An MTA designed specifically for maildirs"
 HOMEPAGE="http://www.courier-mta.org/"
@@ -65,7 +66,7 @@ PDEPEND="pam? ( net-mail/mailbase )
 	crypt? ( >=app-crypt/gnupg-1.0.4 )"
 
 src_prepare() {
-	use norewrite && epatch "${FILESDIR}/norewrite.patch"
+	use norewrite && eapply "${FILESDIR}/norewrite.patch"
 	default
 }
 

diff --git a/mail-mta/courier/files/norewrite.patch b/mail-mta/courier/files/norewrite.patch
index 8d8f5362967..9fd4224348c 100644
--- a/mail-mta/courier/files/norewrite.patch
+++ b/mail-mta/courier/files/norewrite.patch
@@ -1,5 +1,5 @@
---- courier/module.esmtp/esmtp.c.orig	2004-02-03 01:08:15.679486558 -0700
-+++ courier/module.esmtp/esmtp.c	2004-02-03 01:07:41.262697092 -0700
+--- a/courier/module.esmtp/esmtp.c	2004-02-03 01:08:15.679486558 -0700
++++ b/courier/module.esmtp/esmtp.c	2004-02-03 01:07:41.262697092 -0700
 @@ -255,6 +255,10 @@ const char *me;
  struct rfc822t	*tp;
  struct rfc822token at;