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 | 383c9b6d2d8f7909b636cc67e8a4a304340fc410 (patch) | |
| tree | 0f45005f6b67677f5935875d2c8e8efce5b65e04 /mail-mta/msmtp | |
| parent | Remove old. (diff) | |
| download | historical-383c9b6d2d8f7909b636cc67e8a4a304340fc410.tar.gz historical-383c9b6d2d8f7909b636cc67e8a4a304340fc410.tar.bz2 historical-383c9b6d2d8f7909b636cc67e8a4a304340fc410.zip | |
Wrap gnutls use flag around ssl one.
Package-Manager: portage-2.2.0_alpha67/cvs/Linux x86_64
Diffstat (limited to 'mail-mta/msmtp')
| -rw-r--r-- | mail-mta/msmtp/ChangeLog | 5 | ||||
| -rw-r--r-- | mail-mta/msmtp/Manifest | 18 | ||||
| -rw-r--r-- | mail-mta/msmtp/msmtp-1.4.25.ebuild | 19 |
3 files changed, 21 insertions, 21 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/Manifest b/mail-mta/msmtp/Manifest index 214dfd096ddc..ec5a3773fb79 100644 --- a/mail-mta/msmtp/Manifest +++ b/mail-mta/msmtp/Manifest @@ -5,17 +5,17 @@ DIST msmtp-1.4.24.tar.bz2 299358 RMD160 5d342818bbbeee303c071a403fd86d40404ed5c2 DIST msmtp-1.4.25.tar.bz2 302039 RMD160 4c74b9e939424015c4a474268273a264e9f3c1bd SHA1 ee3be4e250cbd6fef2fb14af4eadfc0ce58ef424 SHA256 65796adf60e1ebb4341f8415bd3cfa6647226bdba5fbaa5af7bc369808ab4e63 EBUILD msmtp-1.4.24-r1.ebuild 2862 RMD160 de3cb68448e1adbe58d18b9dcf871dd45be87044 SHA1 a9216f5fccf6fdab1f692298cde97b04ae4a6243 SHA256 cdb4d510a0bde3e23e34d58f07c1ab1969bedf584416b9c9e5c2c3c00e423a83 EBUILD msmtp-1.4.24.ebuild 2790 RMD160 9cf3aa6e8b758e522cdb76ef48872117dfaee709 SHA1 71c2470497b4f125b0c40555399fa33b089959af SHA256 d2933dd1ec4b6c30c448df29064c74552af1f9cc20e3d7bf941a06f208efb5d8 -EBUILD msmtp-1.4.25.ebuild 2867 RMD160 c4f19b99e7f94cea8882a685d2dd1a417b401403 SHA1 4b8b392d688dcd5b0eb99aaa5939749798da3b9f SHA256 9081b84be2d39fbaa55ea811f7b6f296bf7298539c5a59352a98b01c12947d80 -MISC ChangeLog 15068 RMD160 d54e851097f264c4df9182f157dc8e3ceccc83de SHA1 f76e6b94841fb61033a74794a3a599a40fc63e40 SHA256 29ae27f82cf8fd07e8cdf28c0817c5136c99389252d886a960e4e49f9eb01de3 +EBUILD msmtp-1.4.25.ebuild 2838 RMD160 889d412de52c6afea2a8fa0e4d4c8ef63138b148 SHA1 28d9cc08322a5796399ffc012f7f8ad5a57b718e SHA256 379466bff2f322461edd1ebe9c74511fe2160b15e84de445e99799740e88f0f3 +MISC ChangeLog 15178 RMD160 9db8939fd9ad70bf903b32da9cd2a3a99d4b0cd8 SHA1 93773179c94b3ab1a93bfb243b24afdb183bc925 SHA256 cc22b74cbb125b6aee7deab9d63390dc084c01f1d1172032b8b65ce48b001ebe MISC metadata.xml 241 RMD160 f3ecce2785b4dbd86fc2454197c5ea18bdceeb8e SHA1 0c8829739037990f3a2c342f959eb734eeabefc7 SHA256 26ee4bda381b79a28729c310bdd467e2d1bbf39f08e271c5845e969d95d0e889 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBCgAGBQJOm2qTAAoJEEqz6FtPBkyjhxkH/ipjP0Q6B7O1IzjXNHgSBBTm -/iJAVC8u3fx/T08FsXvp+NuAGZPaS9E71OEx1EFoR055T3v9PahShcMlqKVp0xT1 -/bHfopOnb+2PkOAQ6YxjGafePxft9yVk3pOl/55QPDVQ5SjNRK1DnV+bg40/FvWL -bK0ojNQs2heMjpol2c2fvzQhX7pktsy+QffX0Ovi2pzi022uGvp6oloXW+RhtgP/ -UWZYqHEiYYrnYJNJdKCi+iv98hEZMMYXLumdxwZcq7ajgsrIN5ZJqhsi23zN0cmw -m0aEW7DTVuDtRzcktoohgoGBOtIqDvst46iU974NUPYS7w4gJQ7RUMeosJffwgo= -=aJfG +iQEcBAEBCgAGBQJOm2/GAAoJEEqz6FtPBkyjTPoH/1brpPPhQKB6+HMbMFXcipxp +s8GMJVmfNcOP+oQsYpZDim3kWqXoe7VKV1wAbu8HwB0IGZf7vywTlnyHXsH4pxkH +YSB8rI0wYcXU498ccw1psdfdAddwmWSAZqr/5/cOgRAvx3ffol4lgpe7ryZyFqpp +giQRFT1H9DuHadfHad9RWwzWhg5LpUGZP7fjKhAJPnbWKHFCOxW4xannSNJIXN0c +dFZO88iL049OYydpJYSH3Kf3JmBO6+V/MqNQTpTcRWthUVpkc+Svgf/PRK3i6E2Z +FV9tcv5B5v6Z69aNAVkAZsddImeI+vh4KN+Ikmtu4qNdjJmdBmibhI2/rGRdOdY= +=umar -----END PGP SIGNATURE----- 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 ) \ |