Remove old. Update sidebar patch to fix 'wrong new mail notifications' (http://dev.mutt.org/trac/ticket/3204#comment:2)

Package-Manager: portage-2.1.6.11/cvs/Linux x86_64

7 files changed, 12 insertions, 707 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index b413e1cfb10c..b6fde5d3bbe7 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/mutt
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.127 2009/03/21 16:56:48 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.128 2009/05/28 16:26:38 grobian Exp $
+
+  28 May 2009; Fabian Groffen <grobian@gentoo.org> -mutt-1.5.11-r2.ebuild,
+  -mutt-1.5.12.ebuild, -mutt-1.5.13.ebuild, -mutt-1.5.13-r1.ebuild,
+  mutt-1.5.19.ebuild:
+  Remove old. Update sidebar patch to fix 'wrong new mail notifications'
+  (http://dev.mutt.org/trac/ticket/3204#comment:2)
 
   21 Mar 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   metadata.xml:
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 5340559b4ef1..640097288c2b 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -9,9 +9,6 @@ AUX mutt-1.5.13-sasl.patch 2468 RMD160 7c0ee6795f8b7a11059f3802b098735897cf7cf2
 AUX mutt-1.5.15-parallel-make.patch 946 RMD160 80c9bfa187c784d650f5850469021f94547c897e SHA1 5b8b9e2d3bc8e36b8a95fc3bc79f5bfe50ec5008 SHA256 d4b6abc9f43989a6c7a22f3fbaafd4ffa524ad516c4cb5b8cfe884985cce74f6
 AUX mutt-1.5.16-parallel-make.patch 936 RMD160 f6a216d9ff06ae55d9569e05632b60332cf49ebe SHA1 0a9b98b37987ffa10039424bb6f5849a08dbb168 SHA256 3ecc199b83f6fa747d342694d8ffacf0aedd4590e0d9943c9b6004c31cbdb931
 AUX slang.patch 493 RMD160 16dcedee86fe91ecac48ec5be8a6f67798ef7ac0 SHA1 f913e8c717f76186b0edc8856bf02a167d540c70 SHA256 040c8b63b2d805dae800fa9b1826d158b7104641339cee9a404985616b3502c7
-DIST mutt-1.5.11.tar.gz 3187375 RMD160 812bfa6b1c9bfb1650341f7522298699c7b214a5 SHA1 cc5823016fe7de6ee3a131b19a3f78796f9f53d5 SHA256 0ff256a9851952a5f6dfb4b7dccf5dc26db9de5502d035748abc93dec84af474
-DIST mutt-1.5.12-gentoo-patches.tar.bz2 53435 RMD160 419ff2ebd14ad394ea5d34814f17583ee5a439b6 SHA1 013376bfbb97cb23ef58bf8248ea91b656b4bfe2 SHA256 e285cd217707719ba7a22e912c6cc00319e9873f31580bdef51331d9b6313dff
-DIST mutt-1.5.12.tar.gz 3440835 RMD160 e68d4c5b099b8148769d138a36fa8561b278969c SHA1 bb888a35f42a77de7e326c03b60854ad1cc266ea SHA256 0d0c2ab6cea0d93579bc5490fafdae3bf640070d993490c7b00ccac4fa808b67
 DIST mutt-1.5.13-gentoo-patches.tar.bz2 53418 RMD160 67274bef651c1c78d1e6878d8bb17316abf9d30e SHA1 95819031d9b14914c04ebd36e3ee004b564b942c SHA256 b0a8737ab8ec42b5f071eb08356a2572c49f98c73c3bf42396fd481c4650ef1d
 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
@@ -22,24 +19,12 @@ DIST mutt-1.5.16-gentoo-patches-r1.tar.bz2 58021 RMD160 bff5f1c5f0053635419eba6e
 DIST mutt-1.5.16.tar.gz 3534894 RMD160 3b345599aa62a956b9c881994ffd74156a5bf808 SHA1 4aaa82bdc75d5e12acc72df4f61fbbf87fd64fc1 SHA256 825e920b394db6f56fa8deb45977c061331f59d953944e27ff595625bbad3e83
 DIST mutt-1.5.19-gentoo-patches.tar.bz2 62837 RMD160 6f0eb14f7e06440608ffdb73b23884aa14bbb5cd SHA1 5d1a6a5af621453dca768b1070e049ba54a1545a SHA256 dc247df06be57dae2095d4a1494e5cd175b91523a467106e9b99acab4c0423a8
 DIST mutt-1.5.19.tar.gz 3558746 RMD160 dcb8d027593bfccd62eb7aba338007bce3c7e22e SHA1 96e4cc1e1419ba816fcc19d77255978e62c20793 SHA256 b160baedf2676a4c2c1a5c74049e2c63f00fccff43ee2594367087a08bfd63c8
-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
-DIST patch-1.5.11.rr.compressed.gz 9995 RMD160 f19cdeb949389cd3dd8f250ac96178f13ce92f67 SHA1 5d678038c7a2109761535bef2c7b65d93814e3d2 SHA256 1e2697136e0431508d2447de8b67fb32114d0b08ec043cc929e3ddf07202fcb5
-DIST patch-1.5.11.vvv.nntp-gentoo.bz2 44351 RMD160 e0d0754fd3f11f7a815dc6c64f0d96b13b2f580f SHA1 5618878a741199f17b61a3fea6d85976ee696814 SHA256 1e94c9862956c4292f518ead7f66192b6ad56abf5ba8660944393956bb32c723
 DIST patch-1.5.16.sidebar.20070704.txt 51103 RMD160 a91a1eefe48c15a048231a632fe285cb2360f365 SHA1 0284a09dfa000d279a0f87c9a0a296f473d4509b SHA256 49123e14bebd33d0e8c7733cab319f3e5bfa591d5f5d74a3dd8964b44bf34ae7
-DIST patch-1.5.19.sidebar.20090308.txt 51936 RMD160 076272ffcb70f118c1d8850c430f3d74f43ad23b SHA1 c16533176fce2b48d27cd587b63caa379258e740 SHA256 7f65f53bbf2e0d2b75f5844b986fdc23432519848183a540e4e7c49ecf7bfdcb
-DIST patch-1.5.4.lpr.collapse_flagged 4790 RMD160 f8d8ea63c61557321c0afcc2a857a6b53a09629f SHA1 7118628e88a584daeb6a41e961b184ec92784993 SHA256 f0fc39fdad2f7c5ad23ee0ee7f484c2809340ac117a3f7dd8ebad57129a61a4a
-DIST patch-1.5.6.dw.mbox-hook.1 6445 RMD160 baa6e066fd834720ce02ad335c97d37982bcfab7 SHA1 e68073c37cb3a7ab30359e84470a39c58300cde5 SHA256 eaaa1b8279e358b47dca189721fb7fdcbe63576203b76e879868b30206b6166c
-DIST patch-1.5.6.dw.pgp-timeout.1 1448 RMD160 2907033013961301e3e356232c6b6cc646750746 SHA1 2675169ff3e176a431ad59054a83a4acbdd59129 SHA256 9ec9bcca7afccac1c4138be149ceb623fd9fbf60a31cec914d030ec94cde3f38
-EBUILD mutt-1.5.11-r2.ebuild 5808 RMD160 1b0eb0ffadbe6c4e09cd1b049bf677d9558289cb SHA1 742b6cb988a9e4f593df4853c1e104292cc9df10 SHA256 6865e83425258762f20b4ba6dbdac83e4839608aca4b23dadf32cc491fe306d3
-EBUILD mutt-1.5.12.ebuild 4588 RMD160 dae98a759ca2795c7b7f98c949be631c07fbe0e1 SHA1 055be577aab9c19ca88fa1e6028e23bac0f10332 SHA256 da4b89f8d7ed184f8b2af9943bc5c1e5fd6c0b136d4bb99851de951d2e51f434
-EBUILD mutt-1.5.13-r1.ebuild 4355 RMD160 e1edc44459d6a35ecd5d1348b8f90b95633a4412 SHA1 41722b0872cce78e8c1a95e573708ce51736962f SHA256 9087030a79f6c667d1ed60d592389c506030f3c84d32124b991ebbc30f7ba068
+DIST patch-1.5.19.sidebar.20090522.txt 52307 RMD160 116451d59aa746644f269f8c028484360c84e342 SHA1 056c394657c78e054909dcfde0692007cea33fe3 SHA256 64b2282aac88a3374bb48a9a07b6374443fe3c8f5905def9ac3cdc26d9f8355a
 EBUILD mutt-1.5.13-r2.ebuild 4410 RMD160 35bd57d44d7bd67f35a3e343a5a7090a08977008 SHA1 a6c502184477f9c178b22e617469d1323f68bb5e SHA256 1fcf49cf2e79eee8420221729417acc27725a33ea92334f93c192cf2ec05cd92
-EBUILD mutt-1.5.13.ebuild 4288 RMD160 2efb7190a04587ffc6389903ecaf4ee58f49ccbe SHA1 74b8b71e18ff0879963d19ef4a50b6ff5d6df94b SHA256 8323d4e1b5997efd0c1853cce01d54d714903c3cf14a96a317a10c19d8b3e28e
 EBUILD mutt-1.5.14.ebuild 4477 RMD160 854063ac3471204336557b95f2f0b84db782e1a7 SHA1 48f12bd49d495620870f39e80a295d6c009a609f SHA256 cc27d01f1d3d727b37c9b9dad92fff1afd9600301238d195cbcb69d47244bb29
 EBUILD mutt-1.5.15-r2.ebuild 4528 RMD160 2359d39b6d5758d977b1cbfce4c320dc0abb0ed7 SHA1 9a34328905989c05c7ebc5892c0e8151433897b0 SHA256 37c613bcdc54cef3d93b013c6cb792deb2be3ca2de85765a937323bae5041264
 EBUILD mutt-1.5.16.ebuild 4989 RMD160 2a9ae3ece8f56692e0077b7b3940e607c79f2a14 SHA1 a79646fbfce1e85ecc2f8aaa4728e3c7303185f0 SHA256 55a70c2bb8f144549e6a12a4ba6bcb8796202d4f7be25fb809fefa2848615368
-EBUILD mutt-1.5.19.ebuild 5662 RMD160 8b07ad08d2c15f582470668b2ba7b5ff803a808d SHA1 b0b4f17545fa3f939974a8b2ce81e5e15431b553 SHA256 7c3e42c92ad91563ba987fabea54896b809abdde08eb9458da57569717b17376
-MISC ChangeLog 28381 RMD160 2dbd5eef7db5b283452a99c5ed5b1c6058cf7cd2 SHA1 0cf3ef76086c58c2b62565f293ab143b2baac93f SHA256 250168650e612784f0fd5850d16e413e25be0cf97833711aec953fe9f7858f5e
+EBUILD mutt-1.5.19.ebuild 5662 RMD160 931af9eabd27dcd4f0324d346d886164421cc789 SHA1 209a2221d8bdc31ac813e6c87aaa4fe6e345c9f1 SHA256 c456d9c20c230fb729d1cd3a6aab7121724ad1da9e9d45f8a77c6737fdb63354
+MISC ChangeLog 28667 RMD160 09b2c1ebef54d90f6222f73f2b5aaac3e6c23e2b SHA1 a5565f7abe6a8e6c5b1a2ee9f7143a454e0bdcd6 SHA256 a2d253da41080de24455bd527bd4f13f1b87c0ca2b43c9b53e8e37665b6cb0bb
 MISC metadata.xml 631 RMD160 10c1955ddab3675eaf66cefb8b048f63c3cfdada SHA1 2bf05cda645721d9eec36475e7961459d2986351 SHA256 cb99c48a1a6bacbf5d331b42a1803f6526f4805ed4abc730ce6606a9786bd9a7
diff --git a/mail-client/mutt/mutt-1.5.11-r2.ebuild b/mail-client/mutt/mutt-1.5.11-r2.ebuild
deleted file mode 100644
index 53bd8254815b..000000000000
--- a/mail-client/mutt/mutt-1.5.11-r2.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2008 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-r2.ebuild,v 1.15 2008/03/09 21:36:14 ricmm Exp $
-
-inherit eutils flag-o-matic autotools
-
-patch_assumed_charset="patch-1.5.10.tt.assumed_charset.1.gz"
-patch_compressed="patch-${PV}.rr.compressed.gz"
-patch_mbox_hook="patch-1.5.6.dw.mbox-hook.1"
-patch_pgp_timeout="patch-1.5.6.dw.pgp-timeout.1"
-patch_imap_fcc_status="mutt-1.5.4-imap-fcc-status.patch"
-patch_collapse_flagged="patch-1.5.4.lpr.collapse_flagged"
-opt_patch_nntp="patch-${PV}.vvv.nntp-gentoo.bz2"
-
-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? (
-		http://www.emaillab.org/${PN}/1.5.10/${patch_assumed_charset}
-		http://mutt.kiev.ua/download/${P}/${patch_compressed}
-		http://www.woolridge.ca/${PN}/patches/${patch_mbox_hook}
-		http://www.woolridge.ca/${PN}/patches/${patch_pgp_timeout}
-		http://www.plumlocosoft.com/software/download/${patch_imap_fcc_status}
-		http://debian.lpr.ch/Mutt/${patch_collapse_flagged}
-		nntp? (
-			http://dev.gentoo.org/~ferdy/distfiles/${opt_patch_nntp}
-			mirror://gentoo/mutt-1.5.7-mixmaster+nntp.patch
-		)
-	)"
-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 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"
-
-pkg_setup() {
-	if ! use imap; then
-		echo
-		elog "The USE variable 'imap' is not in your USE flags."
-		elog "For imap support in mutt, you will need to restart the build with USE=imap"
-		echo
-	fi
-}
-
-src_unpack() {
-	unpack ${P}.tar.gz && cd "${S}" || die "unpack failed"
-
-	# Fix configure.in sasl checking
-	epatch "${FILESDIR}"/${P}-sasl.patch
-
-	# Fix smime message signing
-	epatch "${FILESDIR}"/${P}-fix-smime.patch
-
-	# Fix possible vulnerability see bug #138125
-	epatch "${FILESDIR}"/${P}-imap-browse.patch
-
-	if ! use vanilla ; then
-		for p in ${!patch_*} ; do
-			epatch "${DISTDIR}"/${!p}
-		done
-
-		if use nntp; then
-			epatch "${DISTDIR}"/${opt_patch_nntp}
-			# Allow mutt to build with mixmaster and nntp both enabled
-			epatch "${DISTDIR}"/mutt-1.5.7-mixmaster+nntp.patch
-		fi
-
-		# rm -rf configure autom4te.cache
-		# aclocal -I m4					|| die "aclocal failed"
-		# autoheader						|| die "autoheader failed"
-		# emake -C m4 -f Makefile.am.in	|| die "emake in m4 failed"
-		# automake --foreign				|| die "automake failed"
-		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
-	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
-}
diff --git a/mail-client/mutt/mutt-1.5.12.ebuild b/mail-client/mutt/mutt-1.5.12.ebuild
deleted file mode 100644
index caf5777b0f17..000000000000
--- a/mail-client/mutt/mutt-1.5.12.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# 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.12.ebuild,v 1.4 2007/03/18 02:12:26 genone 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 ~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
-
-pkg_setup() {
-	if ! use imap; then
-		echo
-		elog "The USE variable 'imap' is not in your USE flags."
-		elog "For imap support in mutt, you will need to restart the build with USE=imap"
-		echo
-	fi
-}
-
-src_unpack() {
-	unpack ${A} && cd "${S}" || die "unpack failed"
-
-	# fix for linking problem (bug #142520) in configure.in
-	epatch "${FILESDIR}"/${P}-fix-pop-c.patch
-
-	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
-	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
-}
diff --git a/mail-client/mutt/mutt-1.5.13-r1.ebuild b/mail-client/mutt/mutt-1.5.13-r1.ebuild
deleted file mode 100644
index 534903366b94..000000000000
--- a/mail-client/mutt/mutt-1.5.13-r1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2008 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-r1.ebuild,v 1.13 2008/03/09 21:36:14 ricmm 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 ppc64 sparc x86 ~x86-fbsd"
-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"
-
-	# Fix for bug #146696
-	epatch "${FILESDIR}"/${P}-sasl.patch
-
-	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
-	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
-}
diff --git a/mail-client/mutt/mutt-1.5.13.ebuild b/mail-client/mutt/mutt-1.5.13.ebuild
deleted file mode 100644
index 64dd2cafe0b6..000000000000
--- a/mail-client/mutt/mutt-1.5.13.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# 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.13.ebuild,v 1.3 2007/03/18 02:12:26 genone 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 ~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
-	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
-}
diff --git a/mail-client/mutt/mutt-1.5.19.ebuild b/mail-client/mutt/mutt-1.5.19.ebuild
index 48d706add672..a49491e529a4 100644
--- a/mail-client/mutt/mutt-1.5.19.ebuild
+++ b/mail-client/mutt/mutt-1.5.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.19.ebuild,v 1.4 2009/03/11 20:18:32 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.19.ebuild,v 1.5 2009/05/28 16:26:38 grobian Exp $
 
 inherit eutils flag-o-matic autotools
 
@@ -8,7 +8,7 @@ PATCHSET_REV=""
 
 # note: latest sidebar patches can be found here:
 # http://www.lunar-linux.org/index.php?option=com_content&task=view&id=44
-SIDEBAR_PATCH_N="patch-1.5.19.sidebar.20090308.txt"
+SIDEBAR_PATCH_N="patch-1.5.19.sidebar.20090522.txt"
 
 DESCRIPTION="a small but very powerful text-based mail client"
 HOMEPAGE="http://www.mutt.org"