| 1 |
commit: cabe45dd2022018d042102ad38cd074bb980f3ec |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Feb 2 15:44:07 2017 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 2 15:44:20 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cabe45dd |
| 7 |
|
| 8 |
mail-client/mutt: turn USE=ssl into generic ssl selector, thanks Hendrik v. Raven for the initial patch in bug #607826 |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.3 |
| 11 |
|
| 12 |
mail-client/mutt/mutt-1.7.2-r2.ebuild | 26 +++++++++++++++----------- |
| 13 |
1 file changed, 15 insertions(+), 11 deletions(-) |
| 14 |
|
| 15 |
diff --git a/mail-client/mutt/mutt-1.7.2-r2.ebuild b/mail-client/mutt/mutt-1.7.2-r2.ebuild |
| 16 |
index 6b3f972..5dd4514 100644 |
| 17 |
--- a/mail-client/mutt/mutt-1.7.2-r2.ebuild |
| 18 |
+++ b/mail-client/mutt/mutt-1.7.2-r2.ebuild |
| 19 |
@@ -18,11 +18,11 @@ SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz |
| 20 |
IUSE="berkdb crypt debug doc gdbm gnutls gpg +hcache idn imap kerberos libressl lmdb mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet vanilla" |
| 21 |
REQUIRED_USE=" |
| 22 |
hcache? ( ^^ ( berkdb gdbm lmdb qdbm tokyocabinet ) ) |
| 23 |
- imap? ( ^^ ( ssl gnutls libressl ) ) |
| 24 |
- pop? ( ^^ ( ssl gnutls libressl ) ) |
| 25 |
- nntp? ( ^^ ( ssl gnutls libressl ) ) |
| 26 |
- smime? ( ^^ ( ssl libressl ) ) |
| 27 |
- smtp? ( ^^ ( ssl gnutls libressl ) ) |
| 28 |
+ imap? ( ssl ) |
| 29 |
+ pop? ( ssl ) |
| 30 |
+ nntp? ( ssl ) |
| 31 |
+ smime? ( ssl !gnutls ) |
| 32 |
+ smtp? ( ssl ) |
| 33 |
sasl? ( || ( imap pop smtp nntp ) ) |
| 34 |
kerberos? ( || ( imap pop smtp nntp ) )" |
| 35 |
SLOT="0" |
| 36 |
@@ -37,9 +37,13 @@ CDEPEND=" |
| 37 |
qdbm? ( dev-db/qdbm ) |
| 38 |
tokyocabinet? ( dev-db/tokyocabinet ) |
| 39 |
|
| 40 |
- gnutls? ( >=net-libs/gnutls-1.0.17:= ) |
| 41 |
- libressl? ( dev-libs/libressl:= ) |
| 42 |
- ssl? ( >=dev-libs/openssl-0.9.6:0= ) |
| 43 |
+ ssl? ( |
| 44 |
+ gnutls? ( >=net-libs/gnutls-1.0.17:= ) |
| 45 |
+ !gnutls? ( |
| 46 |
+ libressl? ( dev-libs/libressl:= ) |
| 47 |
+ !libressl? ( >=dev-libs/openssl-0.9.6:0= ) |
| 48 |
+ ) |
| 49 |
+ ) |
| 50 |
|
| 51 |
nls? ( virtual/libintl ) |
| 52 |
sasl? ( >=dev-libs/cyrus-sasl-2 ) |
| 53 |
@@ -123,9 +127,9 @@ src_configure() { |
| 54 |
"$(use_enable nntp)" |
| 55 |
"$(use_enable smtp)" |
| 56 |
|
| 57 |
- "$(use_with gnutls)" |
| 58 |
- "$(use libressl || use ssl && echo --with-ssl)" |
| 59 |
- "$(use !libressl && use !ssl && echo --without-ssl)" |
| 60 |
+ $(use ssl && use gnutls && echo --with-gnutls --without-ssl) |
| 61 |
+ $(use ssl && use !gnutls && echo --without-gnutls --with-ssl ) |
| 62 |
+ $(use !ssl && echo --without-gnutls --without-ssl) |
| 63 |
|
| 64 |
"$(use_with idn)" |
| 65 |
"$(use_with kerberos gss)" |
Archives