Version bump, bug #141033. Reported by Shark <shark@bitchx.it>.

(Portage version: 2.1-r1)
 (Signed Manifest commit)

3 files changed, 23 insertions, 205 deletions

diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index bf52882f0bb1..e88358fe8ec6 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 8patch-1.5.6.dyc.source_stat 1531 RMD160 5d79c63b915198c21f874bee3a6656178d4712b2 SHA1 1f84be728a72a75da38ea0140c8ae15fe8b206bf SHA256 8e52a7c033a6fe7f0fa12dd3a24234d0a90d9cea05dd80d11b646d9b845d997f
 MD5 74ddaf505ea8bd19fbeb1330a23506ea files/8patch-1.5.6.dyc.source_stat 1531
 RMD160 5d79c63b915198c21f874bee3a6656178d4712b2 files/8patch-1.5.6.dyc.source_stat 1531
@@ -41,8 +44,9 @@ SHA256 040c8b63b2d805dae800fa9b1826d158b7104641339cee9a404985616b3502c7 files/sl
 DIST mutt-1.4.2.1i-ja.1.tar.gz 78266
 DIST mutt-1.4.2.1i.tar.gz 2611253
 DIST mutt-1.5.10i.tar.gz 3156345 RMD160 e6855dd72e41b5e451b17bac9934bea8ca0c5db7 SHA1 3f9cbd330b1458a5c317fd29331f425aa36e0877 SHA256 0e6bcfa33ded3e025b253831d68d441f413d5717a9902a173f25f7de40061118
-DIST mutt-1.5.11-gentoo-patches-nonntp.tar.bz2 20046 RMD160 2b023cfa0f941f87c47a1cb57fbd0b1c2f432024 SHA1 3aef69f6d08667774209c6baf667efa8b1e8199f SHA256 7b70696384eeaa53b17b6a11a2208bfc058f933af1291fd525265a713643eb0f
 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.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 mutt-1.5.8i.tar.gz 3010088 RMD160 2b941aa12381efb2cbad204ebf5512051909911b SHA1 d5381676b7bfb4ebee5d5261e5236d88414c2bd2 SHA256 3f50f60651a8c2543a8935f6593f7260b392e6207e4fa1d591ae54ba077124e0
@@ -82,14 +86,14 @@ EBUILD mutt-1.5.11-r2.ebuild 5826 RMD160 9c6ddfed254442886365632db5db43fdcca8bb3
 MD5 4bb02d0ef6c6631248391487f07776b9 mutt-1.5.11-r2.ebuild 5826
 RMD160 9c6ddfed254442886365632db5db43fdcca8bb3a mutt-1.5.11-r2.ebuild 5826
 SHA256 ad541853e34fb961aaf30cf6da3bc1a1637675f7afbd2724ff445ff7c53d2a76 mutt-1.5.11-r2.ebuild 5826
-EBUILD mutt-1.5.11-r30.ebuild 5323 RMD160 291df47145245f8d89ce536417c918afb1bd1324 SHA1 e3a41002c298d333138641529842d9d84d214512 SHA256 e2b886cc7b05432bde5e73b3fba6bdedc81e05be343469123eed6b881d31731e
-MD5 55485bed8405b35faadc7eaa371b3fde mutt-1.5.11-r30.ebuild 5323
-RMD160 291df47145245f8d89ce536417c918afb1bd1324 mutt-1.5.11-r30.ebuild 5323
-SHA256 e2b886cc7b05432bde5e73b3fba6bdedc81e05be343469123eed6b881d31731e mutt-1.5.11-r30.ebuild 5323
 EBUILD mutt-1.5.11.ebuild 5695 RMD160 55a9927561cc15c242f237ca52cc76361f571d07 SHA1 5f13f323e8846645ebbb586c6a469b5e66e831c7 SHA256 8854f46072ca5d8348f6003aa3df111c7e7345b7ea22983e4b809736b0de7618
 MD5 884f6aca64cbdbc3b1864a945f429413 mutt-1.5.11.ebuild 5695
 RMD160 55a9927561cc15c242f237ca52cc76361f571d07 mutt-1.5.11.ebuild 5695
 SHA256 8854f46072ca5d8348f6003aa3df111c7e7345b7ea22983e4b809736b0de7618 mutt-1.5.11.ebuild 5695
