From 9cdfbeb940dabdd1d2088752b761e12c605e6efa Mon Sep 17 00:00:00 2001 From: =?utf8?q?Amadeusz=20=C5=BBo=C5=82nowski?= Date: Tue, 31 May 2016 22:29:22 +0100 Subject: [PATCH] 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 564970f5df0f..d476d7235ac2 100644 --- a/net-mail/notmuch/metadata.xml +++ b/net-mail/notmuch/metadata.xml @@ -8,7 +8,8 @@ Install API documentation for enabled bindings Support decryption and verification of PGP/MIME - messages and in Emacs UI - encryption + messages and in Emacs UI - encryption; support also S/MIME + signature verification since version 0.22 Install Emacs UI (the main one) Install helper script for Mutt Install experimental tag sharing / diff --git a/net-mail/notmuch/notmuch-0.22.ebuild b/net-mail/notmuch/notmuch-0.22.ebuild index 1cf92ced966a..9357a32bed7c 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 -- 2.26.2