Add a package.mask'd version for patch testing.

(Portage version: 2.0.54-r2)

4 files changed, 198 insertions, 1 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index f5fcb1eade5d..6652d263c30a 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/mutt
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.70 2006/02/20 01:29:09 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.71 2006/05/18 09:32:11 ferdy Exp $
+
+*mutt-1.5.11-r30 (18 May 2006)
+
+  18 May 2006; Fernando J. Pereda <ferdy@gentoo.org>
+  +mutt-1.5.11-r30.ebuild:
+  Add a package.mask'd version for patch testing.
 
   20 Feb 2006; Joshua Kinard <kumba@gentoo.org> mutt-1.5.11.ebuild:
   Marked stable on mips.
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index b14365828c2d..9df9e2dcbe1c 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -6,6 +6,7 @@ MD5 cae412df424c3f499c539c93ebd02e48 files/digest-mutt-1.4.2.1 292
 MD5 7beb1d2025d90ce7e9e6772507627431 files/digest-mutt-1.5.10-r1 655
 MD5 86777e24060a785994a8ddd2bd22c38f files/digest-mutt-1.5.11 653
 MD5 dfc509d0b1283134c72b0be93dcb1815 files/digest-mutt-1.5.11-r1 653
+MD5 ce8fe4233ad2fb1f0b6f8d62fe4c61ba files/digest-mutt-1.5.11-r30 149
 MD5 17ca1e2a5696251d01b9b488bcb0fc79 files/digest-mutt-1.5.8-r1 581
 MD5 2f50af3ba9259b1ac0dcf7faa2e9545e files/digest-mutt-1.5.8-r2 662
 MD5 3f1450d2a3bdb1e595bf5820239364cc files/digest-mutt-1.5.9 659
@@ -19,6 +20,7 @@ MD5 ab8fa36a71860fbc36c89a2c91745d28 metadata.xml 348
 MD5 dc42018781b04e0934dcfc4f3a6e6303 mutt-1.4.2.1.ebuild 3331
 MD5 327b8e25b061f5295baca07bfddab43d mutt-1.5.10-r1.ebuild 5581
 MD5 3b8e3d76bcfb51c31777a7ebd70ebebd mutt-1.5.11-r1.ebuild 5781
+MD5 850e9af12c2384131e938dd841897b4b mutt-1.5.11-r30.ebuild 5322
 MD5 884f6aca64cbdbc3b1864a945f429413 mutt-1.5.11.ebuild 5695
 MD5 cb2a1c4875a1f091afd9577f4f61d2e8 mutt-1.5.8-r1.ebuild 4605
 MD5 b684c056a91bcad2e4f3d99c9332c1a0 mutt-1.5.8-r2.ebuild 4961
diff --git a/mail-client/mutt/files/digest-mutt-1.5.11-r30 b/mail-client/mutt/files/digest-mutt-1.5.11-r30
new file mode 100644
index 000000000000..dbcd89994992
--- /dev/null
+++ b/mail-client/mutt/files/digest-mutt-1.5.11-r30
@@ -0,0 +1,2 @@
+MD5 9230486deecd53f3dadbd9306e01d519 mutt-1.5.11-gentoo-patches-nonntp.tar.bz2 19941
+MD5 00e6f8f7c37d4840e5e30583ebee21ce 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
new file mode 100644
index 000000000000..7a1d912279c1
--- /dev/null
+++ b/mail-client/mutt/mutt-1.5.11-r30.ebuild
@@ -0,0 +1,187 @@
+# 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
+}