+EBUILD mutt-1.5.12.ebuild 4502 RMD160 74110b813a678e6ac7d7d5e6cb9444955fb58efb SHA1 da3c0bae0d77f85f9496a5157beb21502c78125f SHA256 50e5f05c82a9b0c38d65c7ebb49fdc72879cee71d8327fb0d3e049e54739d53b
+MD5 5121ab58631da19c3a40fcbadea5e764 mutt-1.5.12.ebuild 4502
+RMD160 74110b813a678e6ac7d7d5e6cb9444955fb58efb mutt-1.5.12.ebuild 4502
+SHA256 50e5f05c82a9b0c38d65c7ebb49fdc72879cee71d8327fb0d3e049e54739d53b mutt-1.5.12.ebuild 4502
 EBUILD mutt-1.5.8-r1.ebuild 4605 RMD160 2d62a278308483538dd88e0a6d7ef033a965cee1 SHA1 08d49171380a7d4005084089039705039a4f5d2b SHA256 2fe8fc6633d708bb12821a3c2a9f94ac330d5270ea978ac59f8cbc17b9117d7c
 MD5 cb2a1c4875a1f091afd9577f4f61d2e8 mutt-1.5.8-r1.ebuild 4605
 RMD160 2d62a278308483538dd88e0a6d7ef033a965cee1 mutt-1.5.8-r1.ebuild 4605
@@ -102,10 +106,10 @@ EBUILD mutt-1.5.9.ebuild 6268 RMD160 83d0d5965a820a15110d4640bea7f0cd4327e5fb SH
 MD5 8838ca64d9cd8c5e27b83645106b1ddc mutt-1.5.9.ebuild 6268
 RMD160 83d0d5965a820a15110d4640bea7f0cd4327e5fb mutt-1.5.9.ebuild 6268
 SHA256 21673d75333ef51f57cae5da0c9b6664be5b67e2f46facd6d0e66d5c4c0b0259 mutt-1.5.9.ebuild 6268
-MISC ChangeLog 21449 RMD160 af85ba38b91f1cc86e9bbabcf5695628f61c498d SHA1 bf8a1c8c4d9a5dad4ccf342649300f0f23515ea2 SHA256 a2af1a86ba8d778a8684f6c43fefe680b73218a4a7a2e2ce152e990950993fc4
-MD5 e33994cf2085fecb828a8328b8945a33 ChangeLog 21449
-RMD160 af85ba38b91f1cc86e9bbabcf5695628f61c498d ChangeLog 21449
-SHA256 a2af1a86ba8d778a8684f6c43fefe680b73218a4a7a2e2ce152e990950993fc4 ChangeLog 21449
+MISC ChangeLog 21642 RMD160 a58fa4532b03906048b460b802eccb1e7402985a SHA1 bcdbebffda38bbf4953764e9bd51dd398eba6a28 SHA256 039ac113cbb4e643123f0fec862472bbdeb1bc037ce1f6a4e7dfda0913f61843
+MD5 3ea9ab6eb7f5dcd541d8f949ca324103 ChangeLog 21642
+RMD160 a58fa4532b03906048b460b802eccb1e7402985a ChangeLog 21642
+SHA256 039ac113cbb4e643123f0fec862472bbdeb1bc037ce1f6a4e7dfda0913f61843 ChangeLog 21642
 MISC metadata.xml 348 RMD160 67219e2080107537dc52f7de5c201a8e52ee0270 SHA1 8aa712f8642faf21ab136add0670cba3f8dc15d4 SHA256 a8c434275334e18b2e8c1b68fc88b5a1f6faef5a4344267d7ed708c0794b386d
 MD5 ab8fa36a71860fbc36c89a2c91745d28 metadata.xml 348
 RMD160 67219e2080107537dc52f7de5c201a8e52ee0270 metadata.xml 348
@@ -125,9 +129,9 @@ SHA256 edab047516b025dba487a1ce5a8da5f71c75d4cbd993d50307ac4c5e16b5265e files/di
 MD5 69568e6998e03cb4a0ec726e6db0f77b files/digest-mutt-1.5.11-r2 2373
 RMD160 cece5e8f8845f86c25320abbb28c016b5fe5c3d6 files/digest-mutt-1.5.11-r2 2373
 SHA256 edab047516b025dba487a1ce5a8da5f71c75d4cbd993d50307ac4c5e16b5265e files/digest-mutt-1.5.11-r2 2373
