Version bump (#187065) and cleaning.

(Portage version: 2.1.4.4)

10 files changed, 93 insertions, 314 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/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"