Version bump to 1.4.4. Same deal with the mailer.eclass -r1. Purged older versions with mailer.eclass support: mailer-config remains package.masked.

(Portage version: 2.0.51.22-r2)

10 files changed, 31 insertions, 83 deletions

diff --git a/mail-mta/msmtp/ChangeLog b/mail-mta/msmtp/ChangeLog
index c82cc4979215..849caf951969 100644
--- a/mail-mta/msmtp/ChangeLog
+++ b/mail-mta/msmtp/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for mail-mta/msmtp
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/ChangeLog,v 1.53 2005/07/08 11:50:05 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/ChangeLog,v 1.54 2005/08/21 19:25:43 slarti Exp $
+
+*msmtp-1.4.4-r1 (21 Aug 2005)
+*msmtp-1.4.4 (21 Aug 2005)
+
+  21 Aug 2005; Tom Martin <slarti@gentoo.org> -msmtp-1.4.0-r1.ebuild,
+  -msmtp-1.4.1-r1.ebuild, -msmtp-1.4.2-r1.ebuild, +msmtp-1.4.4.ebuild,
+  +msmtp-1.4.4-r1.ebuild:
+  Version bump to 1.4.4. Same deal with the mailer.eclass -r1. Purged older
+  versions with mailer.eclass support: mailer-config remains package.masked.
 
 *msmtp-1.4.2-r1 (08 Jul 2005)
 *msmtp-1.4.2 (08 Jul 2005)
diff --git a/mail-mta/msmtp/Manifest b/mail-mta/msmtp/Manifest
index 55e50c4ee46a..fb7f0971b1f1 100644
--- a/mail-mta/msmtp/Manifest
+++ b/mail-mta/msmtp/Manifest
@@ -1,6 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 d3d8db2bc3cbc59500fb927d49a220e9 msmtp-1.4.4.ebuild 1642
 MD5 93e4e18188d6ac927f3cbf954edbcedc ChangeLog 7004
 MD5 d3d8db2bc3cbc59500fb927d49a220e9 msmtp-1.4.2.ebuild 1642
 MD5 404078b247e91c7fc1a8b31e27d2499f msmtp-1.4.1.ebuild 1588
@@ -8,18 +6,14 @@ MD5 bbd2e5a566630b2bbc9480199beeb94d msmtp-1.4.2-r1.ebuild 1503
 MD5 53276ec211c2e0a77e3e15390ca837e2 msmtp-1.4.1-r1.ebuild 1449
 MD5 570c3b91cefa46a71ea570343906ccc3 metadata.xml 247
 MD5 5c397704ff67b621ff79fc18fd846e0b msmtp-1.4.0.ebuild 1577
+MD5 bbd2e5a566630b2bbc9480199beeb94d msmtp-1.4.4-r1.ebuild 1503
 MD5 76f50a1c193917903564978a2bfc016a msmtp-1.4.0-r1.ebuild 1452
 MD5 8cad534b9a1023f85c08ce257788e9f5 files/digest-msmtp-1.4.2 64
+MD5 9342393963c7890c28d5c26730cf6ffd files/digest-msmtp-1.4.4 64
 MD5 5c7a9806b21c53c30d4c0181956371c9 files/digest-msmtp-1.4.0-r1 64
 MD5 8cad534b9a1023f85c08ce257788e9f5 files/digest-msmtp-1.4.2-r1 64
 MD5 5c7a9806b21c53c30d4c0181956371c9 files/digest-msmtp-1.4.0 64
