From: Amadeusz Żołnowski <aidecoe@gentoo.org>
Date: Fri, 3 Jun 2016 21:27:47 +0000 (+0100)
Subject: net-mail/notmuch: Don't block app-crypt/gnupg and dev-libs/gmime[smime]
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=2ba58f85d7005cbcd997f1a3be246cf4009c261c;p=gentoo.git

net-mail/notmuch: Don't block app-crypt/gnupg and dev-libs/gmime[smime]

Test fails if GnuPG is installed and GMime is compiled without S/MIME.
This could occur when 'crypt' flag is disabled but GnuPG is installed
anyway. Although test requires 'crypt', therefore this doesn't occur and
blocking anything when particular feature is disabled is not needed.

Package-Manager: portage-2.3.0_rc1
---

diff --git a/net-mail/notmuch/notmuch-0.22-r1.ebuild b/net-mail/notmuch/notmuch-0.22-r1.ebuild
index 9357a32bed7c..41765a44695e 100644
--- a/net-mail/notmuch/notmuch-0.22-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.22-r1.ebuild
@@ -35,7 +35,6 @@ CDEPEND="
 	>=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} )
@@ -45,17 +44,15 @@ DEPEND="${CDEPEND}
 	doc? ( app-doc/doxygen )
 	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
 		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
-		crypt? ( dev-libs/openssl ) )
+		crypt? ( app-crypt/gnupg 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
 		virtual/perl-Digest-SHA virtual/perl-File-Path virtual/perl-Getopt-Long
-		virtual/perl-Pod-Parser
-		)
+		virtual/perl-Pod-Parser )
 	"
 
 DOCS=( AUTHORS NEWS README )