| 1 |
commit: 8a4e746cf27369d0840adaa5f17530a87999a0c7 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Apr 8 07:36:58 2018 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Apr 8 07:36:58 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a4e746c |
| 7 |
|
| 8 |
mail-client/mutt: drop exclusive req on backends, bug #607360 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/607360 |
| 11 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 12 |
|
| 13 |
mail-client/mutt/mutt-1.9.4-r1.ebuild | 13 +++++++++---- |
| 14 |
1 file changed, 9 insertions(+), 4 deletions(-) |
| 15 |
|
| 16 |
diff --git a/mail-client/mutt/mutt-1.9.4-r1.ebuild b/mail-client/mutt/mutt-1.9.4-r1.ebuild |
| 17 |
index 158b60319d2..cf7b6e60ba9 100644 |
| 18 |
--- a/mail-client/mutt/mutt-1.9.4-r1.ebuild |
| 19 |
+++ b/mail-client/mutt/mutt-1.9.4-r1.ebuild |
| 20 |
@@ -15,8 +15,9 @@ SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz |
| 21 |
https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz |
| 22 |
https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}" |
| 23 |
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" |
| 24 |
+# hcache: allow multiple, bug #607360 |
| 25 |
REQUIRED_USE=" |
| 26 |
- hcache? ( ^^ ( berkdb gdbm lmdb qdbm tokyocabinet ) ) |
| 27 |
+ hcache? ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) ) |
| 28 |
imap? ( ssl ) |
| 29 |
pop? ( ssl ) |
| 30 |
nntp? ( ssl ) |
| 31 |
@@ -28,6 +29,8 @@ REQUIRED_USE=" |
| 32 |
SLOT="0" |
| 33 |
LICENSE="GPL-2" |
| 34 |
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" |
| 35 |
+# yes, we overdepend on the backend impls here, hopefully one day we can |
| 36 |
+# have REQUIRED_USE do what it is made for again. bug #607360 |
| 37 |
CDEPEND=" |
| 38 |
app-misc/mime-types |
| 39 |
|
| 40 |
@@ -171,13 +174,15 @@ src_configure() { |
| 41 |
myconf+=( "--without-wc-funcs" ) |
| 42 |
fi |
| 43 |
|
| 44 |
- # REQUIRED_USE should have selected only one of these |
| 45 |
+ # note: REQUIRED_USE should have selected only one of these, but for |
| 46 |
+ # bug #607360 we're forced to allow multiple. For that reason, this |
| 47 |
+ # list is ordered to preference, and only the first is taken. |
| 48 |
local hcaches=( |
| 49 |
- "berkdb:bdb" |
| 50 |
- "gdbm" |
| 51 |
"lmdb" |
| 52 |
"qdbm" |
| 53 |
"tokyocabinet" |
| 54 |
+ "gdbm" |
| 55 |
+ "berkdb:bdb" |
| 56 |
) |
| 57 |
local ucache hcache lcache |
| 58 |
for hcache in "${hcaches[@]}" ; do |
Archives