From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6D879139085 for ; Thu, 2 Feb 2017 15:44:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A2B10E0D6B; Thu, 2 Feb 2017 15:44:26 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 7D0DBE0D6B for ; Thu, 2 Feb 2017 15:44:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 986F7340A23 for ; Thu, 2 Feb 2017 15:44:25 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D90F73B9E for ; Thu, 2 Feb 2017 15:44:23 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1486050260.cabe45dd2022018d042102ad38cd074bb980f3ec.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/ X-VCS-Repository: repo/gentoo X-VCS-Files: mail-client/mutt/mutt-1.7.2-r2.ebuild X-VCS-Directories: mail-client/mutt/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: cabe45dd2022018d042102ad38cd074bb980f3ec X-VCS-Branch: master Date: Thu, 2 Feb 2017 15:44:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5acc09a6-27ed-4077-8d18-9fbdd8f92b56 X-Archives-Hash: 02628f064b25017590cf6ba4711f3014 commit: cabe45dd2022018d042102ad38cd074bb980f3ec Author: Fabian Groffen gentoo org> AuthorDate: Thu Feb 2 15:44:07 2017 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Thu Feb 2 15:44:20 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cabe45dd mail-client/mutt: turn USE=ssl into generic ssl selector, thanks Hendrik v. Raven for the initial patch in bug #607826 Package-Manager: portage-2.3.3 mail-client/mutt/mutt-1.7.2-r2.ebuild | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/mail-client/mutt/mutt-1.7.2-r2.ebuild b/mail-client/mutt/mutt-1.7.2-r2.ebuild index 6b3f972..5dd4514 100644 --- a/mail-client/mutt/mutt-1.7.2-r2.ebuild +++ b/mail-client/mutt/mutt-1.7.2-r2.ebuild @@ -18,11 +18,11 @@ SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz 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" REQUIRED_USE=" hcache? ( ^^ ( berkdb gdbm lmdb qdbm tokyocabinet ) ) - imap? ( ^^ ( ssl gnutls libressl ) ) - pop? ( ^^ ( ssl gnutls libressl ) ) - nntp? ( ^^ ( ssl gnutls libressl ) ) - smime? ( ^^ ( ssl libressl ) ) - smtp? ( ^^ ( ssl gnutls libressl ) ) + imap? ( ssl ) + pop? ( ssl ) + nntp? ( ssl ) + smime? ( ssl !gnutls ) + smtp? ( ssl ) sasl? ( || ( imap pop smtp nntp ) ) kerberos? ( || ( imap pop smtp nntp ) )" SLOT="0" @@ -37,9 +37,13 @@ CDEPEND=" qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) - gnutls? ( >=net-libs/gnutls-1.0.17:= ) - libressl? ( dev-libs/libressl:= ) - ssl? ( >=dev-libs/openssl-0.9.6:0= ) + ssl? ( + gnutls? ( >=net-libs/gnutls-1.0.17:= ) + !gnutls? ( + libressl? ( dev-libs/libressl:= ) + !libressl? ( >=dev-libs/openssl-0.9.6:0= ) + ) + ) nls? ( virtual/libintl ) sasl? ( >=dev-libs/cyrus-sasl-2 ) @@ -123,9 +127,9 @@ src_configure() { "$(use_enable nntp)" "$(use_enable smtp)" - "$(use_with gnutls)" - "$(use libressl || use ssl && echo --with-ssl)" - "$(use !libressl && use !ssl && echo --without-ssl)" + $(use ssl && use gnutls && echo --with-gnutls --without-ssl) + $(use ssl && use !gnutls && echo --without-gnutls --with-ssl ) + $(use !ssl && echo --without-gnutls --without-ssl) "$(use_with idn)" "$(use_with kerberos gss)"