mail-client/mutt: revbump with latest upstream patches, updated neomu…

…tt nntp, notmuch, added gpg-encrypt-to-self Package-Manager: portage-2.3.0
johu · Nov 17, 2016 · 87f4065 · 87f4065
1 parent 5eaffd5
commit 87f4065
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
@@ -3,4 +3,4 @@ DIST mutt-1.5.23.tar.gz 3782032 SHA256 3af0701e57b9e1880ed3a0dee34498a228939e854
 DIST mutt-1.5.24-gentoo-patches-r1.tar.bz2 118546 SHA256 411ad728404f4e7743b82bb79020776ce5bdf614772c387b15992e14f7c444d2 SHA512 c19e6627683b91119bbbfcd5b3250cb3fb79ff9d62b45861002c50ac232f65447744313921fe10a517efb9cb93f5638615d5b8ce1dd946fab3083bd9eaffefc1 WHIRLPOOL cbd1a3858e3b187117e26718066a2f2dd9c690aca3a77b050142d12b96599adada1a8a723b91b000f9eda92d9ceed284a1ac5cdd243de8085a233f01fac003d7
 DIST mutt-1.5.24.tar.gz 3897115 SHA256 a292ca765ed7b19db4ac495938a3ef808a16193b7d623d65562bb8feb2b42200 SHA512 f7fe7edf9d1701a8e92761b1f5e6ef2e3a3b513af7898872cbe36a8800714cb76945788a60d2008820c57bc5344a4147e2686f690da42cfc8a912e3a432452b1 WHIRLPOOL 35408cabab100e688f8c6d0d598f79144b7c72fb31f41a720acb9a6381e7ca94d66e640fe1178b911cfb16dfde4c982362c4c78ea203aef3a3dbcba09dcdc023
 DIST mutt-1.7.1.tar.gz 4025008 SHA256 e9c6f88e83d48690033f0d862a70293ac746286b77241554f5448bc23bd0d6df SHA512 c0b0be7ba792ecf42bb63c31aa03889b4998474a7cac9a839df3041b0bb72766da140bbb38e70eab5f78f4503d684c9c20620c599c0970ec6933624d22f4613d WHIRLPOOL f63a8e8fd0a403f596c041f2afc8e73db7a0b6ba48749e3cdc6663aae9f114589056cc3ddef7dc5c9e1a9282b607e4f76445ecdc6213cc3a337f8cf2284ba2e5
-DIST mutt-gentoo-1.7.1-patches-r3.tar.xz 154292 SHA256 0f00b28c348af09900228a867d38b6b0c9496717657a67776e6dcaaa4299e33b SHA512 7017687c6c71387265f49a6f65b84b402baf8c980f6e6af3b2bb7ba7cb57e2d06bf9320415d93131c49ab6228722ba3b6244579435204dc7c0872eed6d5713fe WHIRLPOOL 88d22145c2cdfa483741d04d3c83986419eb0a6edfcee7ac0e0365fe65977cfa06d62154b91d85e7bb8e16c22c8f1d38ebfa1dfd2a05ca0ba426e3cdc4ff1696
+DIST mutt-gentoo-1.7.1-patches-r4.tar.xz 144620 SHA256 553d678cd671c66873a3ac822895c0a19e872b764dd62e374d5d1f68a9889e05 SHA512 12a66340e6c6512689a5e39acb490bdaaca411b84aec2d2a7feaa4301474ee56f55e27a476c7c14de060f72671477ac129e2817938d53da71162cc55667b215e WHIRLPOOL dcc12f658babfb398f518000f8b8195d0f2fce090914490bccba2d813eb1f5fd7bd5d4b26fe6c9480b20a4778478695072eeb174534e31ee729e77fe821b2e2e
diff --git a/mail-client/mutt/mutt-1.7.1-r3.ebuild → mail-client/mutt/mutt-1.7.1-r4.ebuild b/mail-client/mutt/mutt-1.7.1-r3.ebuild → mail-client/mutt/mutt-1.7.1-r4.ebuild
@@ -6,7 +6,7 @@ EAPI="6"
 
 inherit eutils flag-o-matic autotools
 
-PATCHREV="r3"
+PATCHREV="r4"
 PATCHSET="gentoo-${PVR}/${PATCHREV}"
 
 DESCRIPTION="A small but very powerful text-based mail client"
@@ -105,8 +105,8 @@ src_prepare() {
 		done
 		# add some explanation as to why not to go upstream
 		sed -i \
-			-e '/ReachingUs = N_(/a\"This release of Mutt is heavily enriched with patches.\\nFor this reason, any bugs are better reported at https://bugs.gentoo.org/\\nor re-emerge with USE=vanilla and try to reproduce your problem.\\n"' \
-			version.c || die "Failed to add bug instructions"
+			-e '/ReachingUs = N_(/aThis release of Mutt is heavily enriched with patches.\\nFor this reason, any bugs are better reported at https://bugs.gentoo.org/\\nor re-emerge with USE=vanilla and try to reproduce your problem.\\n\\' \
+			main.c || die "Failed to add bug instructions"
 	fi
 
 	local upatches=