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

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

commit:     2a4623f6bf9ff7a3f607840fc4ceef896993ee6c
Author:     Stefan Huber <shuber <AT> sthu <DOT> org>
AuthorDate: Tue Feb  9 21:50:17 2021 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Wed Mar 10 14:30:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a4623f6

mail-client/neomutt: Add autocrypt use flag

NeoMutt supports autocrypt since version 2019-10-25. It requires gpgme
of version 1.8.0 or higher and sqlite. It is recommended that idn or
idn2 is enabled according to the manual.

The minimum requirement of gpgme of neomutt-20201127.ebuild is increased
from 0.9.0 to 1.8.0. This change has no consquence as the minimum
available version in portage is 1.14.0.

Closes: https://bugs.gentoo.org/769698
Closes: https://github.com/gentoo/gentoo/pull/19392
Signed-off-by: Stefan Huber <shuber <AT> sthu.org>
Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/metadata.xml               |  1 +
 mail-client/neomutt/neomutt-20201127-r1.ebuild | 11 ++++++++++-
 mail-client/neomutt/neomutt-20201127.ebuild    | 13 +++++++++++--
 mail-client/neomutt/neomutt-20210205.ebuild    | 11 ++++++++++-
 mail-client/neomutt/neomutt-99999999.ebuild    | 11 ++++++++++-
 5 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/mail-client/neomutt/metadata.xml b/mail-client/neomutt/metadata.xml
index 2fbef90b636..59bca750020 100644
--- a/mail-client/neomutt/metadata.xml
+++ b/mail-client/neomutt/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Nicolas Bock</name>
 	</maintainer>
 	<use>
+		<flag name="autocrypt">Enable autocrypt.org support</flag>
 		<flag name="berkdb">Enable BDB (Berkley DB) backend for header
 			caching</flag>
 		<flag name="gdbm">Enable GDBM (GNU dbm) backend for header

diff --git a/mail-client/neomutt/neomutt-20201127-r1.ebuild b/mail-client/neomutt/neomutt-20201127-r1.ebuild
index 863e199daac..494bea47a6c 100644
--- a/mail-client/neomutt/neomutt-20201127-r1.ebuild
+++ b/mail-client/neomutt/neomutt-20201127-r1.ebuild
@@ -21,9 +21,11 @@ HOMEPAGE="https://neomutt.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl
+IUSE="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl
 	lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
 	ssl tokyocabinet test"
+REQUIRED_USE="
+	autocrypt? ( gpgme )"
 
 CDEPEND="
 	app-misc/mime-types
@@ -43,6 +45,7 @@ CDEPEND="
 	tokyocabinet? ( dev-db/tokyocabinet )
 	gnutls? ( >=net-libs/gnutls-1.0.17:= )
 	gpgme? ( >=app-crypt/gpgme-1.13.1:= )
+	autocrypt? ( >=dev-db/sqlite-3 )
 	idn? ( net-dns/libidn:= )
 	kerberos? ( virtual/krb5 )
 	notmuch? ( net-mail/notmuch:= )
