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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0ECF1158020 for ; Sun, 6 Nov 2022 19:46:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D8B82E0984; Sun, 6 Nov 2022 19:46:17 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 71641E0984 for ; Sun, 6 Nov 2022 19:46:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4791C3407AF for ; Sun, 6 Nov 2022 19:46:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A9300622 for ; Sun, 6 Nov 2022 19:46:14 +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: <1667763967.dc2cc4dce10d100fd26137232983645097008367.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-2.2.8.ebuild X-VCS-Directories: mail-client/mutt/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: dc2cc4dce10d100fd26137232983645097008367 X-VCS-Branch: master Date: Sun, 6 Nov 2022 19:46:14 +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: 6bb36eef-47fa-4d1b-95ff-8c61eb8c73cb X-Archives-Hash: 19aed93efb5dbbcce191466ac7aa2a98 commit: dc2cc4dce10d100fd26137232983645097008367 Author: Fabian Groffen gentoo org> AuthorDate: Sun Nov 6 19:43:47 2022 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sun Nov 6 19:46:07 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc2cc4dc mail-client/mutt-2.2.8: drop userpatches, avoid command not found - eapply_user doesn't have a return-code that indicates user patches were applied, so don't falsely report we did - drop usage of commands that we don't have installed to avoid false-positives #864753 Closes: https://bugs.gentoo.org/864753 Signed-off-by: Fabian Groffen gentoo.org> mail-client/mutt/mutt-2.2.8.ebuild | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/mail-client/mutt/mutt-2.2.8.ebuild b/mail-client/mutt/mutt-2.2.8.ebuild index 06bb916b3761..2f770033de52 100644 --- a/mail-client/mutt/mutt-2.2.8.ebuild +++ b/mail-client/mutt/mutt-2.2.8.ebuild @@ -99,16 +99,27 @@ src_prepare() { main.c || die "Failed to add bug instructions" fi - local upatches= # allow user patches - eapply_user && upatches=" with user patches" + eapply_user # patch version string for bug reports local patchset= use vanilla || patchset=", ${PATCHSET}" - sed -i -e 's|"Mutt %s (%s)"|"Mutt %s (%s'"${patchset}${upatches}"')"|' \ + sed -i -e 's|"Mutt %s (%s)"|"Mutt %s (%s'"${patchset}"')"|' \ muttlib.c || die "failed patching in Gentoo version" + # bug 864753: avoid warning about missing tools, currently the order + # is lynx, w3m, elinks, so remove lynx or w3m when not installed, + # elinks should be there via dep. + if use doc ; then + if ! has_version www-client/lynx ; then + sed -i -e '/lynx/d' doc/Makefile.am || die + fi + if ! has_version www-client/w3m ; then + sed -i -e '/w3m/d' doc/Makefile.am || die + fi + fi + # many patches touch the buildsystem, we always need this AT_M4DIR="m4" eautoreconf