diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-04-10 17:26:49 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-04-10 17:26:49 +0100 |
| commit | 6957f5c65b02bba533954eabc0b62f5de36be206 (patch) | |
| tree | 21d8ab8f61dffd9cccc82d0badb68982516a6855 /mail-client/mutt | |
| parent | e91a1aaa5ec8fab37f0fd082ac6024d41c6651e2 (diff) | |
gentoo resync : 10.04.2018
Diffstat (limited to 'mail-client/mutt')
| -rw-r--r-- | mail-client/mutt/Manifest | 2 | ||||
| -rw-r--r-- | mail-client/mutt/mutt-1.9.4-r1.ebuild | 15 |
2 files changed, 11 insertions, 6 deletions
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest index 8f6736748e15..d477558fff18 100644 --- a/mail-client/mutt/Manifest +++ b/mail-client/mutt/Manifest @@ -5,5 +5,5 @@ DIST mutt-1.9.4.tar.gz 4197655 BLAKE2B b34224622f590f2cb528644c636e6f5ddc39215f8 DIST mutt-gentoo-1.7.2-patches-r1.tar.xz 143816 BLAKE2B ecc845983dc00e388c25ced0ca0c253d9fdfa813e9df6a4f166f4ccbb05cc26b5522fa84ccdfd1f92d5cce7291ac3d70ddefaeac3e13dafc892f924236a62f11 SHA512 21703bc808ae510e26ede38e1dda5d7c74cad15823154584a83209e9dbf68bf6350961e66729cf2ede78bde003f3b92567d42f9f8f89ed53643dcfa536625b7e DIST mutt-gentoo-1.9.4-patches-r1.tar.xz 114212 BLAKE2B bb14bb8ce8c2088dd32d6528f60e666d213aa557ce3f830f8ccf6e9199ea2083ea8b6605bee7aba6e96a40d127c076a581de656eabc257a00aa584fba6263fbd SHA512 c011c24767ad8b4a096a91c8531f923057e98e4439f0d0e00e70d761b434fec8c8bb1394e765b3f1be16212df76f99abdaa4f3347299c88f4c73e9b6d13525e3 EBUILD mutt-1.7.2.ebuild 7597 BLAKE2B 293f44f17fcac1ef39c1a02adeafa4096b57ebf62d4000ce64f2dce89c241cd87f83f7dd96e42b0ce245e5f1e1eae016025187d785c08ec5e2639494b820709e SHA512 4316b6c10d5b70071cc8e0d2185d89056763210bacf626d11c8632ce93e8638cdef2c59d87806b588551db590d8c0bcaebf6b487bb2eaa5c6556d57b51aeb2ef -EBUILD mutt-1.9.4-r1.ebuild 8852 BLAKE2B a16320bea0df08d20e40087a320b757a82e98df7c293103f9cae10ac1f5539a8180cb93fc2a33e8c88f3d13cf23a2a5a41c891b33cfeb591b35f21bd54e34a3c SHA512 e4acc6b28b04b35c62899173336a7aab99766ad01de3b4f10b6b16feac1e91ba54df61bf2aa73090dae6df6a917aa4ab13d1fa6469f9a1bc42759da9348d5b53 +EBUILD mutt-1.9.4-r1.ebuild 9172 BLAKE2B 26333cd839231fe71fb5df861b45b13a9a65c9563a2628022572ab9ecc47e96c85ca9b7f0d1182f4b74a60f82f91ade1e8ddae71238ad8df79f16c10a2eda803 SHA512 347c532369e24c5eb0a19bcdffe99d2e211f4b2e8df4dfcc79dcde247bdbb7a5d03f6109e78591aebad9f8ed740ce13d8e7b9d66ecc7e431724b1b7fdfcb45d3 MISC metadata.xml 1866 BLAKE2B 4ce87ce0025fdf35622e7029d1200e0e4ad0cc66dd8bb40e1830d2fbcbc2d2de6e22c46ef86579c50224e17df42efcb349a1df55bb836eb5649110440aba17bc SHA512 1c494d1b5a628417d19d836473da2ba99e1d0f1e6f5a453f03ef84f9c601d2f31f53edf03bd242abfa8cb2a7f84de9385014828b607c1fbd6de38acdba228b82 diff --git a/mail-client/mutt/mutt-1.9.4-r1.ebuild b/mail-client/mutt/mutt-1.9.4-r1.ebuild index 158b60319d21..3a03f9c5bfda 100644 --- a/mail-client/mutt/mutt-1.9.4-r1.ebuild +++ b/mail-client/mutt/mutt-1.9.4-r1.ebuild @@ -15,8 +15,9 @@ 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="berkdb crypt debug doc gdbm gnutls gpg gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls nntp notmuch pgp_classic pop qdbm +sasl selinux slang smime smime_classic +smtp +ssl tokyocabinet vanilla prefix" +# hcache: allow multiple, bug #607360 REQUIRED_USE=" - hcache? ( ^^ ( berkdb gdbm lmdb qdbm tokyocabinet ) ) + hcache? ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) ) imap? ( ssl ) pop? ( ssl ) nntp? ( ssl ) @@ -27,7 +28,9 @@ REQUIRED_USE=" kerberos? ( || ( imap pop smtp nntp ) )" SLOT="0" LICENSE="GPL-2" -KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +# yes, we overdepend on the backend impls here, hopefully one day we can +# have REQUIRED_USE do what it is made for again. bug #607360 CDEPEND=" app-misc/mime-types @@ -171,13 +174,15 @@ src_configure() { myconf+=( "--without-wc-funcs" ) fi - # REQUIRED_USE should have selected only one of these + # note: REQUIRED_USE should have selected only one of these, but for + # bug #607360 we're forced to allow multiple. For that reason, this + # list is ordered to preference, and only the first is taken. local hcaches=( - "berkdb:bdb" - "gdbm" "lmdb" "qdbm" "tokyocabinet" + "gdbm" + "berkdb:bdb" ) local ucache hcache lcache for hcache in "${hcaches[@]}" ; do |