Revbump for gnutls-3 compile fix, bug #399073. Cleanup old versions.

Package-Manager: portage-2.2.01.20062-prefix/cvs/Darwin i386

5 files changed, 29 insertions, 471 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index b125c7621fd7..a962f216eb27 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/mutt
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.221 2011/12/04 21:05:40 grobian Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.222 2012/01/17 16:28:34 grobian Exp $
+
+*mutt-1.5.21-r8 (17 Jan 2012)
+
+  17 Jan 2012; Fabian Groffen <grobian@gentoo.org> +mutt-1.5.21-r8.ebuild,
+  -mutt-1.5.20-r18.ebuild, -mutt-1.5.21-r2.ebuild, -mutt-1.5.21-r3.ebuild:
+  Revbump for gnutls-3 compile fix, bug #399073.  Cleanup old versions.
 
   04 Dec 2011; Fabian Groffen <grobian@gentoo.org> mutt-1.5.21-r7.ebuild:
   Add USE=selinux and depend on sec-policy/selinux-mutt following -dev ML
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index f3ca789c46c1..73ed2907619b 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -3,24 +3,19 @@ Hash: SHA1
 
 AUX Muttrc 667 RMD160 0405e73c6a4122869ce9a9bd408068d316740b71 SHA1 e30c96e6f21a30fe576abcb3be65a34accf4e11f SHA256 932940db69c951caaa87a17ee98a8e2262aeadf1e978f6d671b642184c5d545f
 AUX Muttrc.mbox 486 RMD160 0f692c9d3a7591f3a0611529616aa94a5c62a641 SHA1 9e231303fe9fb2fe80542115ceefb972c7b11d5a SHA256 10b251f88ccc5d4c95c96ab17b6ab6a30a16d6590ab896a60037f869fc4d44a0
-DIST mutt-1.5.20-gentoo-patches-r11.tar.bz2 96779 RMD160 f6c54fdba2853caecb1fabc0d59c660f5628c9f3 SHA1 2f8781ed7b73311a4fbe3816c58c4cfa6ddb18a9 SHA256 82284ddfc062fc0f037d2b94ace88bad2f0587d498ddd92a241f6f3b432635c8
-DIST mutt-1.5.20.tar.gz 3635047 RMD160 df582f79364b9fd70a0001e76a119d8f78275ebb SHA1 d2bec7a33771f128ca49b1723b06b6d248a35d31 SHA256 9579fc079d74ff5c89223ff09df402ef4e508ba8ca925c49e74aa09c02a9a796
 DIST mutt-1.5.21-gentoo-patches-r1.tar.bz2 68796 RMD160 10b38c663d39e169c3c456e5cbf7bd855c203186 SHA1 2df153ce3870576e8dba84a6f54df698333587e8 SHA256 89b67ad863941aacdc2b1c9d3fd4f90f7b0cb50bd5fc10c9284a82ce6e7687c0
-DIST mutt-1.5.21-gentoo-patches-r2.tar.bz2 72256 RMD160 cd028c7d12e1885d8ea98ff60554a5fbf98e1922 SHA1 28ef259d8a964bbe46f72169ab597825819f244e SHA256 0ad8dcfbcb5b31321c7e96909d53a5d1e8e2f69241f9ddb0f36f69cf086ed615
-DIST mutt-1.5.21-gentoo-patches-r3.tar.bz2 73761 RMD160 75c016384a9cd37006cb9246e348b876f8316ef2 SHA1 30762d027e36b85db0c071dd18575a39c9263844 SHA256 d371712919c11d975a27c62dd91071898f2344bdbe3653b9e58ff9a152bf753b
 DIST mutt-1.5.21-gentoo-patches-r7.tar.bz2 77409 RMD160 4513c4a72e86c2540199811dc472bb9044f0f682 SHA1 eacde1904bc03f0b8717ea9449748d39f54e3d35 SHA256 963e7feb561166dc6ceb7e72e542c7af206aadbb46dd422c9ec39b3e91652bee
