From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-885343-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id 0C53913829C
	for <garchives@archives.gentoo.org>; Fri,  3 Jun 2016 21:33:06 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 5164B254022;
	Fri,  3 Jun 2016 21:33:05 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id E660C25402A
	for <gentoo-commits@lists.gentoo.org>; Fri,  3 Jun 2016 21:33:04 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 81653340C6F
	for <gentoo-commits@lists.gentoo.org>; Fri,  3 Jun 2016 21:33:03 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id DEFB5984
	for <gentoo-commits@lists.gentoo.org>; Fri,  3 Jun 2016 21:32:59 +0000 (UTC)
From: "Amadeusz Piotr Żołnowski" <aidecoe@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Amadeusz Piotr Żołnowski" <aidecoe@gentoo.org>
Message-ID: <1464989426.2ba58f85d7005cbcd997f1a3be246cf4009c261c.aidecoe@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-mail/notmuch/notmuch-0.22-r1.ebuild
X-VCS-Directories: net-mail/notmuch/
X-VCS-Committer: aidecoe
X-VCS-Committer-Name: Amadeusz Piotr Żołnowski
X-VCS-Revision: 2ba58f85d7005cbcd997f1a3be246cf4009c261c
X-VCS-Branch: master
Date: Fri,  3 Jun 2016 21:32:59 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 2b239570-0cc3-4712-80bc-b50e3defb769
X-Archives-Hash: 33eee39e3f9236acb197c0b94dab884f

commit:     2ba58f85d7005cbcd997f1a3be246cf4009c261c
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  3 21:27:47 2016 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Fri Jun  3 21:30:26 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ba58f85

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

 net-mail/notmuch/notmuch-0.22-r1.ebuild | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/net-mail/notmuch/notmuch-0.22-r1.ebuild b/net-mail/notmuch/notmuch-0.22-r1.ebuild
index 9357a32..41765a4 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 )