New upstream version. Added sidebar patch to our patchset

Package-Manager: portage-2.1.2.2

4 files changed, 194 insertions, 8 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index a7a758bb522f..2a4758aa2650 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-client/mutt
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.102 2007/03/20 20:01:00 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.103 2007/04/09 21:27:22 ferdy Exp $
+
+*mutt-1.5.15 (09 Apr 2007)
+
+  09 Apr 2007; Fernando J. Pereda <ferdy@gentoo.org> +mutt-1.5.15.ebuild:
+  New upstream version. Added sidebar patch to our patchset
 
 *mutt-1.5.14 (20 Mar 2007)
 
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index e38819cd2863..22cf7a86284e 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -44,6 +44,8 @@ DIST mutt-1.5.13-gentoo-patches.tar.bz2 53418 RMD160 67274bef651c1c78d1e6878d8bb
 DIST mutt-1.5.13.tar.gz 3442681 RMD160 9327b7f928aad78a20c2395629113ac2519bb945 SHA1 6d5b88d33e1727bf0342c31f06d55d7a3d2d4e0a SHA256 e0481690c0caf23b5c88359b2dbac70308f8f138663e8fee482b163562fe8da9
 DIST mutt-1.5.14-gentoo-patches.tar.bz2 53898 RMD160 584cdf88e3fd0fea0a672ef5373bee0b95b0623f SHA1 6308bd600ac21ab19f1a5a0f1a624333a94cc6e0 SHA256 e71f0a6c2c62bca41280e64b2b4687ab9c468e4151d3ba3082125710a487a2f9
 DIST mutt-1.5.14.tar.gz 3441678 RMD160 ed4eeaf75d37757ed5b370e9763b6f8524df5ca7 SHA1 7be098c13302fab8a954095d17a9a64e1e1519c1 SHA256 9dbee28bd48a0f1779ba3b00f98dda74a3f629e8109f1842616d48b85013946a
+DIST mutt-1.5.15-gentoo-patches.tar.bz2 72590 RMD160 c8e44e2659f1fb3fc9d0f6c23127f30e74838104 SHA1 7ea2961ad9f7656beba08adeda5dfa8ddce48d35 SHA256 603affa18ebbd9192025b57d35d4c226d450eda599f35e5149a32b0a35ba2328
+DIST mutt-1.5.15.tar.gz 3517899 RMD160 0cc084d2fcdabc0bc41632fcff90703c206de3db SHA1 1adabf6e07e099bb664c83e3c0100bbbdfec7a9a SHA256 03fa1f45d4743cd395b634d19aebbc2c1918cf6b683e0af51076ccc79f643a9a
 DIST mutt-1.5.4-imap-fcc-status.patch 380 RMD160 cbeac806b610bcd945bf3b52120a8aa2aba27df3 SHA1 6567f4c9fac3ca52f13c23aed2e3aa017b49e25f SHA256 22cb4e1625ae2d22f94e8d815cb3515db75801f8a4cb9e4f047c4fb4ded8757c
 DIST mutt-1.5.7-mixmaster+nntp.patch 310 RMD160 38e42b700d1badb3d39550ada6eb08cb122480a0 SHA1 996f1f922d8150ce9b70b484877fe22ec8d463dd SHA256 e035b746f391aaba51b2e0917ecf4c60db7c81546a9b54f06881cf75410575da
 DIST patch-1.5.10.tt.assumed_charset.1.gz 2565 RMD160 7d3fb6d32c266ed35babdb10d13aae731783a64e SHA1 f7894822ba9107b3ac443f9b40babbd3ae3c778a SHA256 97cdb63694055e218dff8b85e8c0db8b5e0c7435a91d47479604480319156c6b
@@ -76,10 +78,14 @@ EBUILD mutt-1.5.14.ebuild 4477 RMD160 854063ac3471204336557b95f2f0b84db782e1a7 S
 MD5 6886b5dc7a2af8f34dae30df116faf2e mutt-1.5.14.ebuild 4477
 RMD160 854063ac3471204336557b95f2f0b84db782e1a7 mutt-1.5.14.ebuild 4477
 SHA256 cc27d01f1d3d727b37c9b9dad92fff1afd9600301238d195cbcb69d47244bb29 mutt-1.5.14.ebuild 4477
