Version bump (#187065) and cleaning.

Package-Manager: portage-2.1.4.4

11 files changed, 99 insertions, 327 deletions

diff --git a/mail-mta/msmtp/ChangeLog b/mail-mta/msmtp/ChangeLog
index ca6405415073..1ba3e10cdd04 100644
--- a/mail-mta/msmtp/ChangeLog
+++ b/mail-mta/msmtp/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-mta/msmtp
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/ChangeLog,v 1.69 2008/01/14 20:59:21 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/ChangeLog,v 1.70 2008/03/22 14:51:06 tove Exp $
+
+*msmtp-1.4.14 (22 Mar 2008)
+
+  22 Mar 2008; Torsten Veller <tove@gentoo.org> -msmtp-1.4.0.ebuild,
+  -msmtp-1.4.1.ebuild, -msmtp-1.4.2.ebuild, -msmtp-1.4.4.ebuild,
+  msmtp-1.4.5.ebuild, msmtp-1.4.7.ebuild, msmtp-1.4.9.ebuild,
+  -msmtp-1.4.9-r1.ebuild, +msmtp-1.4.14.ebuild:
+  Version bump (#187065) and cleaning.
 
   14 Jan 2008; Fabian Groffen <grobian@gentoo.org> msmtp-1.4.5.ebuild,
   msmtp-1.4.7.ebuild, msmtp-1.4.9.ebuild:
diff --git a/mail-mta/msmtp/Manifest b/mail-mta/msmtp/Manifest
index de847e2d26c4..701669442371 100644
--- a/mail-mta/msmtp/Manifest
+++ b/mail-mta/msmtp/Manifest
@@ -1,18 +1,11 @@
 AUX mailer.conf 279 RMD160 1814eab17a6810a29a2b3c30ec3a69741fe40902 SHA1 90864ba7b1a44327abb47d54aadd4448b33e52d5 SHA256 f7be36c6d4957cdafcf5162dd5e766fbe269eed25135bc61af02883896b4c25f
-DIST msmtp-1.4.0.tar.bz2 404850 RMD160 394b962b4c554b04757b1917ecd733972a2792f4 SHA1 b3b202883831d62d53d8cc7347fe5b654d6ed38f SHA256 6291b3f9326c061bacf972a01357ce30bd7e8cdf5c61dac01bc0b8a3f8b506cc
-DIST msmtp-1.4.1.tar.bz2 405884 RMD160 17e6b36aaa77d4ad61cda61992f5a29baa551103 SHA1 015a4dbfb9aae261f0907e9c953e10af1d82d75c SHA256 52e72c58490a0091408a5d745cf08cd2c56f6665c5a45c73e313ca5842148a7e
-DIST msmtp-1.4.2.tar.bz2 479968 RMD160 5eb94d6fd9ae01b836ae7fdb8293f48ee6c861f2 SHA1 305076f7e14e5234cc7485f880e6cd6fd7fa0925 SHA256 70dbc8b5ea742613181eb40220cc2d0cff6bf4ce63d210480c0d151ab4a19125
-DIST msmtp-1.4.4.tar.bz2 480904 RMD160 c83018a31815e031cd1b34bceb71862fb7a5399f SHA1 2b8437bb613a4054f51e94f4a6a4784b2abe3458 SHA256 758018cc0887cb88ed60cd8540c1c97dc20bc03bc817453df323111a60a20287
+DIST msmtp-1.4.14.tar.bz2 721839 RMD160 c9fbdcead39a213bb21b81bf14414f1c62b8c679 SHA1 f42403348a3c7dd3ca802714915aab8f90142381 SHA256 e805994f72ce0d8b54d86f65b3cca034f9a0fd21bec9c12cbf26c2ad20309345
 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
-EBUILD msmtp-1.4.1.ebuild 1588 RMD160 e3a2913ffa1527e8865efd38490d30c59a504c3e SHA1 b396253205de15553c205db76559dcfe86fbd204 SHA256 aa3a49c76d3cfe277300b9415bc6e524cf87d1a760d1e2b67fa0d48d1953c6d7
-EBUILD msmtp-1.4.2.ebuild 1640 RMD160 2bd07f9c194c03050b857774e2b0078327521ab8 SHA1 27131cae48bccccdeafa03a453489d3741644133 SHA256 3812fa77c48a77331c52118f0fb456ede7f8bf434e2c3794907dcefd21eba144
-EBUILD msmtp-1.4.4.ebuild 1642 RMD160 d5b01f7a27d5151243d63eef94fe3216de96b66f SHA1 09ff6585beceb01b21bb129b5f4ab88f5fb78bb3 SHA256 87779b61878b70e3184fd9e4946859551f01206f7760641f4897921af06c5a44
-EBUILD msmtp-1.4.5.ebuild 1641 RMD160 e62ef77c18fbba94830e351623dbea35ab558432 SHA1 2fe2289c0602f665e449388819e339d4e88d29a9 SHA256 c1024135467043aa6647c6d77686614dcd60ee889d9d410b866b07c4651b372f
-EBUILD msmtp-1.4.7.ebuild 1638 RMD160 5c424ca57c035167b6d1e7392a08896922071b05 SHA1 7a6c13ecf710dd92697f1162c52574be767e215a SHA256 be33d65d3b8d843a1c031cded7436e027180e3f4a01944898954eba73bb84c22
-EBUILD msmtp-1.4.9-r1.ebuild 1503 RMD160 07f3cead09947d32067b6c50d3d9471308982dbb SHA1 73f5a74c154fef097a3d7d684cb83a8fe03d929c SHA256 301503b020f00719be1ca2dc2a71ef0c82a089d920295d78f31748a05768053e
-EBUILD msmtp-1.4.9.ebuild 1643 RMD160 5a6f83b8b1ee35c9ed8972ad5af477bdf8d1315b SHA1 608148d35a148239884e94012d5eb7e8ce49b44c SHA256 59cf712f8ff3e46a2d434f7196fea106cd8c9069ca20bf6df56178c3a5154814
-MISC ChangeLog 9513 RMD160 757209a839f88c6c34e279081e711230753bfb75 SHA1 d9ad2d232115a74987a75f5b82239f2f642e5f4c SHA256 f348d0fe1b95ab568026980d897979a9502d25df7553972d8bbb516cbfc4534f
+EBUILD msmtp-1.4.14.ebuild 1895 RMD160 fadbb481954862ea9aba8eb3c33da4bd9abb71d4 SHA1 9a2bb208bd2b3ccd21d9fa7326016d78b42731b7 SHA256 0f05afd9423e01bde5a2708fbc52579704989f60f9ae118192ced2c2020af287
+EBUILD msmtp-1.4.5.ebuild 1642 RMD160 6f763f7213b5fb549c65305efedf890f845fbbe2 SHA1 c792710151375d570ed460307851bf5d374acbba SHA256 d19990283c3b81e245a04c5ba3a34eb18a9d8069889cb31a20cfd0f521a37b1f
+EBUILD msmtp-1.4.7.ebuild 1639 RMD160 c6670c97e26f1270b64333ec79b75951d4f288a6 SHA1 3da6982c30fa569b7f3ac69b38de01245b5e061d SHA256 37fca6ea96932de4fc22e3b7e1a9bdb85b335d9917677ad4bd40f82737e84943
+EBUILD msmtp-1.4.9.ebuild 1644 RMD160 d4b37da01e528650a6a56d10f7eed483a817777e SHA1 5e183a95d72a9caa3f38d6883030690b9ac0756d SHA256 1e0e306171f82355a571c0443abfe771c16fa73bd9a39fde30bc709ee71603a2
+MISC ChangeLog 9823 RMD160 0fca69d364679c1ae78223bbe28aa0ec8e9f7d9b SHA1 644b0b3f39506f44de0d93dea19d7aa474c3bfd0 SHA256 86c42c66884d6f9cbc7b989dc6fdb56121b6ac40f0c61521ca5aee7ffd9995d9
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
diff --git a/mail-mta/msmtp/msmtp-1.4.0.ebuild b/mail-mta/msmtp/msmtp-1.4.0.ebuild
deleted file mode 100644
index 1a7393094546..000000000000
--- a/mail-mta/msmtp/msmtp-1.4.0.ebuild
+++ /dev/null
@@ -1,60 +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.ebuild,v 1.9 2005/05/02 19:40:57 hansmi 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"
-SLOT="0"
-KEYWORDS="x86 ppc amd64 sparc ppc64 ~alpha"
-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 )"
-RDEPEND="mailwrapper? ( >=net-mail/mailwrapper-0.2 )
-	!mailwrapper? ( !virtual/mta )"
-PROVIDE="virtual/mta"
-
-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
-		insinto /etc/mail
-		doins ${FILESDIR}/mailer.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.1.ebuild b/mail-mta/msmtp/msmtp-1.4.1.ebuild
deleted file mode 100644
index ccf1a1b3087e..000000000000
--- a/mail-mta/msmtp/msmtp-1.4.1.ebuild
+++ /dev/null
@@ -1,60 +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.1.ebuild,v 1.2 2005/07/05 20:51:39 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"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-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 )"
-RDEPEND="mailwrapper? ( >=net-mail/mailwrapper-0.2 )
-	!mailwrapper? ( !virtual/mta )"
-PROVIDE="virtual/mta"
-
-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
-		insinto /etc/mail
-		doins ${FILESDIR}/mailer.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.14.ebuild b/mail-mta/msmtp/msmtp-1.4.14.ebuild
new file mode 100644
index 000000000000..1d7191a318e6
--- /dev/null
+++ b/mail-mta/msmtp/msmtp-1.4.14.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/msmtp-1.4.14.ebuild,v 1.1 2008/03/22 14:51:06 tove 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-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc gnutls idn mailwrapper nls sasl ssl"
+
+DEPEND="idn? ( net-dns/libidn )
+	nls? ( virtual/libintl )
+	gnutls? ( >=net-libs/gnutls-1.2.0 )
+	!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
+	sasl? ( >=virtual/gsasl-0.2.4 )"
+
+RDEPEND="${DEPEND}
+	!mailwrapper? ( !virtual/mta )
+	mailwrapper? ( >=net-mail/mailwrapper-0.2 )"
+
+DEPEND="${DEPEND}
+	nls? ( sys-devel/gettext )
+	dev-util/pkgconfig"
+
+PROVIDE="virtual/mta"
+
+src_compile () {
+	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_enable nls) \
+		${myconf} \
+		|| die "configure failed"
+
+	emake || die "make failed"
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "install failed"
+
+	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
+
+	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
+
+	local msmtpqueuedir=/usr/share/${PN}/msmtpqueue
+	insinto ${msmtpqueuedir}
+	exeinto ${msmtpqueuedir}
+	doins scripts/msmtpqueue/{ChangeLog,README} || die "dodoc scripts/msmtpqueue failed"
+	doexe scripts/msmtpqueue/*.sh || die "doexe failed"
+}
diff --git a/mail-mta/msmtp/msmtp-1.4.2.ebuild b/mail-mta/msmtp/msmtp-1.4.2.ebuild
deleted file mode 100644
index 12b005ac15dc..000000000000
--- a/mail-mta/msmtp/msmtp-1.4.2.ebuild
+++ /dev/null
@@ -1,62 +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.2.ebuild,v 1.4 2005/10/02 14:48:58 agriffis 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"
-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 )"
-RDEPEND="mailwrapper? ( >=net-mail/mailwrapper-0.2 )
-	!mailwrapper? ( !virtual/mta )"
-PROVIDE="virtual/mta"
-
-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
-		insinto /etc/mail
-		doins ${FILESDIR}/mailer.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.4.ebuild b/mail-mta/msmtp/msmtp-1.4.4.ebuild
deleted file mode 100644
index 43c323a27d27..000000000000
--- a/mail-mta/msmtp/msmtp-1.4.4.ebuild
+++ /dev/null
@@ -1,62 +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.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"
-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 )"
-RDEPEND="mailwrapper? ( >=net-mail/mailwrapper-0.2 )
-	!mailwrapper? ( !virtual/mta )"
-PROVIDE="virtual/mta"
-
-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
-		insinto /etc/mail
-		doins ${FILESDIR}/mailer.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.5.ebuild b/mail-mta/msmtp/msmtp-1.4.5.ebuild
index fff717e8bb3d..7217c7fe1f88 100644
--- a/mail-mta/msmtp/msmtp-1.4.5.ebuild
+++ b/mail-mta/msmtp/msmtp-1.4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/msmtp-1.4.5.ebuild,v 1.5 2008/01/14 20:59:21 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/msmtp-1.4.5.ebuild,v 1.6 2008/03/22 14:51:06 tove Exp $
 
 DESCRIPTION="An SMTP client and SMTP plugin for mail user agents such as Mutt"
 HOMEPAGE="http://msmtp.sourceforge.net/"
@@ -42,11 +42,11 @@ src_compile () {
 }
 
 src_install () {
-	make DESTDIR=${D} install || die "install failed"
+	make DESTDIR="${D}" install || die "install failed"
 
 	if use mailwrapper; then
 		insinto /etc/mail
-		doins ${FILESDIR}/mailer.conf
+		doins "${FILESDIR}"/mailer.conf
 	else
 		dodir /usr/sbin /usr/lib
 		dosym /usr/bin/msmtp /usr/sbin/sendmail || die "dosym failed"
diff --git a/mail-mta/msmtp/msmtp-1.4.7.ebuild b/mail-mta/msmtp/msmtp-1.4.7.ebuild
index cb9544905c0e..ebddee4e4669 100644
--- a/mail-mta/msmtp/msmtp-1.4.7.ebuild
+++ b/mail-mta/msmtp/msmtp-1.4.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.ebuild,v 1.7 2008/01/14 20:59:21 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/msmtp-1.4.7.ebuild,v 1.8 2008/03/22 14:51:06 tove Exp $
 
 DESCRIPTION="An SMTP client and SMTP plugin for mail user agents such as Mutt"
 HOMEPAGE="http://msmtp.sourceforge.net/"
@@ -42,11 +42,11 @@ src_compile () {
 }
 
 src_install () {
-	make DESTDIR=${D} install || die "install failed"
+	make DESTDIR="${D}" install || die "install failed"
 
 	if use mailwrapper; then
 		insinto /etc/mail
-		doins ${FILESDIR}/mailer.conf
+		doins "${FILESDIR}"/mailer.conf
 	else
 		dodir /usr/sbin /usr/lib
 		dosym /usr/bin/msmtp /usr/sbin/sendmail || die "dosym failed"
diff --git a/mail-mta/msmtp/msmtp-1.4.9-r1.ebuild b/mail-mta/msmtp/msmtp-1.4.9-r1.ebuild
deleted file mode 100644
index 2126959e93f4..000000000000
--- a/mail-mta/msmtp/msmtp-1.4.9-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.9-r1.ebuild,v 1.1 2006/12/20 18:07:14 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
-}
diff --git a/mail-mta/msmtp/msmtp-1.4.9.ebuild b/mail-mta/msmtp/msmtp-1.4.9.ebuild
index 5a5cf1d30f4d..be170b33f1c4 100644
--- a/mail-mta/msmtp/msmtp-1.4.9.ebuild
+++ b/mail-mta/msmtp/msmtp-1.4.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/msmtp-1.4.9.ebuild,v 1.2 2008/01/14 20:59:21 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/msmtp-1.4.9.ebuild,v 1.3 2008/03/22 14:51:06 tove Exp $
 
 DESCRIPTION="An SMTP client and SMTP plugin for mail user agents such as Mutt"
 HOMEPAGE="http://msmtp.sourceforge.net/"
@@ -42,11 +42,11 @@ src_compile () {
 }
 
 src_install () {
-	make DESTDIR=${D} install || die "install failed"
+	make DESTDIR="${D}" install || die "install failed"
 
 	if use mailwrapper; then
 		insinto /etc/mail
-		doins ${FILESDIR}/mailer.conf
+		doins "${FILESDIR}"/mailer.conf
 	else
 		dodir /usr/sbin /usr/lib
 		dosym /usr/bin/msmtp /usr/sbin/sendmail || die "dosym failed"