Version bump thanks to Alec M. (bug #327967).

Package-Manager: portage-2.2_rc67/cvs/Linux i686

diff --git a/mail-mta/msmtp/ChangeLog b/mail-mta/msmtp/ChangeLog
index bb5f7c6d85f849ad628f4555686d6b7b1336dd94..7c4969a7647f7385ea06d4631a5a937b0273cb96 100644 (file)
--- a/mail-mta/msmtp/ChangeLog
+++ b/mail-mta/msmtp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-mta/msmtp
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/ChangeLog,v 1.84 2010/07/12 17:33:09 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/ChangeLog,v 1.85 2010/07/12 23:31:59 jer Exp $
+
+*msmtp-1.4.21 (12 Jul 2010)
+
+  12 Jul 2010; Jeroen Roovers <jer@gentoo.org> +msmtp-1.4.21.ebuild:
+  Version bump thanks to Alec M. (bug #327967).
 
   12 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> msmtp-1.4.20.ebuild,
   +files/msmtp-1.4.20-openssl-1.patch:

diff --git a/mail-mta/msmtp/Manifest b/mail-mta/msmtp/Manifest
index eb816b6d7e81687bc456f37819e1292f948675f8..72f77282737d09cc7990b1dae6b5a0511c559263 100644 (file)
--- a/mail-mta/msmtp/Manifest
+++ b/mail-mta/msmtp/Manifest
@@ -2,8 +2,10 @@ AUX mailer.conf 279 RMD160 1814eab17a6810a29a2b3c30ec3a69741fe40902 SHA1 90864ba
 AUX msmtp-1.4.20-openssl-1.patch 771 RMD160 90b11b1fb0b69ac98455bac63b7bb7a826da6493 SHA1 41cec2164a639f1e0de1e6e08897b5b9e4210371 SHA256 6b458656931d7103dd9ef24c3424faded30a205ec6b387aa0d3703d20a6d8472
 DIST msmtp-1.4.19.tar.bz2 820041 RMD160 1fd6bdf71aed9b8e939203ef59e499feedd63d64 SHA1 4491891326e8accacc02b1d4e7176262222122d0 SHA256 d6bf3f6f796041fc7d6653c022cc696238fdf8b2d538c4b2cd6c0aae5f056c66
 DIST msmtp-1.4.20.tar.bz2 845014 RMD160 5594473abcf25d77157d2410ebb26abec5197c25 SHA1 6668ed503b6647365358b8dd821535b1ff9e2c15 SHA256 328abd95370c6a5a9ea2fd38b55fc50d6fb3b03d96b3da40de2441650d53ebdb
+DIST msmtp-1.4.21.tar.bz2 947451 RMD160 047605c85e0abe4ea8d3d01dc99cd75bbf33e3d0 SHA1 40aabe0c65b8f31d402b2429581178e15f8bfe90 SHA256 2fb39be54d793882081d38ec2b709f6dc1aa4c124f5f244e111a0b604df14ffa
 EBUILD msmtp-1.4.19-r1.ebuild 2708 RMD160 7687da6036a9c2aa864733b60954abd020752c52 SHA1 2644ba0d8ad175e3f267b5ce356c96af5a77bfc5 SHA256 5e5da02c8207926d2c121e6fe8e2a2f8632a98205389c39da22348501dbcb320
 EBUILD msmtp-1.4.19.ebuild 1977 RMD160 f9f4ac94069bec8ce5b8b8345091f174cff24ec3 SHA1 189cd91ba8b94d9fe1bce1ee4cee2ad9de485738 SHA256 81f2edd77a98b6344b1b1beaffc13325336cd98d49c0dbe0f8f8a5e3f4f48b24
 EBUILD msmtp-1.4.20.ebuild 2780 RMD160 da4fe2b4e49142b2864644d4de99ce9d008b133b SHA1 922d9ba176b7a2f5bbed57eb898c7aa487478b7a SHA256 e0b034e0e98a46b313bf63a95cdd1aa9b49cc61c8aaf54e7df17c1e3a96c457c
-MISC ChangeLog 11887 RMD160 18ae35f0087fc845751fc6f8e9892f356ebbf526 SHA1 077cf9e92a0622cab37c2c65e7576879f91a522b SHA256 5495d0cf040fd7f747ee178ef946debf246b7da58d933cefb9cd0da52a7af12e
+EBUILD msmtp-1.4.21.ebuild 2712 RMD160 a89fae689237cf2ed15a6d01281bc6ceee3da214 SHA1 eb0527c01319ef4f260c39810c8aa9460023f884 SHA256 1475934eb2333cc6d9dbca78de4e2b5900f146e8bf53d1b8c28b7c3df40ad409
+MISC ChangeLog 12028 RMD160 a4febbd821128bd06d2d64b35d4fa72bb7765616 SHA1 2cdf0ecf90e1fb099bf2acbc71115dd1247bb601 SHA256 be605d4e01919c21c5954b1ab43dce1708a87a823b29ea64462219523f30602f
 MISC metadata.xml 241 RMD160 f3ecce2785b4dbd86fc2454197c5ea18bdceeb8e SHA1 0c8829739037990f3a2c342f959eb734eeabefc7 SHA256 26ee4bda381b79a28729c310bdd467e2d1bbf39f08e271c5845e969d95d0e889

diff --git a/mail-mta/msmtp/msmtp-1.4.21.ebuild b/mail-mta/msmtp/msmtp-1.4.21.ebuild
new file mode 100644 (file)
index 0000000..5f8736e
--- /dev/null
+++ b/mail-mta/msmtp/msmtp-1.4.21.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/msmtp-1.4.21.ebuild,v 1.1 2010/07/12 23:31:59 jer Exp $
+
+EAPI=2
+inherit eutils
+
+DESCRIPTION="An SMTP client and SMTP plugin for mail user agents such as Mutt"
+HOMEPAGE="http://msmtp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/msmtp/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc gnome-keyring gnutls idn mailwrapper nls sasl ssl +mta"
+
+DEPEND="idn? ( net-dns/libidn )
+       nls? ( virtual/libintl )
+       gnome-keyring? ( gnome-base/gnome-keyring )
+       gnutls? ( >=net-libs/gnutls-1.2.0 )
+       !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
+       sasl? ( >=virtual/gsasl-0.2.4 )"
+
+RDEPEND="${DEPEND}
+       mta? (
+               !mailwrapper? ( !virtual/mta )
+               mailwrapper? ( >=net-mail/mailwrapper-0.2 )
+       )"
+
+DEPEND="${DEPEND}
+       nls? ( sys-devel/gettext )
+       dev-util/pkgconfig"
+
+PROVIDE="mta? ( virtual/mta )"
+
+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 idn libidn) \
+               $(use_with sasl libgsasl) \
+               $(use_with gnome-keyring ) \
+               $(use_enable nls) \
+               ${myconf}
+}
+
+src_install() {
+       emake DESTDIR="${D}" install || die "install failed"
+
+       if use mta; then
+               if use mailwrapper ; then
+                       insinto /etc/mail
+                       doins "${FILESDIR}"/mailer.conf
+               else
+                       dodir /usr/sbin
+                       dosym /usr/bin/msmtp /usr/sbin/sendmail || die "dosym failed"
+               fi
+       fi
+
+       dodoc AUTHORS ChangeLog NEWS README THANKS \
+               doc/{Mutt+msmtp.txt,msmtprc*} || die "dodoc failed"
+
+       if use doc ; then
+               dohtml doc/msmtp.html || die "dohtml failed"
+               dodoc doc/msmtp.pdf
+       fi
+
+       #d=msmtpqueue
+       #local msmtpqueue=/usr/share/${PN}/$d
+       #insinto ${msmtpqueue}
+       #exeinto ${msmtpqueue}
+       #doexe scripts/msmtpqueue/*.sh || die "doexe failed"
+       #for i in ChangeLog README ; do
+       #       newdoc scripts/msmtpqueue/$i msmtpqueue.$i \
+       #               || die "dodoc scripts/msmtpqueue/$i failed"
+       #done
+
+       #d=msmtpq
+       #local msmtpq=/usr/share/${PN}/$d
+       #insinto ${msmtpqueue}
+       #exeinto ${msmtpqueue}
+       #i=README
+       #newdoc scripts/$d/$i $d.$i \
+       #       || die "dodoc scripts/$d/$i failed"
+
+       src_install_contrib msmtpqueue "*.sh" "README ChangeLog"
+       src_install_contrib msmtpq "msmtpq msmtpQ" "README"
+
+}
+
+src_install_contrib() {
+       subdir="$1"
+       bins="$2"
+       docs="$3"
+       local dir=/usr/share/${PN}/$subdir
+       insinto ${dir}
+       exeinto ${dir}
+       for i in $bins ; do
+               doexe scripts/$subdir/$i || die "doexe $subdir/$i failed"
+       done
+       for i in $docs ; do
+               newdoc scripts/$subdir/$i $subdir.$i \
+                       || die "dodoc $subdir/$i failed"
+       done
+}