From b6ed1e2a15cd8b0ad5c573cbfee3576fa5ee29a4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 6 Nov 2022 21:20:35 +0000 Subject: gentoo auto-resync : 06:11:2022 - 21:20:35 --- mail-client/mutt/Manifest | 2 +- mail-client/mutt/mutt-2.2.8.ebuild | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) (limited to 'mail-client/mutt') diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest index 02de42940075..2dd27c055a0f 100644 --- a/mail-client/mutt/Manifest +++ b/mail-client/mutt/Manifest @@ -8,5 +8,5 @@ DIST mutt-gentoo-2.2.7-patches-r0.tar.xz 23180 BLAKE2B 227c160387354ec5881e9e944 DIST mutt-gentoo-2.2.8-patches-r0.tar.xz 23192 BLAKE2B f5e3baf4ae5fe54afc30f6449581646120b92cdaff6bdffbe936c65072b4dc013520fbc864d05fceefc0e3e2c6be34b01bca7aa3bdc933f14c8048d3aa886cb6 SHA512 82b31fed5e55f58a8cfa5f02b0c9ee170d66d2bfb09c0f59763c3070fd2358c265a4a0ede3b552c91f4e13c7ab7d87eadec9d2f245943a629361d8b98d8c1cbd EBUILD mutt-2.2.3.ebuild 8135 BLAKE2B 68fb82b9521a1526cbf80a35ef9523f457034ca655f28a724f763eae507b13316ff0a65df38e00cd9cb21f319d354190690f6831197f3a76e642cff6b1b6b53f SHA512 ba86d3bf6f40b0c5c3aa31d96ebccdef53a31f687880ed1a279b76bc51a15a08aec6e622a4cc678d966c9e49c4638961eb3d2025437cf008cd792f8bc7fb6c20 EBUILD mutt-2.2.7.ebuild 8141 BLAKE2B a61865e9fcfc9ca8f997c9875fa97681b15f58abc64e4578c76a77d9299b99aece6d1ca6fea6731ee7785e5f508df8a671d479d1e09552d52c9d130ed5932312 SHA512 e22c5c4053ac0d0c612a5d8329a629f11075a358f4a7160ae40f8972e92c6bd568a3e7d9bfc8101ece97d185f1490d674aa44f1a139481682ca904a2d698a721 -EBUILD mutt-2.2.8.ebuild 8128 BLAKE2B ea9e597f8d2141e9e1f827007ca5f6ccfc0e1245b604975375f04187fa3d43eefee7874f027768155a7f2cd7e0f2d4e5169b60239fca85c404e893731839434f SHA512 0b0158ec15ebcc942c67019d49e3f4aab702077da122237fe31b40288e7c800fc5d8dc2dccaec928f5718ec162e957725a8b335bca31db1033992a8557fd2fdd +EBUILD mutt-2.2.8.ebuild 8447 BLAKE2B e3050b67cfba3c215dd420208f76cbc2744ff8de59e37b83cbafba909372e1e3986e80d833eec9107905ba61cf57384c97931e86ee15f3456dc2e6b61ccfa4d8 SHA512 10a9421885ad635b091779b3fd1890e7d9a3e669976424c09763f9ed44e16f686517cf1781386e42b7b6beb5f8f6bff9d2aca5cce2cca51ec6ba1b9cd01085ed MISC metadata.xml 1413 BLAKE2B b48f350744607d739c38cc54e42abce66e485f1f65fafaa5f4a668f07da70fff0f917f1d67cab621c9e267052fdb958476292fe5222738e7bca59502f560078c SHA512 c9b4c3a9ac62c04be1ef8dc894754334f35fb79d6365360212805e9f9f2c2dca18e1d03c76bb887e81b4fbb2199fdf8fe4341ebc2059f5961184562ee549df65 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 -- cgit v1.2.3