-MD5 bd1b2f644d5f04dd136fe659a34a00c5 files/digest-mutt-1.5.11-r30 539
-RMD160 e816a457ce0af2400411bd79e7728a9891ff0701 files/digest-mutt-1.5.11-r30 539
-SHA256 4d45d39482ae6291ebcba57acc75392843bd64b96587e053103e1176f17d94df files/digest-mutt-1.5.11-r30 539
+MD5 5fb0633ffa6a7322189dc4452e87d425 files/digest-mutt-1.5.12 518
+RMD160 def9a442152526e2e855dc8bf7a4ca54f0dd9fe4 files/digest-mutt-1.5.12 518
+SHA256 64309746568f2c03699ad975a9db071fef8fc95a9bcb4e081d54d921fc33057a files/digest-mutt-1.5.12 518
 MD5 2a6d8631c8e9dc5787f3e81c101b2e35 files/digest-mutt-1.5.8-r1 1915
 RMD160 53c23697d035998f341bfc51c2a3f1101cce6b90 files/digest-mutt-1.5.8-r1 1915
 SHA256 b7f08e26971a5e044dc58eab918fd37ef32f65ae4627183758b452112524f66f files/digest-mutt-1.5.8-r1 1915
@@ -137,3 +141,10 @@ SHA256 3cd60daa15a0044ff4e8b42ff8770aae0d9fcc0fa1d55567174432b7abfdce8f files/di
 MD5 93771187b3c14e11933ee60b4a3cc9e8 files/digest-mutt-1.5.9 1779
 RMD160 7101019a6dbcda7942e348af23c17c0c1ce29ed4 files/digest-mutt-1.5.9 1779
 SHA256 cb3e4d84e1f3f26021e75b4b8e6d78f0545615c46b2f1953d9fbbe50fdb7bc63 files/digest-mutt-1.5.9 1779
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFEzJPzViELBEf1JB0RAtO+AJwIFyKjgo2dh5dyHEP0GpHz9ntR0wCePCaq
+LRgQX4TVzhHxQFptd1H9nms=
+=ciOq
+-----END PGP SIGNATURE-----
diff --git a/mail-client/mutt/files/digest-mutt-1.5.11-r30 b/mail-client/mutt/files/digest-mutt-1.5.11-r30
deleted file mode 100644
index 85aa0abf7c2f..000000000000
--- a/mail-client/mutt/files/digest-mutt-1.5.11-r30
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 9319f81db6e0b0b4f350f2ce8be28553 mutt-1.5.11-gentoo-patches-nonntp.tar.bz2 20046
-RMD160 2b023cfa0f941f87c47a1cb57fbd0b1c2f432024 mutt-1.5.11-gentoo-patches-nonntp.tar.bz2 20046
-SHA256 7b70696384eeaa53b17b6a11a2208bfc058f933af1291fd525265a713643eb0f mutt-1.5.11-gentoo-patches-nonntp.tar.bz2 20046
-MD5 00e6f8f7c37d4840e5e30583ebee21ce mutt-1.5.11.tar.gz 3187375
-RMD160 812bfa6b1c9bfb1650341f7522298699c7b214a5 mutt-1.5.11.tar.gz 3187375
-SHA256 0ff256a9851952a5f6dfb4b7dccf5dc26db9de5502d035748abc93dec84af474 mutt-1.5.11.tar.gz 3187375
diff --git a/mail-client/mutt/mutt-1.5.11-r30.ebuild b/mail-client/mutt/mutt-1.5.11-r30.ebuild
deleted file mode 100644
index 7a1d912279c1..000000000000
--- a/mail-client/mutt/mutt-1.5.11-r30.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# 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-r30.ebuild,v 1.1 2006/05/18 09:32:11 ferdy Exp $
-
-inherit eutils flag-o-matic
-
-# 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://dev.gentoo.org/~ferdy/distfiles/${P}-gentoo-patches-nonntp.tar.bz2
-	)"
-#		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 ~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
-	~sys-devel/autoconf-2.59
-	!vanilla? ( sys-devel/automake )"
-
-pkg_setup() {
-	if ! use imap; then
-		echo
-		einfo "The USE variable 'imap' is not in your USE flags."
-		einfo "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 configure.in sasl checking
-	epatch "${FILESDIR}/${P}-sasl.patch"
-
-	# Fix smime message signing
-	epatch "${FILESDIR}/${P}-fix-smime.patch"
-
-	if ! use vanilla ; then
-		for p in "${WORKDIR}"/${P}-gentoo-patches-nonntp/*.patch ; do
-			epatch "${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
-			eerror "Don't use this ebuild if you NEED nntp support."
-			die "nntp support not available in this ebuild."
-		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"
-	fi
-
-	WANT_AUTOCONF=2.59 autoconf		|| die "autoconf failed"
-}
-
-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
-}