Revbump for improvement for USE=sidebar, thanks Vincent Brillault in bug #485030

Package-Manager: portage-2.2.7-prefix/cvs/SunOS i386
Manifest-Sign-Key: 0x5F75F607C5C74E89

3 files changed, 255 insertions, 6 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index c280ad8ed2bd..fd942ab96512 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/mutt
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.246 2013/09/09 19:14:05 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.247 2013/09/29 19:23:22 grobian Exp $
+
+*mutt-1.5.21-r14 (29 Sep 2013)
+
+  29 Sep 2013; Fabian Groffen <grobian@gentoo.org> +mutt-1.5.21-r14.ebuild:
+  Revbump for improvement for USE=sidebar, thanks Vincent Brillault in bug
+  #485030
 
 *mutt-1.5.21-r13 (09 Sep 2013)
 
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 4dcb933cb591..69388c669aea 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -5,16 +5,17 @@ AUX Muttrc 667 SHA256 932940db69c951caaa87a17ee98a8e2262aeadf1e978f6d671b642184c
 AUX Muttrc.mbox 486 SHA256 10b251f88ccc5d4c95c96ab17b6ab6a30a16d6590ab896a60037f869fc4d44a0 SHA512 aece9a734d292b6f638d2a0dd39f20d9894b4bb6e6888da606a49274faef9c1864e98eec907ffa7742af58d46456e46b8945d2d47c8b89fc95daa2a8833d3e90 WHIRLPOOL 0bb72d4f1c6d33ececd928dcbbc517be048414beabf2bc488dd3b534633c5b8e30cf3ebe6bc86d76abd84f63657c4fbae05ea61680c4d1b9323ccefaa8b74b89
 DIST mutt-1.5.21-gentoo-patches-r15.tar.bz2 96063 SHA256 01182bcc23a916a72c19a0cf67a4fb52e7bc4d2b65fb1531c076c8b4c74fdc12 SHA512 8b49cc69788fb0cc886dde0f3e2a5c1d421650cb5ad25310429b4dc82f15591c2b4a1fc97f76b6f2566fc12e4224986d92cf72f92c7b4617f35bb77755485734 WHIRLPOOL aeb2c4a82d8ff87364926022b919334bcb472bae20334544f163ab0435457a462bd46c8cf4d8bdc27c71c59108907a94887ad868a548cf3ec08d7a1fbf593bca
 DIST mutt-1.5.21-gentoo-patches-r16.tar.bz2 120095 SHA256 cd0d548e428d27b4f53d347d1aeed1461ecce31d6815b535fe5257ee2ccc199f SHA512 364853593c84e538d727993dd934b26055329a227c71c27f2c17511743e1c7e065c11a641e35e70c6e5ea0a7cd73360e2812214927a35d23ff86e45242fe6548 WHIRLPOOL b60a1dbf7cba3b556ce73d7a667eef36a8734129edef5ebe684bc847b1833e60cc482bd2a9bd19da2e6f3e1770978892520522362653f094ca0148b8e7bc29cd
+DIST mutt-1.5.21-gentoo-patches-r17.tar.bz2 120189 SHA256 0e472fbf6bda19ed1432b20baa7c74a994d336e275643c25bdc79b839f93ee6c SHA512 49c3185377c329036622e2826326652ba31a8c0b601b064298c312edfb6579a3c150b2ff3c9f2a8640f1a5b67237ea7e74a988dffcc359d6259a6247a83a47f6 WHIRLPOOL 468e208023139ac8026bd3c84225d5269373031eb068c78c41ba3a82b03146fd6572b737414a50c8c27beda8b369f1abf0ec34e5756bdcf7dbe941246a35d882
 DIST mutt-1.5.21.tar.gz 3716886 SHA256 2141f36e8d0f4f71c9ca6780001e7cc679fe313e643953fc07f001223e67c4a0 SHA512 077dd8a0dd586badb836b04680052bfadd8574130f27ab11ce9cdbbe8bd5f365e0e79ae3669fad52b2754bc7a66006b242308db1f8d90edd10f6807d7c1b2d12 WHIRLPOOL 818b6d2edfdb3c56475a51f1b8911263f006f0d8a62064ad6dcabc952183c261b920a88a9afd85f3176cc96cb46349c8e4f0110edb228ec412c4d3e2eaebe5c9
 EBUILD mutt-1.5.21-r12.ebuild 7888 SHA256 8cb1fd474f1985a9fbed705cc51a35958364070c60fbe98508c9df163b7a0c73 SHA512 63f00130ecbf6de35d5d099060847f4ed7100067a93da8269e6ef1430ce0f618493e796a684c73f1f80409c602e4aa15299d891d5da5a9ccdab362b0771349b5 WHIRLPOOL 10bb2aa302630a50762755eb29a96dcb4d30a4e42ad39a045a8bf6938594feb82c077eb7800ca3b77f49784db2ecc7010bfb980b68af58f8b2c375a1114eeebf
 EBUILD mutt-1.5.21-r13.ebuild 7771 SHA256 0f029bfd6ee94fc312f251da99298027be6900f34f2a6701777300ecf6f049c4 SHA512 6d510116d8398c89356d86e5d94898e161d7df533f5d0515fda9425a874b9e28f965874669090f4ea292561e1e03996874031a05b1353ba809a10dd87f412dc6 WHIRLPOOL c853245f0b022fd304de563339c4d584151a8b995b4defb6fe83fdb9a8aa770eac4d8b7be113e6324f7289537879378cda95bec254a4b6648435742fc6ceb7fd
