| 1 |
commit: 69844c31d2cd0f140dc003cbe3c6d2dee16325e7 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Oct 13 15:59:41 2016 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 13 16:06:20 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69844c31 |
| 7 |
|
| 8 |
mail-client/mutt: cleanup econf arguments |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.0 |
| 11 |
|
| 12 |
mail-client/mutt/mutt-1.7.1-r1.ebuild | 101 +++++++++++++++++++--------------- |
| 13 |
1 file changed, 56 insertions(+), 45 deletions(-) |
| 14 |
|
| 15 |
diff --git a/mail-client/mutt/mutt-1.7.1-r1.ebuild b/mail-client/mutt/mutt-1.7.1-r1.ebuild |
| 16 |
index a9e98c7..27fe71b 100644 |
| 17 |
--- a/mail-client/mutt/mutt-1.7.1-r1.ebuild |
| 18 |
+++ b/mail-client/mutt/mutt-1.7.1-r1.ebuild |
| 19 |
@@ -132,74 +132,85 @@ src_prepare() { |
| 20 |
} |
| 21 |
|
| 22 |
src_configure() { |
| 23 |
- local myconf=" |
| 24 |
- $(use_enable crypt pgp) \ |
| 25 |
- $(use_enable debug) \ |
| 26 |
- $(use_enable gpg gpgme) \ |
| 27 |
- $(use_enable imap) \ |
| 28 |
- $(use_enable nls) \ |
| 29 |
- $(use_enable nntp) \ |
| 30 |
- $(use_enable pop) \ |
| 31 |
- $(use_enable sidebar) \ |
| 32 |
- $(use_enable smime) \ |
| 33 |
- $(use_enable smtp) \ |
| 34 |
- $(use_enable notmuch) \ |
| 35 |
- $(use_with idn) \ |
| 36 |
- $(use_with kerberos gss) \ |
| 37 |
- $(use slang && echo --with-slang=${EPREFIX}/usr) \ |
| 38 |
- $(use !slang && echo --with-curses=${EPREFIX}/usr) \ |
| 39 |
- --enable-compressed \ |
| 40 |
- --enable-external-dotlock \ |
| 41 |
- --enable-nfs-fix \ |
| 42 |
- --sysconfdir=${EPREFIX}/etc/${PN} \ |
| 43 |
- --with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR} \ |
| 44 |
- --with-regex \ |
| 45 |
- --with-exec-shell=${EPREFIX}/bin/sh" |
| 46 |
+ local myconf=( |
| 47 |
+ "$(use_enable crypt pgp)" |
| 48 |
+ "$(use_enable debug)" |
| 49 |
+ "$(use_enable gpg gpgme)" |
| 50 |
+ "$(use_enable imap)" |
| 51 |
+ "$(use_enable nls)" |
| 52 |
+ "$(use_enable nntp)" |
| 53 |
+ "$(use_enable pop)" |
| 54 |
+ "$(use_enable sidebar)" |
| 55 |
+ "$(use_enable smime)" |
| 56 |
+ "$(use_enable smtp)" |
| 57 |
+ "$(use_enable notmuch)" |
| 58 |
+ "$(use_with idn)" |
| 59 |
+ "$(use_with kerberos gss)" |
| 60 |
+ "--with-$(use slang && echo slang || echo curses)=${EPREFIX}/usr" |
| 61 |
+ "--enable-compressed" |
| 62 |
+ "--enable-external-dotlock" |
| 63 |
+ "--enable-nfs-fix" |
| 64 |
+ "--sysconfdir=${EPREFIX}/etc/${PN}" |
| 65 |
+ "--with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR}" |
| 66 |
+ "--with-regex" |
| 67 |
+ "--with-exec-shell=${EPREFIX}/bin/sh" |
| 68 |
+ ) |
| 69 |
|
| 70 |
if [[ ${CHOST} == *-solaris* ]] ; then |
| 71 |
# arrows in index view do not show when using wchar_t |
| 72 |
- myconf+=" --without-wc-funcs" |
| 73 |
+ myconf+=( "--without-wc-funcs" ) |
| 74 |
fi |
| 75 |
|
| 76 |
# mutt prioritizes gdbm over bdb, so we will too. |
| 77 |
# hcache feature requires at least one database is in USE. |
| 78 |
- if use tokyocabinet; then |
| 79 |
- myconf="${myconf} --enable-hcache \ |
| 80 |
- --with-tokyocabinet --without-qdbm --without-gdbm --without-bdb" |
| 81 |
- elif use qdbm; then |
| 82 |
- myconf="${myconf} --enable-hcache \ |
| 83 |
- --without-tokyocabinet --with-qdbm --without-gdbm --without-bdb" |
| 84 |
- elif use gdbm ; then |
| 85 |
- myconf="${myconf} --enable-hcache \ |
| 86 |
- --without-tokyocabinet --without-qdbm --with-gdbm --without-bdb" |
| 87 |
- elif use berkdb; then |
| 88 |
- myconf="${myconf} --enable-hcache \ |
| 89 |
- --without-tokyocabinet --without-qdbm --without-gdbm --with-bdb" |
| 90 |
+ local hcaches=( |
| 91 |
+ "tokyocabinet" |
| 92 |
+ "qdbm" |
| 93 |
+ "gdbm" |
| 94 |
+ "berkdb:bdb" |
| 95 |
+ ) |
| 96 |
+ local ucache hcache lcache |
| 97 |
+ for hcache in "${hcaches[@]}" ; do |
| 98 |
+ if use ${hcache%%:*} ; then |
| 99 |
+ ucache=${hcache} |
| 100 |
+ break |
| 101 |
+ fi |
| 102 |
+ done |
| 103 |
+ if [[ -n ${ucache} ]] ; then |
| 104 |
+ myconf+=( "--enable-hcache" ) |
| 105 |
else |
| 106 |
- myconf="${myconf} --disable-hcache \ |
| 107 |
- --without-tokyocabinet --without-qdbm --without-gdbm --without-bdb" |
| 108 |
+ myconf+=( "--disable-hcache" ) |
| 109 |
fi |
| 110 |
+ for hcache in "${hcaches[@]}" ; do |
| 111 |
+ [[ ${hcache} == ${ucache} ]] \ |
| 112 |
+ && myconf+=( "--with-${hcache#*:}" ) \ |
| 113 |
+ || myconf+=( "--without-${hcache#*:}" ) |
| 114 |
+ done |
| 115 |
|
| 116 |
# there's no need for gnutls, ssl or sasl without socket support |
| 117 |
if use pop || use imap || use smtp ; then |
| 118 |
if use gnutls; then |
| 119 |
- myconf="${myconf} --with-gnutls" |
| 120 |
+ myconf+=( "--with-gnutls" ) |
| 121 |
elif use ssl; then |
| 122 |
- myconf="${myconf} --with-ssl" |
| 123 |
+ myconf+=( "--with-ssl" ) |
| 124 |
fi |
| 125 |
# not sure if this should be mutually exclusive with the other two |
| 126 |
- myconf="${myconf} $(use_with sasl)" |
| 127 |
+ myconf+=( "$(use_with sasl)" ) |
| 128 |
else |
| 129 |
- myconf="${myconf} --without-gnutls --without-ssl --without-sasl" |
| 130 |
+ myconf+=( |
| 131 |
+ "--without-gnutls" |
| 132 |
+ "--without-ssl" |
| 133 |
+ "--without-sasl" |
| 134 |
+ ) |
| 135 |
fi |
| 136 |
|
| 137 |
if use mbox; then |
| 138 |
- myconf="${myconf} --with-mailpath=${EPREFIX}/var/spool/mail" |
| 139 |
+ myconf+=( "--with-mailpath=${EPREFIX}/var/spool/mail" ) |
| 140 |
else |
| 141 |
- myconf="${myconf} --with-homespool=Maildir" |
| 142 |
+ myconf+=( "--with-homespool=Maildir" ) |
| 143 |
fi |
| 144 |
|
| 145 |
- econf ${myconf} || die "configure failed" |
| 146 |
+ econf "${myconf[@]}" || die "configure failed" |
| 147 |
} |
| 148 |
|
| 149 |
src_install() { |
Archives