diff options
Diffstat (limited to 'mail-client/mutt')
-rw-r--r-- | mail-client/mutt/Manifest | 10 | ||||
-rw-r--r-- | mail-client/mutt/mutt-2.0.4-r1.ebuild | 9 | ||||
-rw-r--r-- | mail-client/mutt/mutt-2.0.6.ebuild | 9 | ||||
-rw-r--r-- | mail-client/mutt/mutt-2.0.7.ebuild (renamed from mail-client/mutt/mutt-2.0.5.ebuild) | 22 |
4 files changed, 20 insertions, 30 deletions
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest index 38270f23c7d5..bf906282fb99 100644 --- a/mail-client/mutt/Manifest +++ b/mail-client/mutt/Manifest @@ -1,12 +1,12 @@ AUX Muttrc 667 BLAKE2B 49aaefba7ceeefde9d727ad88574fc599a48bcd334ac8e99d8d5e555f2317f4595c480f1903df4b82854bfd272b8aee86a02369769f38a3cadf35f6a6348bf14 SHA512 b64d6e857f0c7de2e2e5b23cecd869f8a9807aa827ad6221e3c5864b2a31fb0136aeaf09ffdb2549645507fe92f724774a80395b6ab2345068903f5ee1269f29 AUX Muttrc.mbox 486 BLAKE2B dd7f15b08f185800b2a7d26545e5a1b0f7b21f8f7cff2b4fce39fb58d8e336bec6fd500b88c0b14d026c9578d12cd1e4bca45c0d2f3d286d2c9d132b2b5e137e SHA512 aece9a734d292b6f638d2a0dd39f20d9894b4bb6e6888da606a49274faef9c1864e98eec907ffa7742af58d46456e46b8945d2d47c8b89fc95daa2a8833d3e90 DIST mutt-2.0.4.tar.gz 5293913 BLAKE2B 9c5d2d17fae9653868cca08eb7d92f9c6e122702590ba88a2ba04ee8606cfba5bca99716045b59cf40a21e95a0e32f3b21a34ee34440f155a3e2788720c3d57c SHA512 8080107810d2ff572b1532bb441573e4dcfbfbc03f28be711dcdebd1e6a1c8b5adf5c5a4f386ce0a661ff7050722b41e122c58964feae665ff4138013af18762 -DIST mutt-2.0.5.tar.gz 5294710 BLAKE2B f33f4d496629c34ad4f341ecd02a1ef6b9e59b77234ca80c096acf30e189fcfbd4d8cf1182d8efcdcac8aeaab8fe0f9b4fdeb47f361a5db23da0c690ea5bf638 SHA512 41849d700b88e1b28b51fb90be2a9f6b639e8b111dce914073b66327e4655b5d4ca04dc3aedf2d44a0aa1a80ac3c4fcca6058eae7fb4f71f6b506fbe00a2a740 DIST mutt-2.0.6.tar.gz 5294825 BLAKE2B 28891cc13b7e356308f43d3198d1c9ef64b262f3653db4cad4b8d319a02d9aba73654f0992a82f2566dd2c46e0b923b37acff4fadbf47d78112e9860b0d3d460 SHA512 dd1273cf35853b844a41db4e1405fcffdc566727e9a42eed1fc04f0640106d482ef6b213a348ce18f1fda67775265d62de0442247d88e2b1f9ce90e9c4e6e1b6 +DIST mutt-2.0.7.tar.gz 5299366 BLAKE2B 587679d3580a55084312b4bd26083c85fb1b3d07b4a08ea5e2081f475d37a0e283ecfd647555519fc6deccb4bdfdd46234ede4669a9abc6fc2cde778f76bf656 SHA512 1eb689fb9e6aa3cf0bcd0b696c25477cd04b74d8ec93404df071de6dc051e46bbad88131cdf610eb01df4789984707f3791366ae2fda28de2d2739aeb9d34e30 DIST mutt-gentoo-2.0.4-patches-r1.tar.xz 26908 BLAKE2B b2ca74496328cd9bcc0eb843e48b99a6a066be6530228534d2d0a60223984e03dde2718116d8314f9cec0f22db0c4fa52521ed4fb95f7e153cfc7fb9f37f84a8 SHA512 7bb6617d900d1058e1d6b9fefd1d557efc669386501c281976c93c2a4c0d1a1a1de459dd39c46a257bd3f9bd64155e1c92add1421d40ed4e061f2fc26d17600a -DIST mutt-gentoo-2.0.5-patches-r0.tar.xz 26408 BLAKE2B f0ce4b72ccc3bdf870bde2b52b6dec7a89f227533982036524e34b6e37093e419eede4fcac79fe4c0436f475ca8672f0de872b78459959b4c3e78e0628f9a67d SHA512 1db20c1e2dad6d35ca86b0d52020ad02946ebfef9fbf46341d9dcc95f16b864d026b147a9bd05992416b1b7204e4475df80603c900a5cd85efb00a071758e0fc DIST mutt-gentoo-2.0.6-patches-r0.tar.xz 26460 BLAKE2B 5c5f0ce53a2be28a0cc79415c07dcaf65b4e0c815c257f33604718f2402f401f5e51345bb92893d9be1eb85cf371aff90f96b72a48e05140fdee4fd384e14778 SHA512 b06b55a236347a79503ac028df9b3ccfd424ea9f4fc6c5dc2e829650f48f70f0e82cb5a992948a4d5b5df2a9f899c3af3ad65139fc68a7858fc50cc68f001732 -EBUILD mutt-2.0.4-r1.ebuild 8030 BLAKE2B ae525423b71428546f25868d8f0080ec897159cc9436613c7ae938c31b92896f4aa7763d440c71d0ee598acd4e6f0fca57e83338056bc80cfc02e064c479922e SHA512 ed9ac2b8d094a63011f390009fdf04417ea94633311690d644eb395f16e2ef4f30490138591f81c2a96753c398e4bc6903ba7a1599e556c2456df66fbb87b4cf -EBUILD mutt-2.0.5.ebuild 8036 BLAKE2B 9321ce07a80f4c548899faef0c588cfdd713a8c016afd7c2ba6dfc1408b6a3932ae86de642a4eac0ff19a21353d3625c0a449cb3f703ebcfa450408b310fa082 SHA512 9edf2f16258cb3d87461098ccd01b14906d21138674746f8d2a2ca4a86237818c7bbf3c40b6d6be0c84204a104056795b5e6db120e2a84921184939f9f5bf2ee -EBUILD mutt-2.0.6.ebuild 8036 BLAKE2B 9321ce07a80f4c548899faef0c588cfdd713a8c016afd7c2ba6dfc1408b6a3932ae86de642a4eac0ff19a21353d3625c0a449cb3f703ebcfa450408b310fa082 SHA512 9edf2f16258cb3d87461098ccd01b14906d21138674746f8d2a2ca4a86237818c7bbf3c40b6d6be0c84204a104056795b5e6db120e2a84921184939f9f5bf2ee +DIST mutt-gentoo-2.0.7-patches-r0.tar.xz 26416 BLAKE2B dd03fd2a29f4c2e8681c4413ca430b65beb2036b73fa95430f5f06e7c2948fb4e3256be89d922646731245672cb2900d6b7ce6bda16cb9306d5531064cfaf8a1 SHA512 cb72df8f6fa3436f134f66772f82ba95ebc92462cf145d21e01ad5b277f13294948c1d03c9c6671e58c655776a6112f2af065df79a56a135ab70c28b37e43334 +EBUILD mutt-2.0.4-r1.ebuild 7940 BLAKE2B 839c381dba3e86ffdc8b4e4350861751adf88b2237535da1cb238c911223ea7f79280825a9453bd8769ce3fed7157ae5f0c77bcd6f17942a257a4c75a68d52a1 SHA512 36c6648ed52d69bba1bd597b0c65fbcd3174d97618649e70900b5eb370eb46a1193ba0b412e09ea78835064ae1bbda31be05f393215a8cfb62a6d076fce3de17 +EBUILD mutt-2.0.6.ebuild 7946 BLAKE2B 4874afe58992b64f7beab5852f37026bdd24030f1a78fc46956762cb31df6d4907694ba28a0a5acd5f516ef8a3c885c5848181bb52c3e124e3442ca4f00b4168 SHA512 223aa026390335ae61815c8a787035ca3f3f373977046caeeb03578eff719db550d7c14eadc8f968337c524a72fdcac0eedccee42818dd211b5e07593fda9a37 +EBUILD mutt-2.0.7.ebuild 7873 BLAKE2B b6ab1e3636ecec7a053f204ecaac1760fc8cddf4e56f2f8e8f7ad036e99044e35c30c995926d8e0873c0ce99f7a660e6fcf7dcc403b5b151dc86c17ae228bed6 SHA512 0d222627a66716790c1b305675b6bcf0b756b1116825262dcb22d0fc5da1f176228f04ab110fe1d1365c974482b078aa94d8f5f0c5cb63e776faad34d86e23ee MISC metadata.xml 1297 BLAKE2B 67419e66fa917ae69f015d9af534edeb809c4371b2c004c6687a942f331c70ad0513fedb8b6f45a2cb7fc5bfd9ca80c91f888e58293dee00c198d2bca7b8cb12 SHA512 9d9c30b14ce952f8099fb60eac3e8dc25e1c5ef05b88b71c1207950766cb367b56cf7c60168c6f3e431e1aa823c0a345ce851414705e9f0af015cfa51e241350 diff --git a/mail-client/mutt/mutt-2.0.4-r1.ebuild b/mail-client/mutt/mutt-2.0.4-r1.ebuild index 1d6c9b105ef6..75406cb03c5b 100644 --- a/mail-client/mutt/mutt-2.0.4-r1.ebuild +++ b/mail-client/mutt/mutt-2.0.4-r1.ebuild @@ -14,7 +14,7 @@ MUTT_G_PATCHES="mutt-gentoo-${PV}-patches-${PATCHREV}.tar.xz" SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}" -IUSE="autocrypt berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix" +IUSE="autocrypt berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix" # hcache: allow multiple, bug #607360 REQUIRED_USE=" hcache? ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) ) @@ -42,11 +42,8 @@ CDEPEND=" ssl? ( gnutls? ( >=net-libs/gnutls-1.0.17:= ) - !gnutls? ( - libressl? ( dev-libs/libressl:= ) - !libressl? ( >=dev-libs/openssl-0.9.6:0= ) + !gnutls? ( >=dev-libs/openssl-0.9.6:0= ) ) - ) nls? ( virtual/libintl ) sasl? ( >=dev-libs/cyrus-sasl-2 ) @@ -67,7 +64,7 @@ DEPEND="${CDEPEND} )" RDEPEND="${CDEPEND} selinux? ( sec-policy/selinux-mutt ) - smime-classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) ) + smime-classic? ( >=dev-libs/openssl-0.9.6:0 ) pgp-classic? ( app-crypt/gnupg ) " diff --git a/mail-client/mutt/mutt-2.0.6.ebuild b/mail-client/mutt/mutt-2.0.6.ebuild index 5cec641f3918..a3813e615518 100644 --- a/mail-client/mutt/mutt-2.0.6.ebuild +++ b/mail-client/mutt/mutt-2.0.6.ebuild @@ -14,7 +14,7 @@ MUTT_G_PATCHES="mutt-gentoo-${PV}-patches-${PATCHREV}.tar.xz" SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}" -IUSE="autocrypt berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix" +IUSE="autocrypt berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix" # hcache: allow multiple, bug #607360 REQUIRED_USE=" hcache? ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) ) @@ -42,11 +42,8 @@ CDEPEND=" ssl? ( gnutls? ( >=net-libs/gnutls-1.0.17:= ) - !gnutls? ( - libressl? ( dev-libs/libressl:= ) - !libressl? ( >=dev-libs/openssl-0.9.6:0= ) + !gnutls? ( >=dev-libs/openssl-0.9.6:0= ) ) - ) nls? ( virtual/libintl ) sasl? ( >=dev-libs/cyrus-sasl-2 ) @@ -67,7 +64,7 @@ DEPEND="${CDEPEND} )" RDEPEND="${CDEPEND} selinux? ( sec-policy/selinux-mutt ) - smime-classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) ) + smime-classic? ( >=dev-libs/openssl-0.9.6:0 ) pgp-classic? ( app-crypt/gnupg ) " diff --git a/mail-client/mutt/mutt-2.0.5.ebuild b/mail-client/mutt/mutt-2.0.7.ebuild index 5cec641f3918..28cffe8c94b4 100644 --- a/mail-client/mutt/mutt-2.0.5.ebuild +++ b/mail-client/mutt/mutt-2.0.7.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" -inherit epatch flag-o-matic autotools +inherit flag-o-matic autotools PATCHREV="r0" PATCHSET="gentoo-${PVR}/${PATCHREV}" @@ -14,7 +14,7 @@ MUTT_G_PATCHES="mutt-gentoo-${PV}-patches-${PATCHREV}.tar.xz" SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}" -IUSE="autocrypt berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix" +IUSE="autocrypt berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix" # hcache: allow multiple, bug #607360 REQUIRED_USE=" hcache? ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) ) @@ -42,11 +42,8 @@ CDEPEND=" ssl? ( gnutls? ( >=net-libs/gnutls-1.0.17:= ) - !gnutls? ( - libressl? ( dev-libs/libressl:= ) - !libressl? ( >=dev-libs/openssl-0.9.6:0= ) + !gnutls? ( >=dev-libs/openssl-0.9.6:0= ) ) - ) nls? ( virtual/libintl ) sasl? ( >=dev-libs/cyrus-sasl-2 ) @@ -67,7 +64,7 @@ DEPEND="${CDEPEND} )" RDEPEND="${CDEPEND} selinux? ( sec-policy/selinux-mutt ) - smime-classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) ) + smime-classic? ( >=dev-libs/openssl-0.9.6:0 ) pgp-classic? ( app-crypt/gnupg ) " @@ -76,8 +73,6 @@ src_prepare() { if use !vanilla ; then # apply patches - export EPATCH_FORCE="yes" - export EPATCH_SUFFIX="patch" # http://hg.code.sf.net/p/gentoomuttpatches/code/file/mutt-1.10 local patches=( patches-mutt @@ -86,12 +81,13 @@ src_prepare() { features-extra gentoo ) - local patchset + local patchset p for patchset in "${patches[@]}" ; do [[ -d "${PATCHDIR}/${patchset}" ]] || continue einfo "Patches for ${PATCHSET} patchset ${patchset}" - EPATCH_SOURCE="${PATCHDIR}"/${patchset} epatch \ - || die "patchset ${patchset} failed" + for p in "${PATCHDIR}/${patchset}"/*.patch ; do + eapply "${p}" || die + done done # add some explanation as to why not to go upstream sed -i \ |