@@ -80,6 +83,7 @@ src_configure() {
 		"$(use_enable nls)"
 		"$(use_enable notmuch)"
 
+		"$(use_enable autocrypt)"
 		"$(use_enable gpgme)"
 		"$(use_enable pgp-classic pgp)"
 		"$(use_enable smime-classic smime)"
@@ -145,4 +149,9 @@ pkg_postinst() {
 		ewarn "  and smime-classic (old smime) from your USE-flags and"
 		ewarn "  only enable gpgme."
 	fi
+
+	if use autocrypt && ! use idn; then
+		ewarn "  It is highly recommended that NeoMutt be also configured"
+		ewarn "  with idn when autocrypt is enabled."
+	fi
 }

diff --git a/mail-client/neomutt/neomutt-20201127.ebuild b/mail-client/neomutt/neomutt-20201127.ebuild
index 2fbecf8b780..4a1c914f9bb 100644
--- a/mail-client/neomutt/neomutt-20201127.ebuild
+++ b/mail-client/neomutt/neomutt-20201127.ebuild
@@ -21,9 +21,11 @@ HOMEPAGE="https://neomutt.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl
+IUSE="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl
 	lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
 	ssl tokyocabinet test"
+REQUIRED_USE="
+	autocrypt? ( gpgme )"
 
 CDEPEND="
 	app-misc/mime-types
@@ -42,7 +44,8 @@ CDEPEND="
 	qdbm? ( dev-db/qdbm )
 	tokyocabinet? ( dev-db/tokyocabinet )
 	gnutls? ( >=net-libs/gnutls-1.0.17:= )
-	gpgme? ( >=app-crypt/gpgme-0.9.0:= )
+	gpgme? ( >=app-crypt/gpgme-1.8.0:= )
+	autocrypt? ( >=dev-db/sqlite-3 )
 	idn? ( net-dns/libidn:= )
 	kerberos? ( virtual/krb5 )
 	notmuch? ( net-mail/notmuch:= )
@@ -80,6 +83,7 @@ src_configure() {
 		"$(use_enable nls)"
 		"$(use_enable notmuch)"
 
+		"$(use_enable autocrypt)"
 		"$(use_enable gpgme)"
 		"$(use_enable pgp-classic pgp)"
 		"$(use_enable smime-classic smime)"
@@ -145,4 +149,9 @@ pkg_postinst() {
 		ewarn "  and smime-classic (old smime) from your USE-flags and"
 		ewarn "  only enable gpgme."
 	fi
+
+	if use autocrypt && ! use idn; then
+		ewarn "  It is highly recommended that NeoMutt be also configured"
+		ewarn "  with idn when autocrypt is enabled."
+	fi
 }

diff --git a/mail-client/neomutt/neomutt-20210205.ebuild b/mail-client/neomutt/neomutt-20210205.ebuild
index aec8ac34925..74180642cbc 100644
--- a/mail-client/neomutt/neomutt-20210205.ebuild
+++ b/mail-client/neomutt/neomutt-20210205.ebuild
@@ -21,9 +21,11 @@ HOMEPAGE="https://neomutt.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl
+IUSE="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl
 	lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
 	ssl tokyocabinet test"
+REQUIRED_USE="
+	autocrypt? ( gpgme )"
 
 CDEPEND="
 	app-misc/mime-types
@@ -43,6 +45,7 @@ CDEPEND="
 	tokyocabinet? ( dev-db/tokyocabinet )
 	gnutls? ( >=net-libs/gnutls-1.0.17:= )
 	gpgme? ( >=app-crypt/gpgme-1.13.1:= )
+	autocrypt? ( >=dev-db/sqlite-3 )
 	idn? ( net-dns/libidn:= )
 	kerberos? ( virtual/krb5 )
 	notmuch? ( net-mail/notmuch:= )
@@ -80,6 +83,7 @@ src_configure() {
 		"$(use_enable nls)"
 		"$(use_enable notmuch)"
 
+		"$(use_enable autocrypt)"
 		"$(use_enable gpgme)"
 		"$(use_enable pgp-classic pgp)"
 		"$(use_enable smime-classic smime)"
@@ -145,4 +149,9 @@ pkg_postinst() {
 		ewarn "  and smime-classic (old smime) from your USE-flags and"
 		ewarn "  only enable gpgme."
 	fi
+
+	if use autocrypt && ! use idn; then
+		ewarn "  It is highly recommended that NeoMutt be also configured"
+		ewarn "  with idn when autocrypt is enabled."
+	fi
 }

diff --git a/mail-client/neomutt/neomutt-99999999.ebuild b/mail-client/neomutt/neomutt-99999999.ebuild
index aec8ac34925..74180642cbc 100644
--- a/mail-client/neomutt/neomutt-99999999.ebuild
+++ b/mail-client/neomutt/neomutt-99999999.ebuild
@@ -21,9 +21,11 @@ HOMEPAGE="https://neomutt.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl
+IUSE="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl
 	lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
 	ssl tokyocabinet test"
+REQUIRED_USE="
+	autocrypt? ( gpgme )"
 
 CDEPEND="
 	app-misc/mime-types
@@ -43,6 +45,7 @@ CDEPEND="
 	tokyocabinet? ( dev-db/tokyocabinet )
 	gnutls? ( >=net-libs/gnutls-1.0.17:= )
 	gpgme? ( >=app-crypt/gpgme-1.13.1:= )
+	autocrypt? ( >=dev-db/sqlite-3 )
 	idn? ( net-dns/libidn:= )
 	kerberos? ( virtual/krb5 )
 	notmuch? ( net-mail/notmuch:= )
@@ -80,6 +83,7 @@ src_configure() {
 		"$(use_enable nls)"
 		"$(use_enable notmuch)"
 
+		"$(use_enable autocrypt)"
 		"$(use_enable gpgme)"
 		"$(use_enable pgp-classic pgp)"
 		"$(use_enable smime-classic smime)"
@@ -145,4 +149,9 @@ pkg_postinst() {
 		ewarn "  and smime-classic (old smime) from your USE-flags and"
 		ewarn "  only enable gpgme."
 	fi
+
+	if use autocrypt && ! use idn; then
+		ewarn "  It is highly recommended that NeoMutt be also configured"
+		ewarn "  with idn when autocrypt is enabled."
+	fi
 }