Version bump, remove the old mailer.eclass version. Stabilise 1.4.7 on amd64.

(Portage version: 2.1.2_rc3-r8)
 (Signed Manifest commit)

3 files changed, 27 insertions, 82 deletions

diff --git a/mail-mta/msmtp/Manifest b/mail-mta/msmtp/Manifest
index 3a8fa6649e74..861567345941 100644
--- a/mail-mta/msmtp/Manifest
+++ b/mail-mta/msmtp/Manifest
@@ -11,6 +11,7 @@ DIST msmtp-1.4.2.tar.bz2 479968 RMD160 5eb94d6fd9ae01b836ae7fdb8293f48ee6c861f2
 DIST msmtp-1.4.4.tar.bz2 480904 RMD160 c83018a31815e031cd1b34bceb71862fb7a5399f SHA1 2b8437bb613a4054f51e94f4a6a4784b2abe3458 SHA256 758018cc0887cb88ed60cd8540c1c97dc20bc03bc817453df323111a60a20287
 DIST msmtp-1.4.5.tar.bz2 489336 RMD160 21428a4d7c93da8383fe8f752b224dd2c0aff014 SHA1 2734c4b0ab50d221c6c8248cdafc4af6ee0f6cf5 SHA256 b026edeaef477f839e9672a7a6b36fbd4a1199aae06617f5fea22ad85cdbf342
 DIST msmtp-1.4.7.tar.bz2 527853 RMD160 7affd5a339a865638437e093d4e3aba5b6addbcf SHA1 0e907a2269babe5eeb04e5aa8b766b13c8ab714e SHA256 e795dc62a98c9e83ecaea3d1dde074156228cf55eff42f8dbfd835cabad28d89
+DIST msmtp-1.4.9.tar.bz2 534510 RMD160 3113edd2efb9839b1ca7ed8a6ac5760b5a9523cb SHA1 bff79c69e667df55fadb80d49cd4f263c410a4ae SHA256 ef7aa594fa4b5a2093be2bde4b4d2d288121906173435464478abdc82b39af3d
 EBUILD msmtp-1.4.0.ebuild 1577 RMD160 32ae437f61db2866a67cd77118cafc2e6d538e60 SHA1 23724f94f03c25758352c6456f25e2e02b02d3fc SHA256 9460990c4951f13bc44ebb5e55d44b01c1ed40e48e9621af7e307f35ca5cdf6e
 MD5 5c397704ff67b621ff79fc18fd846e0b msmtp-1.4.0.ebuild 1577
 RMD160 32ae437f61db2866a67cd77118cafc2e6d538e60 msmtp-1.4.0.ebuild 1577
@@ -31,18 +32,22 @@ EBUILD msmtp-1.4.5.ebuild 1651 RMD160 9e07a62d29dcdfd9c801c8986553a9d74e464611 S
 MD5 d6e3f267b3cebba83da9ae3efdfb52d6 msmtp-1.4.5.ebuild 1651
 RMD160 9e07a62d29dcdfd9c801c8986553a9d74e464611 msmtp-1.4.5.ebuild 1651
 SHA256 fced5701d8faa4ad10b383c2c3326148f16a5115809834e505c15ce4483d1f7b msmtp-1.4.5.ebuild 1651
