diff options
Diffstat (limited to 'mail-client/mutt')
| -rw-r--r-- | mail-client/mutt/Manifest | 4 | ||||
| -rw-r--r-- | mail-client/mutt/mutt-2.2.9.ebuild (renamed from mail-client/mutt/mutt-2.2.7.ebuild) | 19 |
2 files changed, 17 insertions, 6 deletions
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest index e5a3425e6365..fcaeb9131167 100644 --- a/mail-client/mutt/Manifest +++ b/mail-client/mutt/Manifest @@ -1,6 +1,6 @@ DIST mutt-2.2.3.tar.gz 5509344 BLAKE2B 57d9d29d009e8dce6b27277aa4df371a4b03e783fb5482dc10db20ffa393db01b1aaeaee49bf8421b048e5bb07eeff31fcc1ef84db982b58c618d396ce11e56e SHA512 47656ee1b741d0d165fde4027fc7278910e39e9d5d0bfc5c52e7e767c3373bd3755833269d256364333fd4502c67490adcd5e4b33f1141f53ad575e9fb1a5131 -DIST mutt-2.2.7.tar.gz 5522342 BLAKE2B 3cc02ec5bc46f6a3f34c87c1454bdb0198be75a5669896b72ccd780b582cb1e7a4de466c41d25d1e74ab34e177bdca8c05574eddc6302e05acb8e3be6f53438e SHA512 5bc88d3efe82db50c2756e7011831caf907adf794e4d693d1318d25deeabac6834989ddef074064252f0f1f0e7df30d6d7d895e0a1d7893696e1f5252955ba22 DIST mutt-2.2.8.tar.gz 5527187 BLAKE2B cdbb2ba8971a6f9cf6f5ee8f1e666e835d1716957d001561c67fab6381041ce5f8c994dad6e2d83f76e47f1ea12033d55b2c5f61348369c740f224d80405c0e1 SHA512 7723dffd5fb0f6f1aa1ab22e90f101d0d8b9cd4f198a3ac7ebbba7a3c00e0f2163ce03075f48a6f288a81bf621204c8d8eb247a3fb216a5f7d37686b0e8b9fb2 +DIST mutt-2.2.9.tar.gz 5526236 BLAKE2B 86b0743102bb1b023b3ccb03740c24c6ec728765b3770afdb3faed2982789aaa38a7c306e5ee30ca05ced1baa7771657ab37e5ad53eaf59ec73e51990f699c74 SHA512 d4d308ba573ba6e43b6dd2c131d0dc345163bd375f19a9038c9eeaf271f9da88043951f6c74658ff1a9d7a8fdcce28809aba50ab3f5aa0d34b77cf4989bc054f DIST mutt-gentoo-2.2.3-patches-r0.tar.xz 23168 BLAKE2B be7fad2f06b913439df4fb7a223e7305b66195153329956f4be9fdd524ac0de6121ccf9a6dc506b0b68e12759667173379c4e0ff1645c1b9948aaed1f7601033 SHA512 22edcc53a42133093eb163e4cfba2e865aec31ef87c74e35aaad10d9a4543f9d2cf477ac263da11e247eba300eb72a42870a59a8a3a90341691bdb0ee6d44d5f -DIST mutt-gentoo-2.2.7-patches-r0.tar.xz 23180 BLAKE2B 227c160387354ec5881e9e944ef76815c8466f11bc0717b2ed7b291392ad49faa8d2c3d9a6e01ccb63d2351f216c0975246b643925d97bff64abe056380b0911 SHA512 0fd9797329a31485e37bdfa76af253305198314749b6336d239ed43edbb839f189b4f0a2cbf982c2483ebb4d45118891339e16d4bd4cef18a3d5f2f7205682df DIST mutt-gentoo-2.2.8-patches-r0.tar.xz 23192 BLAKE2B f5e3baf4ae5fe54afc30f6449581646120b92cdaff6bdffbe936c65072b4dc013520fbc864d05fceefc0e3e2c6be34b01bca7aa3bdc933f14c8048d3aa886cb6 SHA512 82b31fed5e55f58a8cfa5f02b0c9ee170d66d2bfb09c0f59763c3070fd2358c265a4a0ede3b552c91f4e13c7ab7d87eadec9d2f245943a629361d8b98d8c1cbd +DIST mutt-gentoo-2.2.9-patches-r0.tar.xz 23152 BLAKE2B 7cf64577ba36bd021238a0b09b7dc8ba7b8430215b7e15baab2c078740af135025a34b259ac05da59261c49ba73d29fb884d6e89cebf30499e40c00523693d08 SHA512 3bd74829b2cef73d0341c70a4d26feffee39ae7737c75322469921c0f97a7ecdccf627c6cee7f3c6e5ccd412ebf973a3f61f0156967cbd2ddd5b9e302d47d8dd diff --git a/mail-client/mutt/mutt-2.2.7.ebuild b/mail-client/mutt/mutt-2.2.9.ebuild index 5746fe1ea28f..2f770033de52 100644 --- a/mail-client/mutt/mutt-2.2.7.ebuild +++ b/mail-client/mutt/mutt-2.2.9.ebuild @@ -3,7 +3,7 @@ EAPI="7" -inherit flag-o-matic autotools +inherit autotools PATCHREV="r0" PATCHSET="gentoo-${PVR}/${PATCHREV}" @@ -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 |