Version bump. Fixed dependencies on =sys-libs/slang-1* as per bug #141947. Changed invalid values for WANT_AUTOCONF as per bug #143429.

(Portage version: 2.1-r2)

10 files changed, 197 insertions, 24 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index a0d17e5b70eb..258a81383f9d 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for mail-client/mutt
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.84 2006/08/07 20:12:01 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.85 2006/08/14 17:48:48 ferdy Exp $
+
+*mutt-1.5.13 (14 Aug 2006)
+
+  14 Aug 2006; Fernando J. Pereda <ferdy@gentoo.org> mutt-1.4.2.1.ebuild,
+  mutt-1.5.8-r1.ebuild, mutt-1.5.8-r2.ebuild, mutt-1.5.9.ebuild,
+  mutt-1.5.10-r1.ebuild, mutt-1.5.11.ebuild, mutt-1.5.11-r1.ebuild,
+  +mutt-1.5.13.ebuild:
+  Version bump. Fixed dependencies on =sys-libs/slang-1* as per bug #141947.
+  Changed invalid values for WANT_AUTOCONF as per bug #143429.
 
   07 Aug 2006; Fernando J. Pereda <ferdy@gentoo.org>
   +files/mutt-1.5.12-fix-pop-c.patch, mutt-1.5.12.ebuild:
diff --git a/mail-client/mutt/files/digest-mutt-1.5.13 b/mail-client/mutt/files/digest-mutt-1.5.13
new file mode 100644
index 000000000000..d0fb93f3637b
--- /dev/null
+++ b/mail-client/mutt/files/digest-mutt-1.5.13
@@ -0,0 +1,6 @@
+MD5 b4fccb735c0277bc6c659eb287d65b13 mutt-1.5.13-gentoo-patches.tar.bz2 53418
+RMD160 67274bef651c1c78d1e6878d8bb17316abf9d30e mutt-1.5.13-gentoo-patches.tar.bz2 53418
+SHA256 b0a8737ab8ec42b5f071eb08356a2572c49f98c73c3bf42396fd481c4650ef1d mutt-1.5.13-gentoo-patches.tar.bz2 53418
+MD5 456a138680a6726f14983cb3e9ff4e22 mutt-1.5.13.tar.gz 3442681
+RMD160 9327b7f928aad78a20c2395629113ac2519bb945 mutt-1.5.13.tar.gz 3442681
+SHA256 e0481690c0caf23b5c88359b2dbac70308f8f138663e8fee482b163562fe8da9 mutt-1.5.13.tar.gz 3442681
diff --git a/mail-client/mutt/mutt-1.4.2.1.ebuild b/mail-client/mutt/mutt-1.4.2.1.ebuild
index 26bf6d64f5de..f27357ca94f7 100644
--- a/mail-client/mutt/mutt-1.4.2.1.ebuild
+++ b/mail-client/mutt/mutt-1.4.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.4.2.1.ebuild,v 1.9 2005/08/17 20:03:48 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.4.2.1.ebuild,v 1.10 2006/08/14 17:48:48 ferdy Exp $
 
 IUSE="cjk imap mbox nls slang ssl vanilla"
 
@@ -21,7 +21,7 @@ SRC_URI="ftp://ftp.mutt.org/mutt/mutt-${PV}i.tar.gz
 RDEPEND="nls? ( sys-devel/gettext )
 	>=sys-libs/ncurses-5.2
 	ssl? ( >=dev-libs/openssl-0.9.6 )
-	slang? ( >=sys-libs/slang-1.4.2 )"
+	slang? ( =sys-libs/slang-1* )"
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
 
diff --git a/mail-client/mutt/mutt-1.5.10-r1.ebuild b/mail-client/mutt/mutt-1.5.10-r1.ebuild
index acd3ec35de20..978dc90ba22f 100644
--- a/mail-client/mutt/mutt-1.5.10-r1.ebuild
+++ b/mail-client/mutt/mutt-1.5.10-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.10-r1.ebuild,v 1.1 2005/08/17 22:42:48 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.10-r1.ebuild,v 1.2 2006/08/14 17:48:48 ferdy Exp $
 
 inherit eutils flag-o-matic
 