-EBUILD msmtp-1.4.7-r1.ebuild 1503 RMD160 68a7aa3ce99ab891f2c5f02ac1cb12cda14e2298 SHA1 8e803f51f0eab8d568e42e5ae2d726b945f0b85d SHA256 edbe7ac239ee8e93f0dbe0f7bbbaf8ba007b987e9bf18249178d254ac1131b8b
-MD5 95d64a4db62aab663e8c36b0965b6c5f msmtp-1.4.7-r1.ebuild 1503
-RMD160 68a7aa3ce99ab891f2c5f02ac1cb12cda14e2298 msmtp-1.4.7-r1.ebuild 1503
-SHA256 edbe7ac239ee8e93f0dbe0f7bbbaf8ba007b987e9bf18249178d254ac1131b8b msmtp-1.4.7-r1.ebuild 1503
-EBUILD msmtp-1.4.7.ebuild 1653 RMD160 0d2381b3829259ef3e7d29e54fe1b1013e07b468 SHA1 0ce31af2672db4f6b1e2a8c868f594ac53198901 SHA256 a6a2b9f1a9cb89a16aa82dd8308abb7869de820dbd0fcc584207b79c2ab5dbd1
-MD5 6f5b248e2b0f846c6b30e5d6b9354faf msmtp-1.4.7.ebuild 1653
-RMD160 0d2381b3829259ef3e7d29e54fe1b1013e07b468 msmtp-1.4.7.ebuild 1653
-SHA256 a6a2b9f1a9cb89a16aa82dd8308abb7869de820dbd0fcc584207b79c2ab5dbd1 msmtp-1.4.7.ebuild 1653
-MISC ChangeLog 8571 RMD160 ea2113fc555e66ed39da32d3be1fa26fb4b89d4e SHA1 343ba2e4d94516190f0b82e55816fc3810c13513 SHA256 e6727ba3a4ab172368407caa50fc85d21cf76dbd212c827be0e6a42bcfc7eff1
-MD5 8be3782cec773f7fac3bcbf80693de27 ChangeLog 8571
-RMD160 ea2113fc555e66ed39da32d3be1fa26fb4b89d4e ChangeLog 8571
-SHA256 e6727ba3a4ab172368407caa50fc85d21cf76dbd212c827be0e6a42bcfc7eff1 ChangeLog 8571
+EBUILD msmtp-1.4.7.ebuild 1652 RMD160 ef2f8cf72044faebaf686ee2b26d482ea7d739ee SHA1 5bf1ac7514b315fc2fd90b3e66823acc60c3d2cd SHA256 a8404be74e933ea0adf9f7b4d6cf08b34a1d94cc754c26185c1750c9ae335b45
+MD5 9b5ec6c7237e5fc838ad7af715c38b3e msmtp-1.4.7.ebuild 1652
+RMD160 ef2f8cf72044faebaf686ee2b26d482ea7d739ee msmtp-1.4.7.ebuild 1652
+SHA256 a8404be74e933ea0adf9f7b4d6cf08b34a1d94cc754c26185c1750c9ae335b45 msmtp-1.4.7.ebuild 1652
+EBUILD msmtp-1.4.9-r1.ebuild 1503 RMD160 07f3cead09947d32067b6c50d3d9471308982dbb SHA1 73f5a74c154fef097a3d7d684cb83a8fe03d929c SHA256 301503b020f00719be1ca2dc2a71ef0c82a089d920295d78f31748a05768053e
+MD5 e6bf40f4c5328edb8955fa403a375eec msmtp-1.4.9-r1.ebuild 1503
+RMD160 07f3cead09947d32067b6c50d3d9471308982dbb msmtp-1.4.9-r1.ebuild 1503
+SHA256 301503b020f00719be1ca2dc2a71ef0c82a089d920295d78f31748a05768053e msmtp-1.4.9-r1.ebuild 1503
+EBUILD msmtp-1.4.9.ebuild 1653 RMD160 ebcceb6bfec46ba06a562acf472cbd4ea82f4702 SHA1 3d520d833719a5d7c9bc6dfa5864680ddc62162a SHA256 5e73dad3126e360b70a7e1640ec31f10dcf156682a3880afde2b13b2a5689948
+MD5 f607e5a8f986bfc4ecbc75115b565c9e msmtp-1.4.9.ebuild 1653
+RMD160 ebcceb6bfec46ba06a562acf472cbd4ea82f4702 msmtp-1.4.9.ebuild 1653
+SHA256 5e73dad3126e360b70a7e1640ec31f10dcf156682a3880afde2b13b2a5689948 msmtp-1.4.9.ebuild 1653
+MISC ChangeLog 8847 RMD160 b852b81661ece07d7e0e31dd61cb8570845ef649 SHA1 3fe96bda108e0ff625a02ef455ecf9b328897101 SHA256 ee665fb54272e553beabd2364c0801fab137554695f74f4383341c1f0f581585
+MD5 195da6eab04b5dbee3cb0cc91edf5d44 ChangeLog 8847
+RMD160 b852b81661ece07d7e0e31dd61cb8570845ef649 ChangeLog 8847
+SHA256 ee665fb54272e553beabd2364c0801fab137554695f74f4383341c1f0f581585 ChangeLog 8847
 MISC metadata.xml 247 RMD160 fe9516509814dc390bb977a446e153d4e0427e29 SHA1 a3fa3ff155f3ddff32b09fcb2811756d236f4c44 SHA256 ab134d428beb6b7dfd91fb1084814ea9ace6b509c88201366dd2a5a4f6cd73b5
 MD5 570c3b91cefa46a71ea570343906ccc3 metadata.xml 247
 RMD160 fe9516509814dc390bb977a446e153d4e0427e29 metadata.xml 247
