Version bump (bug #352953). Remove mailwrapper support, add vim-syntax USE flag, install gnome-keyring script (bug #341113), and install find_alias script (bug #349869). Bump to EAPI 3, remove unused eutils eclass, and use CDEPEND for common dependencies.

(Portage version: 2.2.0_alpha19/cvs/Linux x86_64)

2 files changed, 113 insertions, 2 deletions

diff --git a/mail-mta/msmtp/ChangeLog b/mail-mta/msmtp/ChangeLog
index fe5113b3e167..2560bc4df0fc 100644
--- a/mail-mta/msmtp/ChangeLog
+++ b/mail-mta/msmtp/ChangeLog
@@ -1,6 +1,14 @@
 # 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.90 2010/09/28 14:41:12 ranger Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/ChangeLog,v 1.91 2011/01/27 23:08:42 radhermit Exp $
+
+*msmtp-1.4.23 (27 Jan 2011)
+
+  27 Jan 2011; Tim Harder <radhermit@gentoo.org> +msmtp-1.4.23.ebuild:
+  Version bump (bug #352953). Remove mailwrapper support, add vim-syntax USE
+  flag, install gnome-keyring script (bug #341113), and install find_alias
+  script (bug #349869). Bump to EAPI 3, remove unused eutils eclass, and use
+  CDEPEND for common dependencies.
 
   28 Sep 2010; Brent Baude <ranger@gentoo.org> msmtp-1.4.21.ebuild:
   Marking msmtp-1.4.21 ppc for bug 330445
diff --git a/mail-mta/msmtp/msmtp-1.4.23.ebuild b/mail-mta/msmtp/msmtp-1.4.23.ebuild
new file mode 100644
index 000000000000..2c7c85bd6733
--- /dev/null
+++ b/mail-mta/msmtp/msmtp-1.4.23.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/msmtp-1.4.23.ebuild,v 1.1 2011/01/27 23:08:42 radhermit Exp $
+
+EAPI=3
+
+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 +mta nls sasl ssl vim-syntax"
+
+CDEPEND="idn? ( net-dns/libidn )
+	nls? ( virtual/libintl )
+	gnome-keyring? ( gnome-base/gnome-keyring
+		dev-python/gnome-keyring-python )
+	gnutls? ( >=net-libs/gnutls-1.2.0 )
+	!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
+	sasl? ( >=virtual/gsasl-0.2.4 )"
+
+RDEPEND="${CDEPEND}
+	mta? ( !virtual/mta )
+	!net-mail/mailwrapper"
+
+DEPEND="${CDEPEND}
+	nls? ( sys-devel/gettext )
+	dev-util/pkgconfig"
+
+PROVIDE="mta? ( virtual/mta )"
+
+src_prepare() {
+	# Use default Gentoo location for mail aliases
+	sed -i -e 's:/etc/aliases:/etc/mail/aliases:' scripts/find_alias/find_alias_for_msmtp.sh
+}
+
+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
+		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
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins scripts/vim/msmtp.vim || die "doins syntax failed"
+	fi
+
+	if use gnome-keyring ; then
+		src_install_contrib msmtp-gnome-tool "msmtp-gnome-tool.py" "README"
+	fi
+
+	src_install_contrib find_alias "find_alias_for_msmtp.sh"
+	src_install_contrib msmtpqueue "*.sh" "README ChangeLog"
+	src_install_contrib msmtpq "msmtpq msmtpQ" "README"
+	src_install_contrib set_sendmail "set_sendmail.sh" "set_sendmail.conf"
+}
+
+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
+}