[gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/

["Nicolas Bock" <nicolasbock@gentoo.org>]

commit:     466c3f1ed6f5219aa8f47c516be5cdd415f8a327
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  2 14:28:37 2017 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Sat Dec  2 14:29:10 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=466c3f1e

mail-client/neomutt: Update crypto USE flags

Rename the crypto USE flags to make their naming more consistent and
clearer to the user.

Co-Authored-By: brunoboclair <AT> fake-box.com
Closes: https://bugs.gentoo.org/637176
Package-Manager: Portage-2.3.13, Repoman-2.3.3

 mail-client/neomutt/Manifest            | 10 +++++-----
 mail-client/neomutt/metadata.xml        |  6 ++++++
 mail-client/neomutt/neomutt-9999.ebuild | 23 ++++++++++++-----------
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index c48e9eef74e..9cc35ec6fea 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,5 +1,5 @@
-DIST neomutt-20170714.tar.gz 2509160 SHA256 40d48920f95ca49ab96eb109b658f5cf6e1c222320c58bdd03769c1355d7a383 SHA512 eb31d2f23b7211904cd66ba293c008f953778b37f13fd09d4db571d013f1c8e6449fccd827872f3ad0a2c8e62555f92b3f9591a1f0f4ac37ab362a4681abaaa0 WHIRLPOOL 455495501a2ab1989d5f3bfa75aa2370896956cdfd7d2e852e225c96aa23a1abdaf2dbb9d886d1d96486d19b2b38c225e8263f268ebafcef8cbd0024885189f3
-DIST neomutt-20170912.tar.gz 2533245 SHA256 9f0d128fe8dbbbddb67e2b629f8b5e52a9d892f82c735845c1708c14e3046657 SHA512 7551da47029667443257d9d370af7217846abf988d1469c4e08f367ef0bce2dfb658321df27176622bbd07e6d46c320380749d4ce05ee39cb1e8d9b6c3e1d7e6 WHIRLPOOL 0dad6380acf5b6f891bcb77388023de27d23e4ea8ad0eb3563c1704de555a2fc54604d47b9b67557c6ab0310e1c365c786a1952f6794b2012594f1c19033ad3c
-DIST neomutt-20171006.tar.gz 2706019 SHA256 86e9d945919438a377828b15f03c8690f639062e44151e219e2f8443ae27147c SHA512 adfa702ee642ce58b11dab1d2b805626d8f90e8cc88731cb7e051df5b785010ac43d90eb14d2a5ace02d3abaf921c9f36f86f627063036bcb7f5724912ca134d WHIRLPOOL 75f2a0c8881b769f1a7acd8c0e7724baf0a2943a68a4029d74d32a5a5ed3203c32ce3704b3271a8e05f02c233273319437a593ffad9df5e1b988f8725f0f2433
-DIST neomutt-20171013.tar.gz 2706753 SHA256 5a7c6302d623b620db03d923a7cd7cf967123a67fc42c117a0dd4b45612e9a55 SHA512 9e4499b165f25091d73868c62b14f950bdfc032444c0cb3619e99a8299d29c3d1f24078e15537e693a3af69ae0681d59e25a73b857882cce2653be593231ffac WHIRLPOOL fde9e7833bc6a469882716d7c9deb4d5146d0a6ffd5769e7d76d952096165b05d29584e057503a1ba3a4887c8afd0efe26401fc9d533250c597527bce8500634
-DIST neomutt-20171027.tar.gz 2682699 SHA256 2d00de2a1cdef4cd59fcf6f894a6fe7e677e1065565f5e01f4dae8e1d910e583 SHA512 e2df0d20c0729abb32d1614c94c08cca0cecad1cb36a380f8210e2df3e353ffc08f66abf1e5e3a1cf4a746437d59c15262ce05ab1a820561466bf7e3a5d6b894 WHIRLPOOL b79f58d4b59c0a4d0bbac46993a4743e659d7b29471ffbef7f291e83b63835629735139b07f911181fed2f8c403c70e7530870330eef6de5733eae9b0dcc6e6e
+DIST neomutt-20170714.tar.gz 2509160 BLAKE2B 33170f85be17d9999414a4034b740e375a71bd7092c5134342aa2b23b35afd83ddf5de95c06fb221c63aac36fbf247204508cc3e6d6259ab8c7606de5b444344 SHA512 eb31d2f23b7211904cd66ba293c008f953778b37f13fd09d4db571d013f1c8e6449fccd827872f3ad0a2c8e62555f92b3f9591a1f0f4ac37ab362a4681abaaa0
+DIST neomutt-20170912.tar.gz 2533245 BLAKE2B fde5690d2f80b0ef55ddc753487905130b1db027da2ba712d9629d59f79d2c2fcd6025e96dd031045c2c162020991141375c607ae10e9be9cf1f81fe64166c05 SHA512 7551da47029667443257d9d370af7217846abf988d1469c4e08f367ef0bce2dfb658321df27176622bbd07e6d46c320380749d4ce05ee39cb1e8d9b6c3e1d7e6
+DIST neomutt-20171006.tar.gz 2706019 BLAKE2B b16f065fd1c5b829c6b73614c42e5353b968fe9111d445319927a48ec2612e59ac23dd3e06948c7c5b6f34bdd1646773cf91ae21737adf67ff4019c9850895e2 SHA512 adfa702ee642ce58b11dab1d2b805626d8f90e8cc88731cb7e051df5b785010ac43d90eb14d2a5ace02d3abaf921c9f36f86f627063036bcb7f5724912ca134d
+DIST neomutt-20171013.tar.gz 2706753 BLAKE2B d8801f4168ce978b8b2578a1fa28b8f29e98700c2b3c11dcce7b9cdf132a755403ed1b54216426736c1dde78c580320ebac4fbb6e3ca6f92abc1c1e6d1e4fd1b SHA512 9e4499b165f25091d73868c62b14f950bdfc032444c0cb3619e99a8299d29c3d1f24078e15537e693a3af69ae0681d59e25a73b857882cce2653be593231ffac
+DIST neomutt-20171027.tar.gz 2682699 BLAKE2B 4e3eda453a8c19d2ec1460c0813e030ef8209e8761d1ef768698cf624c11a2d3b22b941da78fb2d39ef44d6f39c7b30786248448910e59170f50b6d6e010a331 SHA512 e2df0d20c0729abb32d1614c94c08cca0cecad1cb36a380f8210e2df3e353ffc08f66abf1e5e3a1cf4a746437d59c15262ce05ab1a820561466bf7e3a5d6b894

diff --git a/mail-client/neomutt/metadata.xml b/mail-client/neomutt/metadata.xml
index 2cce62e661b..9810e2b8319 100644
--- a/mail-client/neomutt/metadata.xml
+++ b/mail-client/neomutt/metadata.xml
@@ -22,5 +22,11 @@
 		<flag name="smime">Enable support for smime</flag>
 		<flag name="tokyocabinet">Enable Tokyo Cabinet database backend for
 			header caching</flag>
+		<flag name="gpgme">Build gpgme backend to support S/MIME, PGP/MIME and
+			traditional/inline PGP</flag>
+		<flag name="pgp_classic">Build classic_pgp backend to support PGP/MIME
+			and traditional/inline PGP</flag>
+		<flag name="smime_classic">Build classic_smime backend to support
+			S/MIME</flag>
 	</use>
 </pkgmetadata>

diff --git a/mail-client/neomutt/neomutt-9999.ebuild b/mail-client/neomutt/neomutt-9999.ebuild
index 5dc34a207c8..6832f903c17 100644
--- a/mail-client/neomutt/neomutt-9999.ebuild
+++ b/mail-client/neomutt/neomutt-9999.ebuild
@@ -14,8 +14,9 @@ HOMEPAGE="https://www.neomutt.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="berkdb crypt debug doc gdbm gnutls gpg idn kerberos kyotocabinet
-	libressl lmdb nls notmuch qdbm sasl selinux slang smime ssl tokyocabinet"
+IUSE="berkdb debug 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
@@ -27,7 +28,7 @@ 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 )
 	notmuch? ( net-mail/notmuch )
@@ -60,22 +61,22 @@ src_prepare() {
 
 src_configure() {
 	local myconf=(
-		"$(use_enable crypt pgp)"
 		"$(use_enable debug)"
 		"$(use_enable doc)"
-		"$(use_enable gpg gpgme)"
+		"$(use_enable gpgme)"
 		"$(use_enable nls)"
-		"$(use_enable smime)"
 		"$(use_enable notmuch)"
+		"$(use_enable pgp_classic pgp)"
+		"$(use_enable smime_classic smime)"
+		"$(use_with berkdb bdb)"
+		"$(use_with gdbm)"
 		"$(use_with idn)"
 		"$(use_with kerberos gss)"
-		"$(use_with sasl)"
-		"$(use_with tokyocabinet)"
 		"$(use_with kyotocabinet)"
-		"$(use_with qdbm)"
-		"$(use_with gdbm)"
-		"$(use_with berkdb bdb)"
 		"$(use_with lmdb)"
+		"$(use_with qdbm)"
+		"$(use_with sasl)"
+		"$(use_with tokyocabinet)"
 		"--with-$(usex slang slang curses)"
 		"--sysconfdir=${EPREFIX}/etc/${PN}"
 		"--with-docdir=${EPREFIX}/usr/share/doc/${PF}"