gentoo resync : 12.03.2021

6 files changed, 47 insertions, 10 deletions

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 19309e4d0c6b..f01fb7ca731e 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,8 +1,8 @@
 DIST neomutt-20201127.tar.gz 3456248 BLAKE2B 49d12285e4adfb15cd70f3c6cb06d0d260ccd3f3817ae6902ac5a58105c1fc36f2d6ead3927911b970bf2e72dcd8220340c900c20e011e09ac2159e7c4123987 SHA512 01e45aa00794cfb1c74a45a7f144962c8ab6dee03b0e5ce39a24d0c50817b909cac440a072c5d8b21ee7656c37b77bba4ba818de73710ccc3b0f76fd3ddd71cf
 DIST neomutt-20210205.tar.gz 3476980 BLAKE2B 2b8f07a957d668f0903ae3f48d72e0b00414b9ed0411723bc725cd2369ed16c31e461799a0161f3b6caecb8b3a182a0ad9ca7bbb5431ed9ff67cae5dc87b11e5 SHA512 4e9faaa989eb17d1f65e835d3ad37bbda3307f9a939f351776d4cb4677d856fa998ba0eff04bf0cf344485977077695e07c55e79e0800888f646c46fbfac8554
 DIST neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz 3673 BLAKE2B 50354f19aedc5fc07d59ecb5b38fa65de16119bc0929f47014bd35dab4d3a4e5953c8b35670f3440003cf0cbccc2d0d2b3a869dc929cdc3cd60b02790270fb54 SHA512 3d4962210bc558234d818801dcaa7851a0aef011c96d91c054af535186ffda42059fc61fb148c48e1b076999fe3159b31589a69a29ed1897f8928f52fcc157d3
-EBUILD neomutt-20201127-r1.ebuild 3902 BLAKE2B c319c745a1e5e6e3ac6d8112a15d1e5dad8cbeb351e0248947186d85f5be4d3c8cd7dbb7736e8f9584d7570c5354b544e9096e3cc75b84ffe61b2e912b67b264 SHA512 c50796b7093e7ea8ba4197214f088034b0860af8d10930476ab30b35e53019ed3aff15a3bfa1ea2525dc408dfdaa781c0588b1fe380c24c556c22b12b179a0e8
-EBUILD neomutt-20201127.ebuild 3893 BLAKE2B 4adc997b079b216529697ae0dd46947fcb8a01b068aeff3c8eae4c9e6b48a9151228160a87e159aa96f897c8f636425930507323834862d052730040eb7b66a7 SHA512 1c6caa40884d8c1daeda009ce81098f61acde8c4cef0cfd29c87465f7b7610138c946f5f4e429fe9d81161bca909f476bea08942c4c61d190b5529b8f30c8e1f
-EBUILD neomutt-20210205.ebuild 3902 BLAKE2B 9b5951d022ad3ff9388019308a8420479eb58035008c9af37d56b38d9ba34ef356ec6964b5c8a2944e826fc22183ff569461a11942842c7726ffb8cf81b414f7 SHA512 83fa535f8dcd5db0b9ed4642f2bcb856c357bbb3f0bf51ea56026005d4336c3031f88a5381c1da5eeb597e69db68ffdbcaa6b59d3f2f2af84ccdb8ef0e192c7b
-EBUILD neomutt-99999999.ebuild 3902 BLAKE2B 9b5951d022ad3ff9388019308a8420479eb58035008c9af37d56b38d9ba34ef356ec6964b5c8a2944e826fc22183ff569461a11942842c7726ffb8cf81b414f7 SHA512 83fa535f8dcd5db0b9ed4642f2bcb856c357bbb3f0bf51ea56026005d4336c3031f88a5381c1da5eeb597e69db68ffdbcaa6b59d3f2f2af84ccdb8ef0e192c7b
-MISC metadata.xml 1287 BLAKE2B a60b6e9c0b731c9d42d89cf0992074a0d015ba35bf8153c2f77b27b67b56205f8676afb6d4e477dd6be7de1c7716b463c50ea4850705616452158d7b232b3b52 SHA512 87c81c3f14a4670bc14cbe556d99fec370450f68a757b7c0985f81555692dad9fb966c7b11ffb721942f2193b8de37fb2130fe91be7fcf7d824277c9c54346ed
+EBUILD neomutt-20201127-r1.ebuild 4171 BLAKE2B 52bcc1cbd3a91d1eda6ffdbaa21f2cc55cafbd702c031649b0914c3241eb3e8e4c3d93860f83b5cc01fba4e73b4eae1a83b71c9edccad70844d5ee805bdb9bce SHA512 56e196e19afcb6bbe9e8d13f4b14c677ab2c0c53401455c02b90189320f8c2d0badd0a5a043f8cfa0ee6992650b45bea6b5908a515519c16531bfa1dffe54465
+EBUILD neomutt-20201127.ebuild 4162 BLAKE2B 05d6749456a017f027d4b8fac0eb7c21f23200c70e124fb687afbddc983a36a8e26a275b4b76f739b06ef4725f37068a547cbfb30ab1b2bda17c93157ed24e67 SHA512 3ccf72f597519e8d8f5dc75d0f5d03e3702bc68f6f68db51c7f90352a7aac1be692fe1c7a813644d241a6134900e0848855a4d0eae2e52a61d00e063ed97c2eb
+EBUILD neomutt-20210205.ebuild 4171 BLAKE2B e9819a220da8871e5e37c24ab526b27b41679f50055d0143fdabf645b4cbf5b3d4f50cff491e97ae0d5c970f47aeb0e9f2536934da881e20e1d90f5d517b72dd SHA512 25c3886f180c16ad71cafd9d0a4985c2e359f2f3fc8ca0d746de2491524debfb2ea1f28d90b726883e83408b428bac50ea82bceb0b2285de143ed1ead112d43f
+EBUILD neomutt-99999999.ebuild 4171 BLAKE2B e9819a220da8871e5e37c24ab526b27b41679f50055d0143fdabf645b4cbf5b3d4f50cff491e97ae0d5c970f47aeb0e9f2536934da881e20e1d90f5d517b72dd SHA512 25c3886f180c16ad71cafd9d0a4985c2e359f2f3fc8ca0d746de2491524debfb2ea1f28d90b726883e83408b428bac50ea82bceb0b2285de143ed1ead112d43f
+MISC metadata.xml 1348 BLAKE2B b48dbbae622e7bf2bf2662256564748017713980111a69291b9e3b02e261145c2eac5afd2994ba35d5c18bb9ec6a73ac0018347452a6c9b91d45a49da845ab90 SHA512 215c1b961ee853156e2d7f840cde54f584df868b6d5913fba8ef377b63248d05e1b31a1c024ed1d7a86c05c4362faf77fcca32880cd093fe78d9b404bd7f139e
diff --git a/mail-client/neomutt/metadata.xml b/mail-client/neomutt/metadata.xml
index 2fbef90b636b..59bca7500206 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 863e199daac7..494bea47a6c2 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 2fbecf8b7800..4a1c914f9bb0 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 aec8ac349253..74180642cbc4 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 aec8ac349253..74180642cbc4 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
 }