From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 21548138331 for ; Thu, 13 Oct 2016 16:06:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D03BA21C075; Thu, 13 Oct 2016 16:06:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A5F8921C075 for ; Thu, 13 Oct 2016 16:06:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 01852341652 for ; Thu, 13 Oct 2016 16:06:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2036D2F8 for ; Thu, 13 Oct 2016 16:06:28 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1476374780.69844c31d2cd0f140dc003cbe3c6d2dee16325e7.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/ X-VCS-Repository: repo/gentoo X-VCS-Files: mail-client/mutt/mutt-1.7.1-r1.ebuild X-VCS-Directories: mail-client/mutt/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 69844c31d2cd0f140dc003cbe3c6d2dee16325e7 X-VCS-Branch: master Date: Thu, 13 Oct 2016 16:06:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a3cec101-975b-4817-9c44-67d5ad915af5 X-Archives-Hash: 85010ad0d529ecb7172e2ce9394518b7 commit: 69844c31d2cd0f140dc003cbe3c6d2dee16325e7 Author: Fabian Groffen gentoo org> AuthorDate: Thu Oct 13 15:59:41 2016 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Thu Oct 13 16:06:20 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69844c31 mail-client/mutt: cleanup econf arguments Package-Manager: portage-2.3.0 mail-client/mutt/mutt-1.7.1-r1.ebuild | 101 +++++++++++++++++++--------------- 1 file changed, 56 insertions(+), 45 deletions(-) diff --git a/mail-client/mutt/mutt-1.7.1-r1.ebuild b/mail-client/mutt/mutt-1.7.1-r1.ebuild index a9e98c7..27fe71b 100644 --- a/mail-client/mutt/mutt-1.7.1-r1.ebuild +++ b/mail-client/mutt/mutt-1.7.1-r1.ebuild @@ -132,74 +132,85 @@ src_prepare() { } src_configure() { - local myconf=" - $(use_enable crypt pgp) \ - $(use_enable debug) \ - $(use_enable gpg gpgme) \ - $(use_enable imap) \ - $(use_enable nls) \ - $(use_enable nntp) \ - $(use_enable pop) \ - $(use_enable sidebar) \ - $(use_enable smime) \ - $(use_enable smtp) \ - $(use_enable notmuch) \ - $(use_with idn) \ - $(use_with kerberos gss) \ - $(use slang && echo --with-slang=${EPREFIX}/usr) \ - $(use !slang && echo --with-curses=${EPREFIX}/usr) \ - --enable-compressed \ - --enable-external-dotlock \ - --enable-nfs-fix \ - --sysconfdir=${EPREFIX}/etc/${PN} \ - --with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR} \ - --with-regex \ - --with-exec-shell=${EPREFIX}/bin/sh" + local myconf=( + "$(use_enable crypt pgp)" + "$(use_enable debug)" + "$(use_enable gpg gpgme)" + "$(use_enable imap)" + "$(use_enable nls)" + "$(use_enable nntp)" + "$(use_enable pop)" + "$(use_enable sidebar)" + "$(use_enable smime)" + "$(use_enable smtp)" + "$(use_enable notmuch)" + "$(use_with idn)" + "$(use_with kerberos gss)" + "--with-$(use slang && echo slang || echo curses)=${EPREFIX}/usr" + "--enable-compressed" + "--enable-external-dotlock" + "--enable-nfs-fix" + "--sysconfdir=${EPREFIX}/etc/${PN}" + "--with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR}" + "--with-regex" + "--with-exec-shell=${EPREFIX}/bin/sh" + ) if [[ ${CHOST} == *-solaris* ]] ; then # arrows in index view do not show when using wchar_t - myconf+=" --without-wc-funcs" + myconf+=( "--without-wc-funcs" ) fi # mutt prioritizes gdbm over bdb, so we will too. # hcache feature requires at least one database is in USE. - if use tokyocabinet; then - myconf="${myconf} --enable-hcache \ - --with-tokyocabinet --without-qdbm --without-gdbm --without-bdb" - elif use qdbm; then - myconf="${myconf} --enable-hcache \ - --without-tokyocabinet --with-qdbm --without-gdbm --without-bdb" - elif use gdbm ; then - myconf="${myconf} --enable-hcache \ - --without-tokyocabinet --without-qdbm --with-gdbm --without-bdb" - elif use berkdb; then - myconf="${myconf} --enable-hcache \ - --without-tokyocabinet --without-qdbm --without-gdbm --with-bdb" + local hcaches=( + "tokyocabinet" + "qdbm" + "gdbm" + "berkdb:bdb" + ) + local ucache hcache lcache + for hcache in "${hcaches[@]}" ; do + if use ${hcache%%:*} ; then + ucache=${hcache} + break + fi + done + if [[ -n ${ucache} ]] ; then + myconf+=( "--enable-hcache" ) else - myconf="${myconf} --disable-hcache \ - --without-tokyocabinet --without-qdbm --without-gdbm --without-bdb" + myconf+=( "--disable-hcache" ) fi + for hcache in "${hcaches[@]}" ; do + [[ ${hcache} == ${ucache} ]] \ + && myconf+=( "--with-${hcache#*:}" ) \ + || myconf+=( "--without-${hcache#*:}" ) + done # there's no need for gnutls, ssl or sasl without socket support if use pop || use imap || use smtp ; then if use gnutls; then - myconf="${myconf} --with-gnutls" + myconf+=( "--with-gnutls" ) elif use ssl; then - myconf="${myconf} --with-ssl" + myconf+=( "--with-ssl" ) fi # not sure if this should be mutually exclusive with the other two - myconf="${myconf} $(use_with sasl)" + myconf+=( "$(use_with sasl)" ) else - myconf="${myconf} --without-gnutls --without-ssl --without-sasl" + myconf+=( + "--without-gnutls" + "--without-ssl" + "--without-sasl" + ) fi if use mbox; then - myconf="${myconf} --with-mailpath=${EPREFIX}/var/spool/mail" + myconf+=( "--with-mailpath=${EPREFIX}/var/spool/mail" ) else - myconf="${myconf} --with-homespool=Maildir" + myconf+=( "--with-homespool=Maildir" ) fi - econf ${myconf} || die "configure failed" + econf "${myconf[@]}" || die "configure failed" } src_install() {