+DIST mutt-1.5.21-gentoo-patches-r8.tar.bz2 85248 RMD160 6d362ac1d129040b64d84f93824c56d0cec5e350 SHA1 f54f74aaf8edec297421f22e3cf93d4b6b22bcd3 SHA256 c3d8d54bb8a297b39b7c34a4fc05ca1bf4998f607d126ec7f93aa2b13fca04d5
 DIST mutt-1.5.21.tar.gz 3716886 RMD160 b235a42972ae410592253cdc117a90baf279f47a SHA1 a8475f2618ce5d5d33bff85c0affdf21ab1d76b9 SHA256 2141f36e8d0f4f71c9ca6780001e7cc679fe313e643953fc07f001223e67c4a0
-EBUILD mutt-1.5.20-r18.ebuild 7129 RMD160 b1733d42e80b300824fdccd7e3dfa2e790022c0d SHA1 fcb324b48d0ddec5a633efc5a03834f50ae93294 SHA256 3951ba13b64990037831bead7b52fc3b338ffa88e33659464a52f9753345de5c
 EBUILD mutt-1.5.21-r1.ebuild 7210 RMD160 374a20b04d4224a70dd586e46f524dbbc7cea5aa SHA1 6cb38aa0bfe28d4c9e6821fecbc679fe465c15c2 SHA256 a0a12e58c0278662869b49be31dc2f340505a48a9210fd9089f18237b86e76ec
-EBUILD mutt-1.5.21-r2.ebuild 7217 RMD160 40330bd836cf7858636332e8313d6d6c3f1710eb SHA1 9f14a1398505f278bd6c42e319f95aa12c458912 SHA256 4f858d4af42137d78e91ad3e66e0b68326b7e90fbf51425275b38d66f3c0f5ea
-EBUILD mutt-1.5.21-r3.ebuild 7217 RMD160 aec76cb9a6b255bb46cd6104b560e5dbc81bc9a2 SHA1 c1e9090945ec81fa13f1a9b3358231c6cebf86a5 SHA256 5612f996383cdff201c0ecb258525e8fe6ad1cac164924d6e693a4ed79c27e18
 EBUILD mutt-1.5.21-r7.ebuild 7454 RMD160 6342a981202c4151c21d8a7f4142d2311069c8c0 SHA1 ad702d970d08fd2f8c15c7c37cdf4291d4b19776 SHA256 2b4cca3d03bc61cb19787f270c5a1bec3b2535fb4d25ef70af327a85c430a081
-MISC ChangeLog 50006 RMD160 3dc93493561e22e1833f953e97487f5a9d8d2236 SHA1 1d29b1efe0ac07a151aaf4c406a1d790dfea4215 SHA256 f937b57bc3abda91c6c40e489095a404bd279a8f098dde3c3349cc0e8278d4be
+EBUILD mutt-1.5.21-r8.ebuild 7454 RMD160 125cdfaaf0f2f5685afa4946f0b233dc49b3558b SHA1 37a8fbaf31da1760ec4963a8a37edd9703b002a3 SHA256 6c5b98cfbc9648e182b5d94ced0ff375af4cc18a5b2314491c16d84920713371
+MISC ChangeLog 50260 RMD160 aea61ca9258dd344f8bcb8bd5ef11548a4285549 SHA1 b51b315d9fe4e876d65ff760e94336a7b1c6391e SHA256 4edbc5636e8d14b9294174ef01e2491b3441f32fc2a865daaea1dfc8c7006097
 MISC metadata.xml 650 RMD160 499b30bbf757e578b8546c72c9d22e033bad1fd0 SHA1 0ad0c9dc1d2a2a1b9da1e32d2f3e056e5b0e6d98 SHA256 b7ca8aa383b947a5e90eafab3839a9ed2a8c4f36f4890fec19636d774ccf5320
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (Darwin)
 
-iEYEARECAAYFAk7b4KkACgkQX3X2B8XHTok6YQCfQYYFVquH1dFeBe5gVdRgvYcY
-pU4Anj+/Qsk/rzs6c2EyjiaekLl6tLNz
-=cexX
+iEYEARECAAYFAk8VobcACgkQX3X2B8XHTonvGgCglvbRgr4Z8DOkl5F/6aOrG4GY
+o04An3WWVD8vtK2VHWSvuPf358yXoeWu
+=XZQk
 -----END PGP SIGNATURE-----
