From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1028216-garchives=archives.gentoo.org@lists.gentoo.org>
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 C777B138334
for <garchives@archives.gentoo.org>; Wed, 6 Jun 2018 12:01:55 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 66B45E0953;
Wed, 6 Jun 2018 12:01:54 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 493FCE0953
for <gentoo-commits@lists.gentoo.org>; Wed, 6 Jun 2018 12:01:53 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id D4259335C87
for <gentoo-commits@lists.gentoo.org>; Wed, 6 Jun 2018 12:01:50 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 20E8E2B2
for <gentoo-commits@lists.gentoo.org>; Wed, 6 Jun 2018 12:01:49 +0000 (UTC)
From: "Nicolas Bock" <nicolasbock@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Nicolas Bock" <nicolasbock@gentoo.org>
Message-ID: <1528286502.bc106dfb53a99bd56cf0785f2ecd79d0f93db6d9.nicolasbock@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
X-VCS-Repository: repo/gentoo
X-VCS-Files: mail-client/neomutt/neomutt-99999999.ebuild
X-VCS-Directories: mail-client/neomutt/
X-VCS-Committer: nicolasbock
X-VCS-Committer-Name: Nicolas Bock
X-VCS-Revision: bc106dfb53a99bd56cf0785f2ecd79d0f93db6d9
X-VCS-Branch: master
Date: Wed, 6 Jun 2018 12:01:49 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: ffce353b-3e5c-4b3e-937b-f9b1ed969724
X-Archives-Hash: 25dffcd69cf819b14d22f6db357428f8
commit: bc106dfb53a99bd56cf0785f2ecd79d0f93db6d9
Author: Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 6 12:00:58 2018 +0000
Commit: Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Wed Jun 6 12:01:42 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc106dfb
mail-client/neomutt: Deprecate old crypt USE flags
Package-Manager: Portage-2.3.40, Repoman-2.3.9
mail-client/neomutt/neomutt-99999999.ebuild | 37 +++++++++--------------------
1 file changed, 11 insertions(+), 26 deletions(-)
diff --git a/mail-client/neomutt/neomutt-99999999.ebuild b/mail-client/neomutt/neomutt-99999999.ebuild
index 6d374739048..fb8ad83183d 100644
--- a/mail-client/neomutt/neomutt-99999999.ebuild
+++ b/mail-client/neomutt/neomutt-99999999.ebuild
@@ -19,9 +19,9 @@ HOMEPAGE="https://neomutt.org/"
LICENSE="GPL-2"
SLOT="0"
-IUSE="berkdb crypt doc gdbm gnutls gpg gpgme idn kerberos kyotocabinet
- libressl lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime
- smime_classic ssl tokyocabinet"
+IUSE="berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl
+ lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime_classic
+ ssl tokyocabinet"
CDEPEND="
app-misc/mime-types
@@ -40,7 +40,6 @@ CDEPEND="
qdbm? ( dev-db/qdbm )
tokyocabinet? ( dev-db/tokyocabinet )
gnutls? ( >=net-libs/gnutls-1.0.17 )
- gpg? ( >=app-crypt/gpgme-0.9.0 )
gpgme? ( >=app-crypt/gpgme-0.9.0 )
idn? ( net-dns/libidn )
kerberos? ( virtual/krb5 )
@@ -74,14 +73,9 @@ src_configure() {
"$(use_enable nls)"
"$(use_enable notmuch)"
- # During the transition of the crypto USE flags we need to support
- # both sets of flags. We do not want to emit a configuration setting
- # twice, since the second flag overrides the first, potentially
- # leading to unwanted settings. See https://bugs.gentoo.org/640824 for
- # details.
- "$(if use gpg || use gpgme; then echo "--enable"; else echo "--disable"; fi)-gpgme"
- "$(if use crypt || use pgp_classic; then echo "--enable"; else echo "--disable"; fi)-pgp"
- "$(if use smime || use smime_classic; then echo "--enable"; else echo "--disable"; fi)-smime"
+ "$(use_enable gpgme)"
+ "$(use_enable pgp_classic pgp)"
+ "$(use_enable smime_classic smime)"
# Database backends.
"$(use_enable berkdb bdb)"
@@ -127,19 +121,10 @@ src_install() {
}
pkg_postinst() {
- if use crypt || use gpg || use smime; then
- ewarn "Pleae note that the crypto related USE flags of neomutt have changed."
- ewarn "(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 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
+ if use gpgme && ( use pgp_classic || use smime_classic ); 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
}