+MD5 9342393963c7890c28d5c26730cf6ffd files/digest-msmtp-1.4.4-r1 64
 MD5 d48ce2f5a0c821e44160dcaa26e0dff8 files/digest-msmtp-1.4.1-r1 64
 MD5 d48ce2f5a0c821e44160dcaa26e0dff8 files/digest-msmtp-1.4.1 64
 MD5 25a1f06b39d5ecd451afeccad46678c6 files/mailer.conf 279
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCzmiOCHk4+ZoBpvsRAmSlAKCWds/vWoeiDPt57cKV9TPpYS0emACfXkHu
-XM+77l5PfK5VwSDRneGPta8=
-=gJIO
------END PGP SIGNATURE-----
diff --git a/mail-mta/msmtp/files/digest-msmtp-1.4.0-r1 b/mail-mta/msmtp/files/digest-msmtp-1.4.0-r1
deleted file mode 100644
index 60348e036cb0..000000000000
--- a/mail-mta/msmtp/files/digest-msmtp-1.4.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 07af3a34f61cb533ab45d35e3c7163fd msmtp-1.4.0.tar.bz2 404850
diff --git a/mail-mta/msmtp/files/digest-msmtp-1.4.1-r1 b/mail-mta/msmtp/files/digest-msmtp-1.4.1-r1
deleted file mode 100644
index 1b9b85576791..000000000000
--- a/mail-mta/msmtp/files/digest-msmtp-1.4.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 32693654b966bfe2d6b568a2bb4bb125 msmtp-1.4.1.tar.bz2 405884
diff --git a/mail-mta/msmtp/files/digest-msmtp-1.4.2-r1 b/mail-mta/msmtp/files/digest-msmtp-1.4.2-r1
deleted file mode 100644
index ac70e368103c..000000000000
--- a/mail-mta/msmtp/files/digest-msmtp-1.4.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3db095102259103e4eb48fc0c7d21618 msmtp-1.4.2.tar.bz2 479968
diff --git a/mail-mta/msmtp/files/digest-msmtp-1.4.4 b/mail-mta/msmtp/files/digest-msmtp-1.4.4
new file mode 100644
index 000000000000..2b9ed26d59e2
--- /dev/null
+++ b/mail-mta/msmtp/files/digest-msmtp-1.4.4
@@ -0,0 +1 @@
+MD5 34b31619a61462d9f2dd4f59720cf05e msmtp-1.4.4.tar.bz2 480904
diff --git a/mail-mta/msmtp/files/digest-msmtp-1.4.4-r1 b/mail-mta/msmtp/files/digest-msmtp-1.4.4-r1
new file mode 100644
index 000000000000..2b9ed26d59e2
--- /dev/null
+++ b/mail-mta/msmtp/files/digest-msmtp-1.4.4-r1
@@ -0,0 +1 @@
+MD5 34b31619a61462d9f2dd4f59720cf05e msmtp-1.4.4.tar.bz2 480904
diff --git a/mail-mta/msmtp/msmtp-1.4.0-r1.ebuild b/mail-mta/msmtp/msmtp-1.4.0-r1.ebuild
deleted file mode 100644
index 4b8e15772d9d..000000000000
--- a/mail-mta/msmtp/msmtp-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/msmtp-1.4.0-r1.ebuild,v 1.2 2005/04/29 22:47:37 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="~x86 ~ppc ~amd64 ~sparc ~ppc64 ~alpha"
-IUSE="ssl gnutls sasl doc"
-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 )"
-
-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) \
-		${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 /usr/lib
-		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
-}
diff --git a/mail-mta/msmtp/msmtp-1.4.2-r1.ebuild b/mail-mta/msmtp/msmtp-1.4.4-r1.ebuild
index fa17f09b5d9b..c9e3aa944498 100644
--- a/mail-mta/msmtp/msmtp-1.4.2-r1.ebuild
+++ b/mail-mta/msmtp/msmtp-1.4.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/msmtp-1.4.2-r1.ebuild,v 1.1 2005/07/08 11:50:05 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/msmtp-1.4.4-r1.ebuild,v 1.1 2005/08/21 19:25:43 slarti Exp $
 
 inherit mailer
 
diff --git a/mail-mta/msmtp/msmtp-1.4.1-r1.ebuild b/mail-mta/msmtp/msmtp-1.4.4.ebuild
index 1a267ee6947b..43c323a27d27 100644
--- a/mail-mta/msmtp/msmtp-1.4.1-r1.ebuild
+++ b/mail-mta/msmtp/msmtp-1.4.4.ebuild
@@ -1,23 +1,25 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/msmtp-1.4.1-r1.ebuild,v 1.3 2005/07/05 20:51:39 slarti Exp $
-
-inherit mailer
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/msmtp-1.4.4.ebuild,v 1.1 2005/08/21 19:25:43 slarti Exp $
 
 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"
+IUSE="ssl gnutls sasl mailwrapper doc nls"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ssl gnutls sasl doc"
 DEPEND="virtual/libc
 	dev-util/pkgconfig
 	ssl? (
 		gnutls? ( >=net-libs/gnutls-1.2.0 )
-		!gnutls? ( >=dev-libs/openssl-0.9.6 )
+		!gnutls?  ( >=dev-libs/openssl-0.9.6 )
 	)
-	sasl? ( >=virtual/gsasl-0.2.4 )"
+	sasl? ( >=virtual/gsasl-0.2.4 )
+	nls? ( sys-devel/gettext )"
+RDEPEND="mailwrapper? ( >=net-mail/mailwrapper-0.2 )
+	!mailwrapper? ( !virtual/mta )"
+PROVIDE="virtual/mta"
 
 src_compile () {
 	local myconf
@@ -32,8 +34,9 @@ src_compile () {
 
 	econf \
 		$(use_enable sasl gsasl) \
+		$(use_enable nls) \
 		${myconf} \
-		|| die "configure failed"
+	|| die "configure failed"
 
 	emake || die "make failed"
 }
@@ -41,10 +44,11 @@ src_compile () {
 src_install () {
 	make DESTDIR=${D} install || die "install failed"
 
-	if use mailwrapper ; then
-		mailer_install_conf
+	if use mailwrapper; then
+		insinto /etc/mail
+		doins ${FILESDIR}/mailer.conf
 	else
-		dodir /usr/sbin
+		dodir /usr/sbin /usr/lib
 		dosym /usr/bin/msmtp /usr/sbin/sendmail || die "dosym failed"
 	fi