diff --git a/mail-client/mutt/mutt-1.5.20-r18.ebuild b/mail-client/mutt/mutt-1.5.20-r18.ebuild
deleted file mode 100644
index 579dfd6bf472..000000000000
--- a/mail-client/mutt/mutt-1.5.20-r18.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r18.ebuild,v 1.8 2010/10/10 11:56:54 armin76 Exp $
-
-EAPI="3"
-
-inherit eutils flag-o-matic autotools
-
-PATCHSET_REV="-r11"
-
-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
-	mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
-	http://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2"
-IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap mbox nls nntp pop qdbm sasl sidebar smime smtp ssl tokyocabinet"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-RDEPEND=">=sys-libs/ncurses-5.2
-	tokyocabinet?  ( dev-db/tokyocabinet )
-	!tokyocabinet? (
-		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 )
-	)
-	smtp?     (
-		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 )
-	gpg?   ( >=app-crypt/gpgme-0.9.0 )
-	smime?   ( >=dev-libs/openssl-0.9.6 )
-	app-misc/mime-types"
-DEPEND="${RDEPEND}
-	net-mail/mailbase
-	doc? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-		|| ( www-client/lynx www-client/w3m www-client/elinks )
-	)"
-
-PATCHDIR="${WORKDIR}"/${P}-gentoo-patches${PATCHSET_REV}
-
-src_prepare() {
-	# Post-release hot-fixes grabbed from HG, this is what all following
-	# patches are based on in my Mercurial patchqueue (mq).
-	# If you ever take over or need to modify patches here, just ask me
-	# (grobian) for a Mercurial clone of my gentoo branch(es) and
-	# patchqueue as it'll save you a lot of work.
-	for rev in $(eval echo {0..${PR#r}}) ; do
-		local revpatch="${PATCHDIR}"/mutt-gentoo-${PV}-r${rev}.patch
-		[[ -e ${revpatch} ]] && \
-			epatch "${revpatch}"
-	done
-
-	# this patch is non-generic and only works because we use a sysconfdir
-	# different from the one used by the mailbase ebuild
-	use prefix && epatch "${PATCHDIR}"/prefix-mailcap.patch
-
-	# must have fixes to compile or behave correctly, upstream
-	# ignores, disagrees or simply doesn't respond/apply
-	epatch "${PATCHDIR}"/bdb-prefix.patch # fix bdb detection
-	epatch "${PATCHDIR}"/interix-btowc.patch
-	epatch "${PATCHDIR}"/solaris-ncurses-chars.patch
-	epatch "${PATCHDIR}"/gpgme-1.2.0.patch
-	# same category, but functional bits
-	epatch "${PATCHDIR}"/dont-reveal-bbc.patch
-	epatch "${PATCHDIR}"/realpath-slowness.patch
-
-	# the big feature patches that upstream doesn't want to include, but
-	# nearly every distro has due to their usefulness
-	for p in "${PATCHDIR}"/[0-9][0-9]-*.patch ; do
-		epatch "${p}"
-	done
-
-	use sidebar && epatch "${PATCHDIR}"/sidebar.20090619.patch
-
-	# patch version string for bug reports
-	sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}"')"/' \
-		muttlib.c || die "failed patching in Gentoo version"
-
-	# many patches touch the buildsystem, we always need this
-	AT_M4DIR="m4" eautoreconf
-
-	# the configure script contains some "cleverness" whether or not to setgid
-	# the dotlock program, resulting in bugs like #278332
-	sed -i -e 's/@DOTLOCK_GROUP@//' \
-		Makefile.in || die "sed failed"
-
-	# don't just build documentation (lengthy process, with big dependencies)
-	if use !doc ; then
-		sed -i -e '/SUBDIRS =/s/doc//' Makefile.in || die
-	fi
-}
-
-src_configure() {
-	local myconf="
-		$(use_enable crypt pgp) \
-		$(use_enable debug) \
-		$(use_enable gpg gpgme) \
-		$(use_enable imap) \
-		$(use_enable nls) \
-		$(use_enable nntp) \
-		$(use_enable pop) \
-		$(use_enable smime) \
-		$(use_enable smtp) \
-		$(use_with idn) \
-		$(use_with !nntp mixmaster) \
-		--enable-compressed \
-		--enable-external-dotlock \
-		--enable-nfs-fix \
-		--sysconfdir="${EPREFIX}"/etc/${PN} \
-		--with-curses \
-		--with-docdir="${EPREFIX}"/usr/share/doc/${PN}-${PVR} \
-		--with-regex \
-		--with-exec-shell=${EPREFIX}/bin/sh"
-
-	case $CHOST in
-		*-solaris*)
-			# Solaris has no flock in the standard headers
-			myconf="${myconf} --enable-fcntl --disable-flock"
-		;;
-		*)
-			myconf="${myconf} --disable-fcntl --enable-flock"
-		;;
-	esac
-
-	# mutt prioritizes gdbm over bdb, so we will too.
-	# hcache feature requires at least one database is in USE.
-	if use tokyocabinet; then
-		myconf="${myconf} --enable-hcache \
-			--with-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
-	elif use qdbm; then
-		myconf="${myconf} --enable-hcache \
-			--without-tokyocabinet --with-qdbm --without-gdbm --without-bdb"
-	elif use gdbm ; then
-		myconf="${myconf} --enable-hcache \
-			--without-tokyocabinet --without-qdbm --with-gdbm --without-bdb"
-	elif use berkdb; then
-		myconf="${myconf} --enable-hcache \
-			--without-tokyocabinet --without-qdbm --without-gdbm --with-bdb"
-	else
-		myconf="${myconf} --disable-hcache \
-			--without-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
-	fi
-
-	# there's no need for gnutls, ssl or sasl without socket support
-	if use pop || use imap || use smtp ; 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
-
-	if use mbox; then
-		myconf="${myconf} --with-mailpath=${EPREFIX}/var/spool/mail"
-	else
-		myconf="${myconf} --with-homespool=Maildir"
-	fi
-
-	econf ${myconf} || die "configure failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-	find "${ED}"/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 "${ED}"/etc/${PN}/mime.types
-	dosym /etc/mime.types /etc/${PN}/mime.types
-
-	# A man-page is always handy
-	if use !doc; then
-		cp doc/mutt.man mutt.1
-		cp doc/muttbug.man flea.1
-		doman mutt.1 flea.1
-	else
-		# nuke manpages that should be provided by an MTA, bug #177605
-		rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \
-			|| ewarn "failed to remove files, please file a bug"
-	fi
-
-	if use !prefix ; then
-		fowners root:mail /usr/bin/mutt_dotlock
-		fperms g+s /usr/bin/mutt_dotlock
-	fi
-
-	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.21-r3.ebuild b/mail-client/mutt/mutt-1.5.21-r3.ebuild
deleted file mode 100644
index ffe0b52ec7dc..000000000000
--- a/mail-client/mutt/mutt-1.5.21-r3.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.21-r3.ebuild,v 1.2 2011/08/17 20:11:31 grobian Exp $
-
-EAPI="3"
-
-inherit eutils flag-o-matic autotools
-
-PATCHSET_REV="-r3"
-
-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
-	mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
-	http://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2"
-IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap mbox nls nntp pop qdbm sasl sidebar smime smtp ssl tokyocabinet"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-RDEPEND=">=sys-libs/ncurses-5.2
-	tokyocabinet?  ( dev-db/tokyocabinet )
-	!tokyocabinet? (
-		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 )
-	)
-	smtp?     (
-		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 )
-	gpg?   ( >=app-crypt/gpgme-0.9.0 )
-	smime?   ( >=dev-libs/openssl-0.9.6 )
-	app-misc/mime-types"
-DEPEND="${RDEPEND}
-	net-mail/mailbase
-	doc? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-		|| ( www-client/lynx www-client/w3m www-client/elinks )
-	)"
-
-PATCHDIR="${WORKDIR}"/${P}-gentoo-patches${PATCHSET_REV}
-
-src_prepare() {
-	# Post-release hot-fixes grabbed from HG, this is what all following
-	# patches are based on in my Mercurial patchqueue (mq).
-	# If you ever take over or need to modify patches here, just check
-	# out the gentoo branch(es) of Gentoo's Mutt Mercurial clone, and
-	# the patchqueue as it'll save you a lot of work.
-	# http://prefix.gentooexperimental.org:8000/mutt/
-	# http://prefix.gentooexperimental.org:8000/mutt-patches/
-	for rev in $(eval echo {0..${PR#r}}) ; do
-		local revpatch="${PATCHDIR}"/mutt-gentoo-${PV}-r${rev}.patch
-		[[ -e ${revpatch} ]] && \
-			epatch "${revpatch}"
-	done
-
-	# this patch is non-generic and only works because we use a sysconfdir
-	# different from the one used by the mailbase ebuild
-	use prefix && epatch "${PATCHDIR}"/prefix-mailcap.patch
-
-	# must have fixes to compile or behave correctly, upstream
-	# ignores, disagrees or simply doesn't respond/apply
-	epatch "${PATCHDIR}"/bdb-prefix.patch # fix bdb detection
-	epatch "${PATCHDIR}"/interix-btowc.patch
-	epatch "${PATCHDIR}"/solaris-ncurses-chars.patch
-	epatch "${PATCHDIR}"/gpgme-1.2.0.patch
-	# same category, but functional bits
-	epatch "${PATCHDIR}"/dont-reveal-bbc.patch
-
-	# the big feature patches that upstream doesn't want to include, but
-	# nearly every distro has due to their usefulness
-	for p in "${PATCHDIR}"/[0-9][0-9]-*.patch ; do
-		epatch "${p}"
-	done
-
-	# we conditionalise this one, simply because it has considerable
-	# impact on the code
-	use sidebar && epatch "${PATCHDIR}"/sidebar.patch
-
-	# patch version string for bug reports
-	sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}"')"/' \
-		muttlib.c || die "failed patching in Gentoo version"
-
-	# many patches touch the buildsystem, we always need this
-	AT_M4DIR="m4" eautoreconf
-
-	# the configure script contains some "cleverness" whether or not to setgid
-	# the dotlock program, resulting in bugs like #278332
-	sed -i -e 's/@DOTLOCK_GROUP@//' \
-		Makefile.in || die "sed failed"
-
-	# don't just build documentation (lengthy process, with big dependencies)
-	if use !doc ; then
-		sed -i -e '/SUBDIRS =/s/doc//' Makefile.in || die
-	fi
-}
-
-src_configure() {
-	local myconf="
-		$(use_enable crypt pgp) \
-		$(use_enable debug) \
-		$(use_enable gpg gpgme) \
-		$(use_enable imap) \
-		$(use_enable nls) \
-		$(use_enable nntp) \
-		$(use_enable pop) \
-		$(use_enable smime) \
-		$(use_enable smtp) \
-		$(use_with idn) \
-		$(use_with !nntp mixmaster) \
-		--enable-compressed \
-		--enable-external-dotlock \
-		--enable-nfs-fix \
-		--sysconfdir="${EPREFIX}"/etc/${PN} \
-		--with-curses \
-		--with-docdir="${EPREFIX}"/usr/share/doc/${PN}-${PVR} \
-		--with-regex \
-		--with-exec-shell=${EPREFIX}/bin/sh"
-
-	case $CHOST in
-		*-solaris*)
-			# Solaris has no flock in the standard headers
-			myconf="${myconf} --enable-fcntl --disable-flock"
-		;;
-		*)
-			myconf="${myconf} --disable-fcntl --enable-flock"
-		;;
-	esac
-
-	# mutt prioritizes gdbm over bdb, so we will too.
-	# hcache feature requires at least one database is in USE.
-	if use tokyocabinet; then
-		myconf="${myconf} --enable-hcache \
-			--with-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
-	elif use qdbm; then
-		myconf="${myconf} --enable-hcache \
-			--without-tokyocabinet --with-qdbm --without-gdbm --without-bdb"
-	elif use gdbm ; then
-		myconf="${myconf} --enable-hcache \
-			--without-tokyocabinet --without-qdbm --with-gdbm --without-bdb"
-	elif use berkdb; then
-		myconf="${myconf} --enable-hcache \
-			--without-tokyocabinet --without-qdbm --without-gdbm --with-bdb"
-	else
-		myconf="${myconf} --disable-hcache \
-			--without-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
-	fi
-
-	# there's no need for gnutls, ssl or sasl without socket support
-	if use pop || use imap || use smtp ; 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
-
-	if use mbox; then
-		myconf="${myconf} --with-mailpath=${EPREFIX}/var/spool/mail"
-	else
-		myconf="${myconf} --with-homespool=Maildir"
-	fi
-
-	econf ${myconf} || die "configure failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-	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 "${ED}"/etc/${PN}/mime.types
-	dosym /etc/mime.types /etc/${PN}/mime.types
-
-	# A man-page is always handy
-	if use !doc; then
-		cp doc/mutt.man mutt.1
-		cp doc/muttbug.man flea.1
-		doman mutt.1 flea.1
-	else
-		# nuke manpages that should be provided by an MTA, bug #177605
-		rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \
-			|| ewarn "failed to remove files, please file a bug"
-	fi
-
-	if use !prefix ; then
-		fowners root:mail /usr/bin/mutt_dotlock
-		fperms g+s /usr/bin/mutt_dotlock
-	fi
-
-	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.21-r2.ebuild b/mail-client/mutt/mutt-1.5.21-r8.ebuild
index 6beed8f1cb56..b6420eb5630f 100644
--- a/mail-client/mutt/mutt-1.5.21-r2.ebuild
+++ b/mail-client/mutt/mutt-1.5.21-r8.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.21-r2.ebuild,v 1.2 2011/08/17 20:11:31 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.21-r8.ebuild,v 1.1 2012/01/17 16:28:34 grobian Exp $
 
 EAPI="3"
 
 inherit eutils flag-o-matic autotools
 
-PATCHSET_REV="-r2"
+PATCHSET_REV="-r8"
 
 DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="http://www.mutt.org"
+HOMEPAGE="http://www.mutt.org/"
 SRC_URI="ftp://ftp.mutt.org/mutt/devel/${P}.tar.gz
 	mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
 	http://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2"
-IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap mbox nls nntp pop qdbm sasl sidebar smime smtp ssl tokyocabinet"
+IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap mbox nls nntp pop qdbm sasl selinux sidebar smime smtp ssl tokyocabinet"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
@@ -42,8 +42,9 @@ RDEPEND=">=sys-libs/ncurses-5.2
 		sasl?    ( >=dev-libs/cyrus-sasl-2 )
 	)
 	idn?     ( net-dns/libidn )
