| 1 |
commit: dc2cc4dce10d100fd26137232983645097008367 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 6 19:43:47 2022 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 6 19:46:07 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc2cc4dc |
| 7 |
|
| 8 |
mail-client/mutt-2.2.8: drop userpatches, avoid command not found |
| 9 |
|
| 10 |
- eapply_user doesn't have a return-code that indicates user patches |
| 11 |
were applied, so don't falsely report we did |
| 12 |
- drop usage of commands that we don't have installed to avoid |
| 13 |
false-positives #864753 |
| 14 |
|
| 15 |
Closes: https://bugs.gentoo.org/864753 |
| 16 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 17 |
|
| 18 |
mail-client/mutt/mutt-2.2.8.ebuild | 17 ++++++++++++++--- |
| 19 |
1 file changed, 14 insertions(+), 3 deletions(-) |
| 20 |
|
| 21 |
diff --git a/mail-client/mutt/mutt-2.2.8.ebuild b/mail-client/mutt/mutt-2.2.8.ebuild |
| 22 |
index 06bb916b3761..2f770033de52 100644 |
| 23 |
--- a/mail-client/mutt/mutt-2.2.8.ebuild |
| 24 |
+++ b/mail-client/mutt/mutt-2.2.8.ebuild |
| 25 |
@@ -99,16 +99,27 @@ src_prepare() { |
| 26 |
main.c || die "Failed to add bug instructions" |
| 27 |
fi |
| 28 |
|
| 29 |
- local upatches= |
| 30 |
# allow user patches |
| 31 |
- eapply_user && upatches=" with user patches" |
| 32 |
+ eapply_user |
| 33 |
|
| 34 |
# patch version string for bug reports |
| 35 |
local patchset= |
| 36 |
use vanilla || patchset=", ${PATCHSET}" |
| 37 |
- sed -i -e 's|"Mutt %s (%s)"|"Mutt %s (%s'"${patchset}${upatches}"')"|' \ |
| 38 |
+ sed -i -e 's|"Mutt %s (%s)"|"Mutt %s (%s'"${patchset}"')"|' \ |
| 39 |
muttlib.c || die "failed patching in Gentoo version" |
| 40 |
|
| 41 |
+ # bug 864753: avoid warning about missing tools, currently the order |
| 42 |
+ # is lynx, w3m, elinks, so remove lynx or w3m when not installed, |
| 43 |
+ # elinks should be there via dep. |
| 44 |
+ if use doc ; then |
| 45 |
+ if ! has_version www-client/lynx ; then |
| 46 |
+ sed -i -e '/lynx/d' doc/Makefile.am || die |
| 47 |
+ fi |
| 48 |
+ if ! has_version www-client/w3m ; then |
| 49 |
+ sed -i -e '/w3m/d' doc/Makefile.am || die |
| 50 |
+ fi |
| 51 |
+ fi |
| 52 |
+ |
| 53 |
# many patches touch the buildsystem, we always need this |
| 54 |
AT_M4DIR="m4" eautoreconf |
Archives