From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 21B5C138350 for ; Fri, 6 Mar 2020 07:25:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 96D6AE01B5; Fri, 6 Mar 2020 07:25:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7776FE01B5 for ; Fri, 6 Mar 2020 07:25:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 183E634EDB4 for ; Fri, 6 Mar 2020 07:25:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 990FA162 for ; Fri, 6 Mar 2020 07:25:37 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1583479533.be647df7eeea95cad901ebb25fc290d8c6071046.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/ X-VCS-Repository: repo/gentoo X-VCS-Files: mail-client/mutt/mutt-1.13.4-r1.ebuild mail-client/mutt/mutt-1.13.4.ebuild X-VCS-Directories: mail-client/mutt/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: be647df7eeea95cad901ebb25fc290d8c6071046 X-VCS-Branch: master Date: Fri, 6 Mar 2020 07:25:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7de22da5-52dc-4020-aef5-4b321096f748 X-Archives-Hash: 358a437cd3db0f3a8c7577f540b9077d commit: be647df7eeea95cad901ebb25fc290d8c6071046 Author: Fabian Groffen gentoo org> AuthorDate: Fri Mar 6 07:25:11 2020 +0000 Commit: Fabian Groffen gentoo 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 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