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

[Fabian Groffen]

commit:     be647df7eeea95cad901ebb25fc290d8c6071046
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  6 07:25:11 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Mar  6 07:25:33 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be647df7

mail-client/mutt-1.13.4-r1: provide mandatory atachments settings

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

 .../mutt/{mutt-1.13.4.ebuild => mutt-1.13.4-r1.ebuild}       | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/mail-client/mutt/mutt-1.13.4.ebuild b/mail-client/mutt/mutt-1.13.4-r1.ebuild
similarity index 95%
rename from mail-client/mutt/mutt-1.13.4.ebuild
rename to mail-client/mutt/mutt-1.13.4-r1.ebuild
index f67a122ec25..bf80a3ff6d2 100644
--- a/mail-client/mutt/mutt-1.13.4.ebuild
+++ b/mail-client/mutt/mutt-1.13.4-r1.ebuild
@@ -198,14 +198,22 @@ src_configure() {
 
 src_install() {
 	emake DESTDIR="${D}" install
+	insinto /etc/${PN}
 	if use mbox; then
-		insinto /etc/mutt
 		newins "${FILESDIR}"/Muttrc.mbox Muttrc
 	else
-		insinto /etc/mutt
 		doins "${FILESDIR}"/Muttrc
 	fi
 
+	# include attachment settings, it's mandatory and shouldn't harm
+	# when not being referenced (index_format using %X)
+	{
+		echo
+		echo "# mandatory attachments settings, not setting these is a BUG!"
+		echo "# see https://marc.info/?l=mutt-dev&m=158347284923517&w=2"
+		grep '^attachments' "${ED}"/etc/${PN}/Muttrc.dist
+	} >> "${ED}"/etc/${PN}/Muttrc
+
 	# A newer file is provided by app-misc/mime-types. So we link it.
 	rm "${ED}"/etc/${PN}/mime.types
 	dosym ../mime.types /etc/${PN}/mime.types