[gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/

["Fabian Groffen" <grobian@gentoo.org>]

commit:     a4bcf0e7d6be95d1c34a034a7113bf1cffae19ba
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue May  4 20:07:45 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue May  4 20:08:15 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4bcf0e7

mail-client/mutt-2.0.7: version bump

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 mail-client/mutt/Manifest                                 |  4 ++--
 mail-client/mutt/{mutt-2.0.5.ebuild => mutt-2.0.7.ebuild} | 13 ++++++-------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index c0440176cab..b7d0e2cc9dc 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,6 +1,6 @@
 DIST mutt-2.0.4.tar.gz 5293913 BLAKE2B 9c5d2d17fae9653868cca08eb7d92f9c6e122702590ba88a2ba04ee8606cfba5bca99716045b59cf40a21e95a0e32f3b21a34ee34440f155a3e2788720c3d57c SHA512 8080107810d2ff572b1532bb441573e4dcfbfbc03f28be711dcdebd1e6a1c8b5adf5c5a4f386ce0a661ff7050722b41e122c58964feae665ff4138013af18762
-DIST mutt-2.0.5.tar.gz 5294710 BLAKE2B f33f4d496629c34ad4f341ecd02a1ef6b9e59b77234ca80c096acf30e189fcfbd4d8cf1182d8efcdcac8aeaab8fe0f9b4fdeb47f361a5db23da0c690ea5bf638 SHA512 41849d700b88e1b28b51fb90be2a9f6b639e8b111dce914073b66327e4655b5d4ca04dc3aedf2d44a0aa1a80ac3c4fcca6058eae7fb4f71f6b506fbe00a2a740
 DIST mutt-2.0.6.tar.gz 5294825 BLAKE2B 28891cc13b7e356308f43d3198d1c9ef64b262f3653db4cad4b8d319a02d9aba73654f0992a82f2566dd2c46e0b923b37acff4fadbf47d78112e9860b0d3d460 SHA512 dd1273cf35853b844a41db4e1405fcffdc566727e9a42eed1fc04f0640106d482ef6b213a348ce18f1fda67775265d62de0442247d88e2b1f9ce90e9c4e6e1b6
+DIST mutt-2.0.7.tar.gz 5299366 BLAKE2B 587679d3580a55084312b4bd26083c85fb1b3d07b4a08ea5e2081f475d37a0e283ecfd647555519fc6deccb4bdfdd46234ede4669a9abc6fc2cde778f76bf656 SHA512 1eb689fb9e6aa3cf0bcd0b696c25477cd04b74d8ec93404df071de6dc051e46bbad88131cdf610eb01df4789984707f3791366ae2fda28de2d2739aeb9d34e30
 DIST mutt-gentoo-2.0.4-patches-r1.tar.xz 26908 BLAKE2B b2ca74496328cd9bcc0eb843e48b99a6a066be6530228534d2d0a60223984e03dde2718116d8314f9cec0f22db0c4fa52521ed4fb95f7e153cfc7fb9f37f84a8 SHA512 7bb6617d900d1058e1d6b9fefd1d557efc669386501c281976c93c2a4c0d1a1a1de459dd39c46a257bd3f9bd64155e1c92add1421d40ed4e061f2fc26d17600a
-DIST mutt-gentoo-2.0.5-patches-r0.tar.xz 26408 BLAKE2B f0ce4b72ccc3bdf870bde2b52b6dec7a89f227533982036524e34b6e37093e419eede4fcac79fe4c0436f475ca8672f0de872b78459959b4c3e78e0628f9a67d SHA512 1db20c1e2dad6d35ca86b0d52020ad02946ebfef9fbf46341d9dcc95f16b864d026b147a9bd05992416b1b7204e4475df80603c900a5cd85efb00a071758e0fc
 DIST mutt-gentoo-2.0.6-patches-r0.tar.xz 26460 BLAKE2B 5c5f0ce53a2be28a0cc79415c07dcaf65b4e0c815c257f33604718f2402f401f5e51345bb92893d9be1eb85cf371aff90f96b72a48e05140fdee4fd384e14778 SHA512 b06b55a236347a79503ac028df9b3ccfd424ea9f4fc6c5dc2e829650f48f70f0e82cb5a992948a4d5b5df2a9f899c3af3ad65139fc68a7858fc50cc68f001732
+DIST mutt-gentoo-2.0.7-patches-r0.tar.xz 26416 BLAKE2B dd03fd2a29f4c2e8681c4413ca430b65beb2036b73fa95430f5f06e7c2948fb4e3256be89d922646731245672cb2900d6b7ce6bda16cb9306d5531064cfaf8a1 SHA512 cb72df8f6fa3436f134f66772f82ba95ebc92462cf145d21e01ad5b277f13294948c1d03c9c6671e58c655776a6112f2af065df79a56a135ab70c28b37e43334

diff --git a/mail-client/mutt/mutt-2.0.5.ebuild b/mail-client/mutt/mutt-2.0.7.ebuild
similarity index 97%
rename from mail-client/mutt/mutt-2.0.5.ebuild
rename to mail-client/mutt/mutt-2.0.7.ebuild
index a3813e61551..28cffe8c94b 100644
--- a/mail-client/mutt/mutt-2.0.5.ebuild
+++ b/mail-client/mutt/mutt-2.0.7.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit epatch flag-o-matic autotools
+inherit flag-o-matic autotools
 
 PATCHREV="r0"
 PATCHSET="gentoo-${PVR}/${PATCHREV}"
@@ -73,8 +73,6 @@ src_prepare() {
 
 	if use !vanilla ; then
 		# apply patches
-		export EPATCH_FORCE="yes"
-		export EPATCH_SUFFIX="patch"
 		# http://hg.code.sf.net/p/gentoomuttpatches/code/file/mutt-1.10
 		local patches=(
 			patches-mutt
@@ -83,12 +81,13 @@ src_prepare() {
 			features-extra
 			gentoo
 		)
-		local patchset
+		local patchset p
 		for patchset in "${patches[@]}" ; do
 			[[ -d "${PATCHDIR}/${patchset}" ]] || continue
 			einfo "Patches for ${PATCHSET} patchset ${patchset}"
-			EPATCH_SOURCE="${PATCHDIR}"/${patchset} epatch \
-				|| die "patchset ${patchset} failed"
+			for p in "${PATCHDIR}/${patchset}"/*.patch ; do
+				eapply "${p}" || die
+			done
 		done
 		# add some explanation as to why not to go upstream
 		sed -i \