@@ -65,13 +70,16 @@ SHA256 3455b49fc5d162da0c512c9faf2e5013f4d826d703fddc30b6ca94b3869f276e files/di
 MD5 fccadc769f6d65ee692309bd121cd389 files/digest-msmtp-1.4.7 238
 RMD160 86b4ae0fa6e0cfc189f33981644a1a01fcad027c files/digest-msmtp-1.4.7 238
 SHA256 e47d1a54edaca1f728f5df66089df4aca25de695337a78970c5682912f3ca579 files/digest-msmtp-1.4.7 238
-MD5 fccadc769f6d65ee692309bd121cd389 files/digest-msmtp-1.4.7-r1 238
-RMD160 86b4ae0fa6e0cfc189f33981644a1a01fcad027c files/digest-msmtp-1.4.7-r1 238
-SHA256 e47d1a54edaca1f728f5df66089df4aca25de695337a78970c5682912f3ca579 files/digest-msmtp-1.4.7-r1 238
+MD5 1dfd69832469c7541224d572c72a4b87 files/digest-msmtp-1.4.9 238
+RMD160 cf7fe80dbf9491f819a2899767e10af83a8ce6f7 files/digest-msmtp-1.4.9 238
+SHA256 0ea74732c8a6df3d0fddee2fd51f85e018a16044ef07de9f6688b25da9de99ad files/digest-msmtp-1.4.9 238
+MD5 1dfd69832469c7541224d572c72a4b87 files/digest-msmtp-1.4.9-r1 238
+RMD160 cf7fe80dbf9491f819a2899767e10af83a8ce6f7 files/digest-msmtp-1.4.9-r1 238
+SHA256 0ea74732c8a6df3d0fddee2fd51f85e018a16044ef07de9f6688b25da9de99ad files/digest-msmtp-1.4.9-r1 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFAbf3CHk4+ZoBpvsRAs8pAJ48pMAsQLnOguaYujZZjS7uxXQnMACdFCt6
-irfcoD4wgbuW9iBjfK3gAEw=
-=H9b8
+iD8DBQFFiXvfCHk4+ZoBpvsRAn1HAJ9TaOk9q2u5E2ZZHWZWbTAFrgVLswCgq4oQ
+qxbZM4RvRJX2UTVrqu0aTDg=
+=u4Wm
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/msmtp/files/digest-msmtp-1.4.7-r1 b/mail-mta/msmtp/files/digest-msmtp-1.4.7-r1
deleted file mode 100644
index fbe773181305..000000000000
--- a/mail-mta/msmtp/files/digest-msmtp-1.4.7-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9c87a1f40e05dae4896622b56ec71b56 msmtp-1.4.7.tar.bz2 527853
-RMD160 7affd5a339a865638437e093d4e3aba5b6addbcf msmtp-1.4.7.tar.bz2 527853
-SHA256 e795dc62a98c9e83ecaea3d1dde074156228cf55eff42f8dbfd835cabad28d89 msmtp-1.4.7.tar.bz2 527853
diff --git a/mail-mta/msmtp/msmtp-1.4.7-r1.ebuild b/mail-mta/msmtp/msmtp-1.4.7-r1.ebuild
deleted file mode 100644
index 79b7ae13b9d8..000000000000
--- a/mail-mta/msmtp/msmtp-1.4.7-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/msmtp-1.4.7-r1.ebuild,v 1.1 2006/09/08 18:35:25 slarti Exp $
-
-inherit mailer
-
-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-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ssl gnutls sasl doc nls"
-DEPEND="virtual/libc
-	dev-util/pkgconfig
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-1.2.0 )
-		!gnutls? ( >=dev-libs/openssl-0.9.6 )
-	)
-	sasl? ( >=virtual/gsasl-0.2.4 )
-	nls? ( sys-devel/gettext )"
-
-src_compile () {
-	local myconf
-
-	if use ssl && use gnutls ; then
-		myconf="${myconf} --enable-ssl --with-ssl=gnutls"
-	elif use ssl && ! use gnutls ; then
-		myconf="${myconf} --enable-ssl --with-ssl=openssl"
-	else
-		myconf="${myconf} --disable-ssl"
-	fi
-
-	econf \
-		$(use_enable sasl gsasl) \
-		$(use_enable nls) \
-		${myconf} \
-		|| die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install () {
-	make DESTDIR=${D} install || die "install failed"
-
-	if use mailwrapper ; then
-		mailer_install_conf
-	else
-		dodir /usr/sbin
-		dosym /usr/bin/msmtp /usr/sbin/sendmail || die "dosym failed"
-	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
-}