| 1 |
commit: 9cdfbeb940dabdd1d2088752b761e12c605e6efa |
| 2 |
Author: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 31 21:29:22 2016 +0000 |
| 4 |
Commit: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 31 22:10:38 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cdfbeb9 |
| 7 |
|
| 8 |
net-mail/notmuch: Correct dependencies related to S/MIME support |
| 9 |
|
| 10 |
gnupg must be installed only if crypt flag is enabled, because crypt |
| 11 |
related tests are run when this gnupg commands can be found. The same |
| 12 |
applies to smime flag of gmime which pulls gnupg. |
| 13 |
|
| 14 |
Package-Manager: portage-2.3.0_rc1 |
| 15 |
|
| 16 |
net-mail/notmuch/metadata.xml | 3 ++- |
| 17 |
net-mail/notmuch/notmuch-0.22.ebuild | 8 ++++++-- |
| 18 |
2 files changed, 8 insertions(+), 3 deletions(-) |
| 19 |
|
| 20 |
diff --git a/net-mail/notmuch/metadata.xml b/net-mail/notmuch/metadata.xml |
| 21 |
index 564970f..d476d72 100644 |
| 22 |
--- a/net-mail/notmuch/metadata.xml |
| 23 |
+++ b/net-mail/notmuch/metadata.xml |
| 24 |
@@ -8,7 +8,8 @@ |
| 25 |
<use> |
| 26 |
<flag name="doc">Install API documentation for enabled bindings</flag> |
| 27 |
<flag name="crypt">Support decryption and verification of PGP/MIME |
| 28 |
- messages and in Emacs UI - encryption</flag> |
| 29 |
+ messages and in Emacs UI - encryption; support also S/MIME |
| 30 |
+ signature verification since version 0.22</flag> |
| 31 |
<flag name="emacs">Install Emacs UI (the main one)</flag> |
| 32 |
<flag name="mutt">Install helper script for Mutt</flag> |
| 33 |
<flag name="nmbug">Install experimental tag sharing / |
| 34 |
|
| 35 |
diff --git a/net-mail/notmuch/notmuch-0.22.ebuild b/net-mail/notmuch/notmuch-0.22.ebuild |
| 36 |
index 1cf92ce..9357a32 100644 |
| 37 |
--- a/net-mail/notmuch/notmuch-0.22.ebuild |
| 38 |
+++ b/net-mail/notmuch/notmuch-0.22.ebuild |
| 39 |
@@ -29,11 +29,13 @@ IUSE="crypt debug doc emacs mutt nmbug python test" |
| 40 |
CDEPEND=" |
| 41 |
>=app-shells/bash-completion-1.9 |
| 42 |
>=dev-libs/glib-2.22:2 |
| 43 |
- >=dev-libs/gmime-2.6.20:2.6 |
| 44 |
+ >=dev-libs/gmime-2.6.20-r2:2.6 |
| 45 |
>=dev-libs/xapian-1.2.7-r2:= |
| 46 |
dev-python/sphinx[${PYTHON_USEDEP}] |
| 47 |
>=sys-libs/zlib-1.2.5.2 |
| 48 |
sys-libs/talloc |
| 49 |
+ crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] ) |
| 50 |
+ !crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[-smime] ) |
| 51 |
debug? ( dev-util/valgrind ) |
| 52 |
emacs? ( >=virtual/emacs-23 ) |
| 53 |
python? ( ${PYTHON_DEPS} ) |
| 54 |
@@ -42,10 +44,12 @@ DEPEND="${CDEPEND} |
| 55 |
virtual/pkgconfig |
| 56 |
doc? ( app-doc/doxygen ) |
| 57 |
test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2] |
| 58 |
- >=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb ) |
| 59 |
+ >=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb |
| 60 |
+ crypt? ( dev-libs/openssl ) ) |
| 61 |
" |
| 62 |
RDEPEND="${CDEPEND} |
| 63 |
crypt? ( app-crypt/gnupg ) |
| 64 |
+ !crypt? ( !app-crypt/gnupg ) |
| 65 |
nmbug? ( dev-vcs/git ) |
| 66 |
mutt? ( dev-perl/File-Which dev-perl/Mail-Box dev-perl/MailTools |
| 67 |
dev-perl/String-ShellQuote dev-perl/Term-ReadLine-Gnu |
Archives