diff options
| author |   Tim Harder <radhermit@gentoo.org> | 2011-10-16 23:58:56 +0000 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2011-10-16 23:58:56 +0000 |
| commit | 78e1be0f7b896a286a3aca79592b95617359ebb8 (patch) | |
| tree | 87797a48391610ba73a25c9ac0f6fe7395a0708d /mail-mta | |
| parent | Remove old. (diff) | |
| download | gentoo-2-78e1be0f7b896a286a3aca79592b95617359ebb8.tar.gz gentoo-2-78e1be0f7b896a286a3aca79592b95617359ebb8.tar.bz2 gentoo-2-78e1be0f7b896a286a3aca79592b95617359ebb8.zip | |
Wrap gnutls use flag around ssl one.
(Portage version: 2.2.0_alpha67/cvs/Linux x86_64)
Diffstat (limited to 'mail-mta')
| -rw-r--r-- | mail-mta/msmtp/ChangeLog | 5 | ||||
| -rw-r--r-- | mail-mta/msmtp/msmtp-1.4.25.ebuild | 19 |
2 files changed, 12 insertions, 12 deletions
diff --git a/mail-mta/msmtp/ChangeLog b/mail-mta/msmtp/ChangeLog index a51a31163572..bf0f2865a817 100644 --- a/mail-mta/msmtp/ChangeLog +++ b/mail-mta/msmtp/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for mail-mta/msmtp # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/ChangeLog,v 1.110 2011/10/16 23:36:46 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/ChangeLog,v 1.111 2011/10/16 23:58:56 radhermit Exp $ + + 16 Oct 2011; Tim Harder <radhermit@gentoo.org> msmtp-1.4.25.ebuild: + Wrap gnutls use flag around ssl one. 16 Oct 2011; Tim Harder <radhermit@gentoo.org> -msmtp-1.4.23.ebuild: Remove old. diff --git a/mail-mta/msmtp/msmtp-1.4.25.ebuild b/mail-mta/msmtp/msmtp-1.4.25.ebuild index 672aabca8ad2..f8b54b97ab27 100644 --- a/mail-mta/msmtp/msmtp-1.4.25.ebuild +++ b/mail-mta/msmtp/msmtp-1.4.25.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/msmtp-1.4.25.ebuild,v 1.1 2011/10/16 23:35:06 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/msmtp-1.4.25.ebuild,v 1.2 2011/10/16 23:58:56 radhermit Exp $ EAPI=4 inherit multilib @@ -20,8 +20,10 @@ CDEPEND="idn? ( net-dns/libidn ) gnome-base/gnome-keyring dev-python/gnome-keyring-python ) - gnutls? ( >=net-libs/gnutls-1.2.0 ) - !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) + ssl? ( + gnutls? ( >=net-libs/gnutls-1.2.0 ) + !gnutls? ( >=dev-libs/openssl-0.9.6 ) + ) sasl? ( >=virtual/gsasl-0.2.4 )" RDEPEND="${CDEPEND} @@ -43,6 +45,8 @@ DEPEND="${CDEPEND} nls? ( sys-devel/gettext ) dev-util/pkgconfig" +REQUIRED_USE="gnutls? ( ssl )" + src_prepare() { # Use default Gentoo location for mail aliases sed -i -e 's:/etc/aliases:/etc/mail/aliases:' scripts/find_alias/find_alias_for_msmtp.sh @@ -51,15 +55,8 @@ src_prepare() { src_configure() { local myconf - if use gnutls ; then - myconf="--with-ssl=gnutls" - elif use ssl ; then - myconf="--with-ssl=openssl" - else - myconf="--with-ssl=no" - fi - econf \ + $(use_with ssl ssl $(use gnutls && echo "gnutls" || echo "openssl")) \ $(use_with idn libidn) \ $(use_with sasl libgsasl) \ $(use_with gnome-keyring ) \ |