commit: e369d1526c6bfc989610e325c50116bbafc11071 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Thu Dec 14 07:45:23 2017 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Thu Dec 14 07:47:09 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e369d152
mail-client/mutt: fix USE-flags enabling after rename change, bug #640824 Closes: https://bugs.gentoo.org/640824 Package-Manager: Portage-2.3.13, Repoman-2.3.3 .../{mutt-1.9.1-r3.ebuild => mutt-1.9.1-r4.ebuild} | 72 ++++++++++++++-------- 1 file changed, 45 insertions(+), 27 deletions(-) diff --git a/mail-client/mutt/mutt-1.9.1-r3.ebuild b/mail-client/mutt/mutt-1.9.1-r4.ebuild similarity index 80% rename from mail-client/mutt/mutt-1.9.1-r3.ebuild rename to mail-client/mutt/mutt-1.9.1-r4.ebuild index 1cd2ae74c65..0cad65143c1 100644 --- a/mail-client/mutt/mutt-1.9.1-r3.ebuild +++ b/mail-client/mutt/mutt-1.9.1-r4.ebuild @@ -121,31 +121,41 @@ src_prepare() { src_configure() { local myconf=( - "$(use_enable crypt pgp)" - "$(use_enable pgp_classic pgp)" - "$(use_enable debug)" - "$(use_enable doc)" - "$(use_enable gpg gpgme)" - "$(use_enable gpgme)" - "$(use_enable nls)" - "$(use_enable notmuch)" - "$(use_enable sidebar)" - "$(use_enable smime)" - "$(use_enable smime_classic smime)" + # signing and encryption + # clumpsy blocks for transition period of USE-flag renames + $(use crypt && use_enable crypt pgp) + $(use pgp_classic && use_enable pgp_classic pgp) + $(use !crypt && use !pgp_classic && echo "--disable-pgp") - "$(use_enable imap)" - "$(use_enable pop)" - "$(use_enable nntp)" - "$(use_enable smtp)" + $(use smime && use_enable smime) + $(use smime_classic && use_enable smime_classic smime) + $(use !smime && use !smime_classic && echo "--disable-smime") + + $(use gpg && use_enable gpg gpgme) + $(use gpgme && use_enable gpgme) + $(use !gpg && use !gpgme && echo "--disable-gpgme") + + # features + $(use_enable debug) + $(use_enable doc) + $(use_enable nls) + $(use_enable notmuch) + $(use_enable sidebar) + + # protocols + $(use_enable imap) + $(use_enable pop) + $(use_enable nntp) + $(use_enable smtp) $(use ssl && use gnutls && echo --with-gnutls --without-ssl) $(use ssl && use !gnutls && echo --without-gnutls --with-ssl ) $(use !ssl && echo --without-gnutls --without-ssl) - "$(use_with idn)" - "$(use_with kerberos gss)" - "$(use_with sasl)" - "$(use slang && echo --with-slang=${EPREFIX}/usr)" + $(use_with sasl) + $(use_with idn) + $(use_with kerberos gss) + "$(use slang && echo --with-slang=${EPREFIX}/usr || echo a=b)" "$(use_with !slang curses ${EPREFIX}/usr)" "--enable-compressed" @@ -245,12 +255,20 @@ pkg_postinst() { elog " https://wiki.gentoo.org/wiki/Mutt"; echo fi - ewarn "Please note that the crypto related USE-flags of mutt have changed." - ewarn "To remove some unclarity, the following USE-flags are renamed:" - ewarn "(see https://bugs.gentoo.org/637176)" - ewarn " crypt -> pgp_classic" - ewarn " gpg -> gpgme" - ewarn " smime -> smime_classic" - ewarn "The old USE flags still work but their use is deprecated and will" - ewarn "be removed in a future release." + if use crypt || use gpg || use smime ; then + ewarn "Please note that the crypto related USE-flags of mutt have changed." + ewarn "To remove some unclarity, the following USE-flags are renamed:" + ewarn "(see https://bugs.gentoo.org/637176)" + ewarn " crypt -> pgp_classic" + ewarn " gpg -> gpgme" + ewarn " smime -> smime_classic" + ewarn "The old USE flags still work but their use is deprecated and will" + ewarn "be removed in a future release. Please update your package.use" + if use gpg && ( use crypt || use smime ) ; then + ewarn " Note that gpgme (old gpg) includes both pgp and smime" + ewarn " support. You can probably remove pgp_classic (old crypt)" + ewarn " and smime_classic (old smime) from your USE-flags and" + ewarn " only enable gpgme." + fi + fi }
