[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

["Amadeusz Piotr Żołnowski" <aidecoe@gentoo.org>]

commit:     9cdfbeb940dabdd1d2088752b761e12c605e6efa
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Tue May 31 21:29:22 2016 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Tue May 31 22:10:38 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cdfbeb9

net-mail/notmuch: Correct dependencies related to S/MIME support

gnupg must be installed only if crypt flag is enabled, because crypt
related tests are run when this gnupg commands can be found. The same
applies to smime flag of gmime which pulls gnupg.

Package-Manager: portage-2.3.0_rc1

 net-mail/notmuch/metadata.xml        | 3 ++-
 net-mail/notmuch/notmuch-0.22.ebuild | 8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/net-mail/notmuch/metadata.xml b/net-mail/notmuch/metadata.xml
index 564970f..d476d72 100644
--- a/net-mail/notmuch/metadata.xml
+++ b/net-mail/notmuch/metadata.xml
@@ -8,7 +8,8 @@
 	<use>
 		<flag name="doc">Install API documentation for enabled bindings</flag>
 		<flag name="crypt">Support decryption and verification of PGP/MIME
-			messages and in Emacs UI - encryption</flag>
+			messages and in Emacs UI - encryption; support also S/MIME
+			signature verification since version 0.22</flag>
 		<flag name="emacs">Install Emacs UI (the main one)</flag>
 		<flag name="mutt">Install helper script for Mutt</flag>
 		<flag name="nmbug">Install experimental tag sharing /

diff --git a/net-mail/notmuch/notmuch-0.22.ebuild b/net-mail/notmuch/notmuch-0.22.ebuild
index 1cf92ce..9357a32 100644
--- a/net-mail/notmuch/notmuch-0.22.ebuild
+++ b/net-mail/notmuch/notmuch-0.22.ebuild
@@ -29,11 +29,13 @@ IUSE="crypt debug doc emacs mutt nmbug python test"
 CDEPEND="
 	>=app-shells/bash-completion-1.9
 	>=dev-libs/glib-2.22:2
-	>=dev-libs/gmime-2.6.20:2.6
+	>=dev-libs/gmime-2.6.20-r2:2.6
 	>=dev-libs/xapian-1.2.7-r2:=
 	dev-python/sphinx[${PYTHON_USEDEP}]
 	>=sys-libs/zlib-1.2.5.2
 	sys-libs/talloc
+	crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
+	!crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[-smime] )
 	debug? ( dev-util/valgrind )
 	emacs? ( >=virtual/emacs-23 )
 	python? ( ${PYTHON_DEPS} )
@@ -42,10 +44,12 @@ DEPEND="${CDEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
-		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb )
+		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
+		crypt? ( dev-libs/openssl ) )
 	"
 RDEPEND="${CDEPEND}
 	crypt? ( app-crypt/gnupg )
+	!crypt? ( !app-crypt/gnupg )
 	nmbug? ( dev-vcs/git )
 	mutt? ( dev-perl/File-Which dev-perl/Mail-Box dev-perl/MailTools
 		dev-perl/String-ShellQuote dev-perl/Term-ReadLine-Gnu