To all you sidebar users out there: this is your revision. Sidebar patch is applied (still conditionally on USE=sidebar) on top of *all* other fixes and features (including nntp).

Package-Manager: portage-2.2.01.15395-prefix/cvs/Darwin powerpc

3 files changed, 238 insertions, 2 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index 65223e4c4a56..27f1c0db18cf 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for mail-client/mutt
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.189 2010/07/16 07:11:48 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.190 2010/07/22 20:56:20 grobian Exp $
+
+*mutt-1.5.20-r16 (22 Jul 2010)
+
+  22 Jul 2010; Fabian Groffen <grobian@gentoo.org> +mutt-1.5.20-r16.ebuild:
+  Bump, next to a little bugfix from upstream, this revision no longer has
+  USE=vanilla (because vanilla Mutt is simply useless these days), always
+  has the nntp patch applied (but enabled/disabled per configure), and has
+  (most people were longing for this) the sidebar patch applied on top of
+  all other fixes and features.
 
   16 Jul 2010; Fabian Groffen <grobian@gentoo.org> mutt-1.5.20-r15.ebuild,
   -files/mutt-1.5.20_ssl.patch:
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 92f0ae58c77d..747c94464b51 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -11,11 +11,13 @@ AUX mutt-1.5.20-gpgme-1.2.0.patch 623 RMD160 0387025c571723f9ebde284789c65464cf0
 AUX mutt-1.5.20-realpath-slowness.patch 676 RMD160 7e658134eabeec3f67c4de161bd9996e0096f240 SHA1 e189eb03f2488ad158bdd8ec93fed0f7e6762746 SHA256 a8d15cb9e5fb130b6fc28d9b323afe62e2dbe33f1b86f707de20053f2b9a9a3a
 DIST mutt-1.5.20-gentoo-patches-r5.1.tar.bz2 78129 RMD160 d34779d691295d85a55828fa51e64b06a6c92d1d SHA1 193ec7edb6cffde670086a262aff9615f07adea8 SHA256 4c855764daaf939777c8f23a217cf43d6246dbc89f99827030c1ad3d53820b2d
 DIST mutt-1.5.20-gentoo-patches-r7.tar.bz2 80979 RMD160 ec85bc92af02530f4b6ca972f299a9d93e93cd5c SHA1 4af9df1fe82afb20ea556e70ba0e9d5d2af964eb SHA256 e51e8edc77f3127dded9a23b5cfb8b7326cfb6e97f43aae378390c71ba54b6b6
+DIST mutt-1.5.20-gentoo-patches-r8.tar.bz2 88871 RMD160 a9992deb9ab78aa3597add4ef7256f705d1ba538 SHA1 79cffe7a1fc09645208a92342f5ee539023a57a5 SHA256 06fd5b241f931fec61434c1ec9312833a82af34e04b35d4b54f9056ca5510d59
 DIST mutt-1.5.20.tar.gz 3635047 RMD160 df582f79364b9fd70a0001e76a119d8f78275ebb SHA1 d2bec7a33771f128ca49b1723b06b6d248a35d31 SHA256 9579fc079d74ff5c89223ff09df402ef4e508ba8ca925c49e74aa09c02a9a796
 DIST patch-1.5.20.sidebar.20090619.txt 53335 RMD160 4c693b100a320d11ea94aedb75cff63d9f6cfb3f SHA1 d72355e39674bb4f892e4af3b84fe49c94415487 SHA256 6e925319adbfa0ba7f120f0ef4ddc62f99b1dc8f6a8b5bdc31dd8a0040aded1b
 EBUILD mutt-1.5.20-r10.ebuild 7958 RMD160 c185ac0ab4fa7cafc2f1e645b5d445c133db59bb SHA1 a87fd09bac2321e30748439b2bbc717254076f54 SHA256 d93b2daf5926e01ba4906720fb86f7285cfa29b7877a32f1aeaababb00e35837
 EBUILD mutt-1.5.20-r13.ebuild 7710 RMD160 1a0685395beda44ab9954552a1cb12b670cb2184 SHA1 ad9e3c4643f3be5ad1bc3eaff7742bf68607a3fc SHA256 0171a87a7d880de9f276c97452655ddd87ba6ae5c81c2dbe61dc10ec1c2363cc
 EBUILD mutt-1.5.20-r15.ebuild 8625 RMD160 838192f5eb1fb5d34724d8b4ddecd5c06a3ac868 SHA1 b6a94c8d0b1945ae8949becf73507958f1b22b11 SHA256 f2834806aa3e34a6f5573837e35d5a18e31ef0ff4f3c1ecb31b1195ecfd74bea
+EBUILD mutt-1.5.20-r16.ebuild 7197 RMD160 a918d18ac4e7d8f100e3e780b8f987afea0edfd4 SHA1 a1d04954ea12ad7bcd1d5d429037b94ed28709ef SHA256 a7c9123f75d77e420d3e04a02fac2c33b9555163c6c92006b43d17a9d01692cc
 EBUILD mutt-1.5.20-r6.ebuild 7280 RMD160 db5a40d2e845def3f4819de2d8272049215da0f1 SHA1 86e2c567618d1e6753806790072efb2811515348 SHA256 4999238ee8c6d875179d49f1b2b32e82c50b6179b8b4f0f6f97948910f55de11
-MISC ChangeLog 44320 RMD160 84fd89254511f364525b58137fab0554caca9ea5 SHA1 e85c191e9513b749be5b59d77ccbae9aee99caf1 SHA256 fb81ca1f4c3c490da294a2a6d650e4f7948a9abe64b2115370ce564c406e0f4b
+MISC ChangeLog 44759 RMD160 b949188d48e42202a28f0175031eecc62673e2a3 SHA1 ed8afd09187db20be2ae181aa781930b880efd1a SHA256 e243aeff20513550bf2542d79b7f3df7720d42a23d6f76ced7cdf5befb666040
 MISC metadata.xml 650 RMD160 499b30bbf757e578b8546c72c9d22e033bad1fd0 SHA1 0ad0c9dc1d2a2a1b9da1e32d2f3e056e5b0e6d98 SHA256 b7ca8aa383b947a5e90eafab3839a9ed2a8c4f36f4890fec19636d774ccf5320
diff --git a/mail-client/mutt/mutt-1.5.20-r16.ebuild b/mail-client/mutt/mutt-1.5.20-r16.ebuild
new file mode 100644
index 000000000000..b1af6f3405e4
--- /dev/null
+++ b/mail-client/mutt/mutt-1.5.20-r16.ebuild
@@ -0,0 +1,225 @@
+# 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-r16.ebuild,v 1.1 2010/07/22 20:56:20 grobian Exp $
+
+EAPI="3"
+
+inherit eutils flag-o-matic autotools
+
+PATCHSET_REV="-r8"
+
+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 havesi 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
+	epatch "${PATCHDIR}"/crash-on-invalid-limit-pattern.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
+}