-MISC ChangeLog 24726 RMD160 72ec951d47f0918215920d5b0e44283757661ce3 SHA1 7f951f6b46b6832e311bda4ff731f0eda8bc51a5 SHA256 dd2202bf383f2ad312e29ec9b7c87cb354d95d496574eaf0362e4cdabbde8196
-MD5 610f61ed3d56749318e48c08a904b3ae ChangeLog 24726
-RMD160 72ec951d47f0918215920d5b0e44283757661ce3 ChangeLog 24726
-SHA256 dd2202bf383f2ad312e29ec9b7c87cb354d95d496574eaf0362e4cdabbde8196 ChangeLog 24726
+EBUILD mutt-1.5.15.ebuild 4422 RMD160 c832606b0da1880215c71d7df336440688bfa5ed SHA1 a8f98dae663725c48557884057231a3142d4d845 SHA256 e8d8837da0be9522a2d5494e166f4e255e0c5ac9a0d74a8aa3a13a205828f01a
+MD5 cc39ebe7af3ae70b1e6cc91d25d4a613 mutt-1.5.15.ebuild 4422
+RMD160 c832606b0da1880215c71d7df336440688bfa5ed mutt-1.5.15.ebuild 4422
+SHA256 e8d8837da0be9522a2d5494e166f4e255e0c5ac9a0d74a8aa3a13a205828f01a mutt-1.5.15.ebuild 4422
+MISC ChangeLog 24889 RMD160 9374bdaba522b0ac3e5ee10f56df5122378bc616 SHA1 804e434a07a45361cf4d1d430305e5161ef0ace9 SHA256 5c3e9cfd32982889757ab96cb857a92f31e05617c0172aee637f3e4f2806db3a
+MD5 7477eecc0b9916c48c3d5ab14210742b ChangeLog 24889
+RMD160 9374bdaba522b0ac3e5ee10f56df5122378bc616 ChangeLog 24889
+SHA256 5c3e9cfd32982889757ab96cb857a92f31e05617c0172aee637f3e4f2806db3a ChangeLog 24889
 MISC metadata.xml 344 RMD160 6fb7283d0c812896b18cf91969a744fe9f34f57a SHA1 6a2f5f2822e49aadad2f8b16b8a565f627cc697f SHA256 9241b10ef441b7a14e730c2feff17fa387c48291caa52e788acca2befc4ad480
 MD5 cb5fc428c975ffb2fc20fc8c577cca9a metadata.xml 344
 RMD160 6fb7283d0c812896b18cf91969a744fe9f34f57a metadata.xml 344
@@ -102,10 +108,13 @@ SHA256 e79af34a5a8d834a2f5556020b501596f7bdc9a82eaf73896e2e60ebac2a029a files/di
 MD5 98ed952eb41aad4b8304e129ef1ac02e files/digest-mutt-1.5.14 518
 RMD160 c53753fa9da1428429f7a1c98d9a9346da362272 files/digest-mutt-1.5.14 518
 SHA256 0befea25b5cd922f96a15398408503be2d2e7935197a6d53270dd4ac42d19fb4 files/digest-mutt-1.5.14 518
+MD5 c21e0cb62beeadcf90f57145330637e5 files/digest-mutt-1.5.15 518
+RMD160 cb9a00c4eadad4bebbf8e16194f7bd60326670bd files/digest-mutt-1.5.15 518
+SHA256 a1e6696fc85d9b8ffd807987004fa437ee6924589e230abafe8ff1bfc4fad1ae files/digest-mutt-1.5.15 518
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFGAD3RViELBEf1JB0RAh/oAJ9Tw2rnogOmoIrmenm/VXrntCsOLQCeMx6l
-bRmXZ1hcpFbuk5t1MwqNwnE=
-=1R3X
+iD8DBQFGGq/MViELBEf1JB0RAl+AAJ9XlppkAzp8YZoWoipLChxH5YnEIgCfQKbm
+pl3z+hV6/FR1fe7y33KIdiU=
+=5n6B
 -----END PGP SIGNATURE-----
diff --git a/mail-client/mutt/files/digest-mutt-1.5.15 b/mail-client/mutt/files/digest-mutt-1.5.15
new file mode 100644
index 000000000000..055dcec719f4
--- /dev/null
+++ b/mail-client/mutt/files/digest-mutt-1.5.15
@@ -0,0 +1,6 @@
+MD5 6e04e127620f07f7494aab96ca1a0c8c mutt-1.5.15-gentoo-patches.tar.bz2 72590
+RMD160 c8e44e2659f1fb3fc9d0f6c23127f30e74838104 mutt-1.5.15-gentoo-patches.tar.bz2 72590
+SHA256 603affa18ebbd9192025b57d35d4c226d450eda599f35e5149a32b0a35ba2328 mutt-1.5.15-gentoo-patches.tar.bz2 72590
+MD5 b2c1eb45fd958f6589ee52a98f2a3ce1 mutt-1.5.15.tar.gz 3517899
+RMD160 0cc084d2fcdabc0bc41632fcff90703c206de3db mutt-1.5.15.tar.gz 3517899
+SHA256 03fa1f45d4743cd395b634d19aebbc2c1918cf6b683e0af51076ccc79f643a9a mutt-1.5.15.tar.gz 3517899
diff --git a/mail-client/mutt/mutt-1.5.15.ebuild b/mail-client/mutt/mutt-1.5.15.ebuild
new file mode 100644
index 000000000000..37dde9c8f463
--- /dev/null
+++ b/mail-client/mutt/mutt-1.5.15.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.15.ebuild,v 1.1 2007/04/09 21:27:22 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 qdbm sasl smime ssl vanilla"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+RDEPEND=">=sys-libs/ncurses-5.2
+	qdbm?    ( dev-db/qdbm )
+	!qdbm?   (
+		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-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 qdbm; then
+		myconf="${myconf} --enable-hcache \
+		--with-qdbm --without-gdbm --without-bdb"
+	elif use gdbm ; then
+		myconf="${myconf} --enable-hcache \
+			--without-qdbm --with-gdbm --without-bdb"
+	elif use berkdb; then
+		myconf="${myconf} --enable-hcache \
+			--without-gdbm --without-qdbm --with-bdb"
+	else
+		myconf="${myconf} --disable-hcache \
+			--without-qdbm --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
+	elog "If you are new to mutt you may want to take a look at"
+	elog "the Gentoo QuickStart Guide to Mutt E-Mail:"
+	elog "   http://www.gentoo.org/doc/en/guide-to-mutt.xml"
+	echo
+}