@@ -87,7 +87,7 @@ src_unpack() {
 		automake --foreign				|| die "automake failed"
 	fi
 
-	WANT_AUTOCONF=2.13 autoconf		|| die "autoconf failed"
+	WANT_AUTOCONF=2.1 autoconf		|| die "autoconf failed"
 }
 
 src_compile() {
diff --git a/mail-client/mutt/mutt-1.5.11-r1.ebuild b/mail-client/mutt/mutt-1.5.11-r1.ebuild
index 56199912435b..a291fefdbe37 100644
--- a/mail-client/mutt/mutt-1.5.11-r1.ebuild
+++ b/mail-client/mutt/mutt-1.5.11-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.11-r1.ebuild,v 1.1 2005/11/26 11:58:58 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.11-r1.ebuild,v 1.2 2006/08/14 17:48:48 ferdy Exp $
 
 inherit eutils flag-o-matic
 
@@ -90,7 +90,7 @@ src_unpack() {
 		automake --foreign				|| die "automake failed"
 	fi
 
-	WANT_AUTOCONF=2.59 autoconf		|| die "autoconf failed"
+	WANT_AUTOCONF=2.5 autoconf		|| die "autoconf failed"
 }
 
 src_compile() {
diff --git a/mail-client/mutt/mutt-1.5.11.ebuild b/mail-client/mutt/mutt-1.5.11.ebuild
index cbba7402f8b8..f4166c9c5677 100644
--- a/mail-client/mutt/mutt-1.5.11.ebuild
+++ b/mail-client/mutt/mutt-1.5.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.11.ebuild,v 1.9 2006/02/20 01:29:09 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.11.ebuild,v 1.10 2006/08/14 17:48:48 ferdy Exp $
 
 inherit eutils flag-o-matic
 
@@ -87,7 +87,7 @@ src_unpack() {
 		automake --foreign				|| die "automake failed"
 	fi
 
-	WANT_AUTOCONF=2.59 autoconf		|| die "autoconf failed"
+	WANT_AUTOCONF=2.5 autoconf		|| die "autoconf failed"
 }
 
 src_compile() {
diff --git a/mail-client/mutt/mutt-1.5.13.ebuild b/mail-client/mutt/mutt-1.5.13.ebuild
new file mode 100644
index 000000000000..43860fc9dd4a
--- /dev/null
+++ b/mail-client/mutt/mutt-1.5.13.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.13.ebuild,v 1.1 2006/08/14 17:48:48 ferdy Exp $
+
+inherit eutils flag-o-matic autotools
+
+DESCRIPTION="a small but very powerful text-based mail client"
+HOMEPAGE="http://www.mutt.org"
+SRC_URI="ftp://ftp.mutt.org/mutt/devel/${P}.tar.gz
+	!vanilla? (
+		mirror://gentoo/${P}-gentoo-patches.tar.bz2
+	)"
+IUSE="berkdb buffysize cjk crypt debug gdbm gnutls gpgme idn imap mbox nls nntp pop sasl smime ssl vanilla"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
+RDEPEND="nls? ( sys-devel/gettext )
+	>=sys-libs/ncurses-5.2
+	gdbm?    ( sys-libs/gdbm )
+	!gdbm?   ( berkdb? ( >=sys-libs/db-4 ) )
+	imap?    (
+		gnutls?  ( >=net-libs/gnutls-1.0.17 )
+		!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
+		sasl?    ( >=dev-libs/cyrus-sasl-2 )
+	)
+	pop?     (
+		gnutls?  ( >=net-libs/gnutls-1.0.17 )
+		!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
+		sasl?    ( >=dev-libs/cyrus-sasl-2 )
+	)
+	idn?     ( net-dns/libidn )
+	gpgme?   ( >=app-crypt/gpgme-0.9.0 )
+	smime?   ( >=dev-libs/openssl-0.9.6 )
+	app-misc/mime-types"
+DEPEND="${RDEPEND}
+	net-mail/mailbase"
+
+PATCHDIR="${WORKDIR}"/${P}-gentoo-patches
+
+src_unpack() {
+	unpack ${A} && cd "${S}" || die "unpack failed"
+
+	if ! use vanilla ; then
+		if ! use nntp ; then
+			rm "${PATCHDIR}"/07-vvv.nntp-gentoo.patch
+			rm "${PATCHDIR}"/08-mixmaster_nntp.patch
+		fi
+
+		for p in "${PATCHDIR}"/*.patch ; do
+			epatch "${p}"
+		done
+
+		AT_M4DIR="m4" eautoreconf
+	else
+		eautoconf
+	fi
+}
+
+src_compile() {
+	declare myconf="
+		$(use_enable nls) \
+		$(use_enable gpgme) \
+		$(use_enable imap) \
+		$(use_enable pop) \
+		$(use_enable crypt pgp) \
+		$(use_enable smime) \
+		$(use_enable cjk default-japanese) \
+		$(use_enable debug) \
+		$(use_with idn) \
+		--with-curses \
+		--sysconfdir=/etc/${PN} \
+		--with-docdir=/usr/share/doc/${PN}-${PVR} \
+		--with-regex \
+		--disable-fcntl --enable-flock \
+		--enable-nfs-fix --enable-external-dotlock \
+		--with-mixmaster"
+
+	# See Bug #22787
+	unset WANT_AUTOCONF_2_5 WANT_AUTOCONF
+
+	# mutt prioritizes gdbm over bdb, so we will too.
+	# hcache feature requires at least one database is in USE.
+	if use gdbm; then
+		myconf="${myconf} --enable-hcache --with-gdbm --without-bdb"
+	elif use berkdb; then
+		myconf="${myconf} --enable-hcache --with-bdb --without-gdbm"
+	else
+		myconf="${myconf} --disable-hcache --without-gdbm --without-bdb"
+	fi
+
+	# there's no need for gnutls, ssl or sasl without either pop or imap.
+	# in fact mutt's configure will bail if you do:
+	#   --without-pop --without-imap --with-ssl
+	if use pop || use imap; then
+		if use gnutls; then
+			myconf="${myconf} --with-gnutls"
+		elif use ssl; then
+			myconf="${myconf} --with-ssl"
+		fi
+		# not sure if this should be mutually exclusive with the other two
+		myconf="${myconf} $(use_with sasl)"
+	else
+		myconf="${myconf} --without-gnutls --without-ssl --without-sasl"
+	fi
+
+	# See Bug #11170
+	case ${ARCH} in
+		alpha|ppc) replace-flags "-O[3-9]" "-O2" ;;
+	esac
+
+	if use buffysize; then
+		ewarn "USE=buffy-size is just a workaround. Disable it if you don't need it."
+		myconf="${myconf} --enable-buffy-size"
+	fi
+
+	if use mbox; then
+		myconf="${myconf} --with-mailpath=/var/spool/mail"
+	else
+		myconf="${myconf} --with-homespool=Maildir"
+	fi
+
+	if ! use vanilla; then
+		# rr.compressed patch
+		myconf="${myconf} --enable-compressed"
+
+		# nntp patch
+		myconf="${myconf} $(use_enable nntp)"
+	fi
+
+	econf ${myconf} || die "configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "install failed"
+	find ${D}/usr/share/doc -type f | grep -v "html\|manual" | xargs gzip
+	if use mbox; then
+		insinto /etc/mutt
+		newins ${FILESDIR}/Muttrc.mbox Muttrc
+	else
+		insinto /etc/mutt
+		doins ${FILESDIR}/Muttrc
+	fi
+
+	# A newer file is provided by app-misc/mime-types. So we link it.
+	rm ${D}/etc/${PN}/mime.types
+	dosym /etc/mime.types /etc/${PN}/mime.types
+
+	dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
+}
+
+pkg_postinst() {
+	echo
+	einfo "If you are new to mutt you may want to take a look at"
+	einfo "the Gentoo QuickStart Guide to Mutt E-Mail:"
+	einfo "   http://www.gentoo.org/doc/en/guide-to-mutt.xml"
+	echo
+}
diff --git a/mail-client/mutt/mutt-1.5.8-r1.ebuild b/mail-client/mutt/mutt-1.5.8-r1.ebuild
index a3feb8497f00..a644dd52d369 100644
--- a/mail-client/mutt/mutt-1.5.8-r1.ebuild
+++ b/mail-client/mutt/mutt-1.5.8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.8-r1.ebuild,v 1.11 2005/08/11 22:57:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.8-r1.ebuild,v 1.12 2006/08/14 17:48:48 ferdy Exp $
 
 inherit eutils flag-o-matic
 IUSE="cjk ssl nls slang crypt imap mbox nntp sasl vanilla"
@@ -31,7 +31,7 @@ SRC_URI="ftp://ftp.mutt.org/mutt/devel/mutt-${PV}i.tar.gz
 RDEPEND="nls? ( sys-devel/gettext )
 	>=sys-libs/ncurses-5.2
 	ssl? ( >=dev-libs/openssl-0.9.6 )
-	slang? ( >=sys-libs/slang-1.4.2 )
+	slang? ( =sys-libs/slang-1* )
 	!vanilla? ( sys-libs/gdbm )
 	sasl? ( >=dev-libs/cyrus-sasl-2 )"
 DEPEND="${RDEPEND}
@@ -72,7 +72,7 @@ src_unpack() {
 		autoheader						|| die "autoheader failed"
 		make -C m4 -f Makefile.am.in	|| die "make in m4 failed"
 		automake --foreign				|| die "automake failed"
-		WANT_AUTOCONF=2.13 autoconf		|| die "autoconf failed"
+		WANT_AUTOCONF=2.1 autoconf		|| die "autoconf failed"
 	fi
 }
 
diff --git a/mail-client/mutt/mutt-1.5.8-r2.ebuild b/mail-client/mutt/mutt-1.5.8-r2.ebuild
index a6ce1e70fe6b..582930875591 100644
--- a/mail-client/mutt/mutt-1.5.8-r2.ebuild
+++ b/mail-client/mutt/mutt-1.5.8-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.8-r2.ebuild,v 1.10 2005/08/11 22:57:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.8-r2.ebuild,v 1.11 2006/08/14 17:48:48 ferdy Exp $
 
 inherit eutils flag-o-matic
 IUSE="cjk ssl nls slang crypt imap mbox nntp sasl buffysize vanilla"
@@ -33,7 +33,7 @@ SRC_URI="ftp://ftp.mutt.org/mutt/devel/mutt-${PV}i.tar.gz
 RDEPEND="nls? ( sys-devel/gettext )
 	>=sys-libs/ncurses-5.2
 	ssl? ( >=dev-libs/openssl-0.9.6 )
-	slang? ( >=sys-libs/slang-1.4.2 )
+	slang? ( =sys-libs/slang-1* )
 	!vanilla? ( sys-libs/gdbm )
 	sasl? ( >=dev-libs/cyrus-sasl-2 )"
 DEPEND="${RDEPEND}
@@ -75,7 +75,7 @@ src_unpack() {
 		autoheader						|| die "autoheader failed"
 		emake -C m4 -f Makefile.am.in	|| die "emake in m4 failed"
 		automake --foreign				|| die "automake failed"
-		WANT_AUTOCONF=2.13 autoconf		|| die "autoconf failed"
+		WANT_AUTOCONF=2.1 autoconf		|| die "autoconf failed"
 	fi
 }
 
diff --git a/mail-client/mutt/mutt-1.5.9.ebuild b/mail-client/mutt/mutt-1.5.9.ebuild
index e879fb7f34a9..2b03ae0c76c1 100644
--- a/mail-client/mutt/mutt-1.5.9.ebuild
+++ b/mail-client/mutt/mutt-1.5.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.9.ebuild,v 1.9 2005/08/17 20:03:48 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.9.ebuild,v 1.10 2006/08/14 17:48:48 ferdy Exp $
 
 inherit eutils flag-o-matic
 
@@ -36,7 +36,7 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
 RDEPEND="nls? ( sys-devel/gettext )
 	>=sys-libs/ncurses-5.2
 	gdbm?    ( sys-libs/gdbm )
-	slang?   ( >=sys-libs/slang-1.4.2 )
+	slang?   ( =sys-libs/slang-1* )
 	imap?    (
 		gnutls?  ( >=net-libs/gnutls-1.0.17 )
 		!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
@@ -91,7 +91,7 @@ src_unpack() {
 		automake --foreign				|| die "automake failed"
 	fi
 
-	WANT_AUTOCONF=2.13 autoconf		|| die "autoconf failed"
+	WANT_AUTOCONF=2.1 autoconf		|| die "autoconf failed"
 }
 
 src_compile() {