-MISC ChangeLog 53746 SHA256 19d125f55eb58c055e5d2f30674a617986a168b8d28a898b8b81c02bb2011c0b SHA512 16fbf74653125d0ccf1622dbff620139b9d9a48c1a9bdd1d47ec83f13c43adf01672b4f2eb5e1a76695c7c0efda51457f31c604d20907d0f6e8da6ac04209ba7 WHIRLPOOL cde0fc59cbee349078807a58bd544a2fde3d1b01a9b5eb53bb445b83d53500b02a1dd49100261fb0b7e62898d5ba9a00035b0d1b9e4f7f793591b0b5fdb7fdef
+EBUILD mutt-1.5.21-r14.ebuild 7793 SHA256 fc56f4a127eca8495a674de97bb681c28c574fd3c3e19144d5438d55cf1ce68b SHA512 dfe91b3bb7a86079c658f9a3521c8a517848979a40e5f7d67b6265ec9d1843cfdba8452afa17ac6920982b4c8709888848935cac410bc0ed46c000751bed592e WHIRLPOOL 42d4aedead5264f06ee5b2a56bda857215a105da9b9df946ff457e9d261cb0a85a111f1d37b2757c01fba989cfe2508bf884c7feb1166375bf3026874e74ecd7
+MISC ChangeLog 53940 SHA256 958591d6d44187dfa9c733c564821e9be1bd5a63ed3650f891ff768c76c3dd51 SHA512 5a7937f5d64cf2886d1061f0dcc627cb9e181516c67a32ee04003171da0b2284e7f4042222bd1f116b7332cc7a43b4338167b369128af206466cccf6109ec63c WHIRLPOOL 35bc30c20fad5c7aa3944112532673e1bf919eb9387a87df6533b68185b3f993c39ae5a1398ce8ac3e429b0e242e6568cc9713a0ad639eb3fe4c570819ea16c4
 MISC metadata.xml 650 SHA256 b7ca8aa383b947a5e90eafab3839a9ed2a8c4f36f4890fec19636d774ccf5320 SHA512 26cb0a77d35e30432a88cf487d61da45c52967e8327f605a25f97a455fbb0eb518a44e589e140fa55cd7610b8fd22861c0149ef4ebaadd78173cbf8431adee5a WHIRLPOOL e4a73bbce432f77cc336bc93fed13ac6fc4e0e651643cc06402488383c5297a360c59a90e7e67667e2b48a564f10e5169282fe053a5426ee5f186338eddd2cee
-MISC mutt-1.5.21-r13.ebuild.orig 7706 SHA256 782120007a964a72ebb9888a4c6c299c61b39c47544c80030253f37cd71bf7f4 SHA512 1c823c4bc48c7303421364aee5a6ad0f3fb97ee741d40247fed315c7aaa5ad9a4582aa0d0bb31dafa8d2bce1253a9af88fb77d1bb51f98b32e1071c36753cbea WHIRLPOOL c9627a5261a1e28628d98bf43f87dfb7be0b8afc8e332b1af8845f1847539a97efc67f905855694dd25e493ad0c925e861a927ed3b05f96006bacdaec67ca3c6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (SunOS)
 
-iEYEAREIAAYFAlIuHgYACgkQX3X2B8XHTomWpQCff+UHm2/WqBcG2OZNi27WPG7n
-WFMAn2CSoZxssmWgDmYuVPyuDuqn9via
-=OHDN
+iEYEAREIAAYFAlJIfisACgkQX3X2B8XHTonhvwCfS3eqxYEC92ceMjrUP8z5teLc
+EQ4AoJzxGkDn/R65oq6CDshfCODjiVcx
+=I9Jn
 -----END PGP SIGNATURE-----
diff --git a/mail-client/mutt/mutt-1.5.21-r14.ebuild b/mail-client/mutt/mutt-1.5.21-r14.ebuild
new file mode 100644
index 000000000000..bb9a9f47c77d
--- /dev/null
+++ b/mail-client/mutt/mutt-1.5.21-r14.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2013 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-r14.ebuild,v 1.1 2013/09/29 19:23:22 grobian Exp $
+
+EAPI="3"
+
+inherit eutils flag-o-matic autotools
+
+PATCHSET_REV="-r17"
+
+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 kerberos mbox nls nntp pop qdbm sasl selinux sidebar smime smtp ssl tokyocabinet"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~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
+	nls? ( virtual/libintl )
+	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 )
+	)
+	kerberos? ( virtual/krb5 )
+	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 )
+	selinux? ( sec-policy/selinux-mutt )
+	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
+	# 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
+	if use sidebar ; then
+		epatch "${PATCHDIR}"/sidebar.patch
+		epatch "${PATCHDIR}"/sidebar-utf8.patch
+		epatch "${PATCHDIR}"/sidebar-dotpathsep.patch
+	fi
+
+	local upatches=
+	# allow user patches
+	epatch_user && upatches=" with user patches"
+
+	# patch version string for bug reports
+	sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}${upatches}"')"/' \
+		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 kerberos gss) \
+		$(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() {
+	emake 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, so fake one
+	if use !doc; then
+		emake -C doc DESTDIR="${D}" muttrc.man || die
+		# make the fake slightly better, bug #413405
+		sed -e 's#@docdir@/manual.txt#http://www.mutt.org/doc/devel/manual.html#' \
+			-e 's#in @docdir@,#at http://www.mutt.org/,#' \
+			-e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \
+			-e "s#@bindir@#${EPREFIX}/usr/bin#" \
+			doc/mutt.man > mutt.1
+		cp doc/muttbug.man 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 \
+			|| 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
+}