-	gpg?   ( >=app-crypt/gpgme-0.9.0 )
+	gpg?     ( >=app-crypt/gpgme-0.9.0 )
 	smime?   ( >=dev-libs/openssl-0.9.6 )
+	selinux? ( sec-policy/selinux-mutt )
 	app-misc/mime-types"
 DEPEND="${RDEPEND}
 	net-mail/mailbase
@@ -91,7 +92,11 @@ src_prepare() {
 
 	# we conditionalise this one, simply because it has considerable
 	# impact on the code
-	use sidebar && epatch "${PATCHDIR}"/sidebar.patch
+	if use sidebar ; then
+		epatch "${PATCHDIR}"/sidebar.patch
+		epatch "${PATCHDIR}"/sidebar-utf8.patch
+		epatch "${PATCHDIR}"/sidebar-dotpathsep.patch
+	fi
 
 	# patch version string for bug reports
 	sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}"')"/' \
@@ -200,9 +205,11 @@ src_install() {
 
 	# A man-page is always handy
 	if use !doc; then
+		make -C doc DESTDIR="${D}" muttrc.man || die
 		cp doc/mutt.man mutt.1
 		cp doc/muttbug.man flea.1
-		doman mutt.1 flea.1
+		cp doc/muttrc.man muttrc.5
+		doman mutt.1 flea.1 muttrc.5
 	else
 		# nuke manpages that should be provided by an MTA, bug #177605
 		rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \