mail-client/mutt-1.14.0-r1: revbump to enable USE=autocrypt support

Closes: https://bugs.gentoo.org/722874
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Fabian Groffen <grobian@gentoo.org>

2 files changed, 17 insertions, 3 deletions

diff --git a/mail-client/mutt/metadata.xml b/mail-client/mutt/metadata.xml
index 6d9a60c2d6f6..f418ce80a681 100644
--- a/mail-client/mutt/metadata.xml
+++ b/mail-client/mutt/metadata.xml
@@ -5,6 +5,7 @@
 		<email>grobian@gentoo.org</email>
 	</maintainer>
 	<use>
+		<flag name="autocrypt">Enable autocrypt.org support</flag>
 		<flag name="berkdb">Enable <pkg>sys-libs/db</pkg> database backend
 			for header caching</flag>
 		<flag name="gdbm">Enable <pkg>sys-libs/gdbm</pkg> database backend
diff --git a/mail-client/mutt/mutt-1.14.0.ebuild b/mail-client/mutt/mutt-1.14.0-r1.ebuild
index 45ba49cadf86..655ecdfe2af2 100644
--- a/mail-client/mutt/mutt-1.14.0.ebuild
+++ b/mail-client/mutt/mutt-1.14.0-r1.ebuild
@@ -14,7 +14,7 @@ MUTT_G_PATCHES="mutt-gentoo-${PV}-patches-${PATCHREV}.tar.xz"
 SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
 	https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
 	https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}"
-IUSE="berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix"
+IUSE="autocrypt berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix"
 # hcache: allow multiple, bug #607360
 REQUIRED_USE="
 	hcache?           ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) )
@@ -23,7 +23,8 @@ REQUIRED_USE="
 	smime-classic?    ( ssl !gnutls )
 	smtp?             ( ssl sasl )
 	sasl?             ( || ( imap pop smtp ) )
-	kerberos?         ( || ( imap pop smtp ) )"
+	kerberos?         ( || ( imap pop smtp ) )
+	autocrypt?        ( gpgme )"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
@@ -52,6 +53,7 @@ CDEPEND="
 	kerberos?      ( virtual/krb5 )
 	idn?           ( net-dns/libidn2 )
 	gpgme?         ( >=app-crypt/gpgme-0.9.0:= )
+	autocrypt?     ( >=dev-db/sqlite-3 )
 	slang?         ( sys-libs/slang )
 	!slang?        ( >=sys-libs/ncurses-5.2:0= )
 "
@@ -118,6 +120,7 @@ src_prepare() {
 src_configure() {
 	local myconf=(
 		# signing and encryption
+		$(use_enable autocrypt) $(use_with autocrypt sqlite3)
 		$(use_enable pgp-classic pgp)
 		$(use_enable smime-classic smime)
 		$(use_enable gpgme)
@@ -215,7 +218,7 @@ src_install() {
 	} >> "${ED}"/etc/${PN}/Muttrc
 
 	# add setting to actually enable gpgme usage
-	if use gpgme ; then
+	if use gpgme || use autocrypt ; then
 		{
 		echo
 		echo "# this setting enables the gpgme backend (via USE=gpgme)"
@@ -225,6 +228,16 @@ src_install() {
 		} >> "${ED}"/etc/${PN}/Muttrc
 	fi
 
+	# similar for autocrypt
+	if use autocrypt ; then
+		{
+			echo
+			echo "# enables autocrypt (via USE=autocrypt)"
+			echo "# see http://www.mutt.org/doc/manual/#autocryptdoc"
+			echo "set autocrypt = yes"
+		} >> "${ED}"/etc/${PN}/Muttrc
+	fi
+
 	# A newer file is provided by app-misc/mime-types. So we link it.
 	rm "${ED}"/etc/${PN}/mime.types
 	dosym ../mime.types /etc/${PN}/mime.types