Version bump. Added new patches in Gentoo patchset. Masked because sidebar patch does not apply. Acked by Ferdy.

Package-Manager: portage-2.1.4.5

3 files changed, 220 insertions, 13 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index b987ef6ecef3..d23027259bc2 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/mutt
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.122 2008/08/23 01:43:01 cardoe Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.123 2009/01/11 11:19:55 grobian Exp $
+
+*mutt-1.5.19 (11 Jan 2009)
+
+  11 Jan 2009; Fabian Groffen <grobian@gentoo.org> +mutt-1.5.19.ebuild:
+  Version bump. Added new patches in Gentoo patchset. Masked because sidebar
+  patch does not apply.
 
   23 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 73e9220919b6..bb0299e71db2 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX Muttrc 667 RMD160 0405e73c6a4122869ce9a9bd408068d316740b71 SHA1 e30c96e6f21a30fe576abcb3be65a34accf4e11f SHA256 932940db69c951caaa87a17ee98a8e2262aeadf1e978f6d671b642184c5d545f
 AUX Muttrc.mbox 486 RMD160 0f692c9d3a7591f3a0611529616aa94a5c62a641 SHA1 9e231303fe9fb2fe80542115ceefb972c7b11d5a SHA256 10b251f88ccc5d4c95c96ab17b6ab6a30a16d6590ab896a60037f869fc4d44a0
 AUX mutt-1.5.11-fix-smime.patch 314 RMD160 5163d4e3ef2110cf558e30d5a444aaf6e46cfae4 SHA1 3083961a2876e24fd720288741b52682a3f38ffa SHA256 67e580a4bd41fe33b6c9410dfa18147e6450ff82ab2a5f9c7db5ddec420e2ba6
@@ -23,12 +20,15 @@ DIST mutt-1.5.15-gentoo-patches-r2.tar.bz2 65582 RMD160 c370adb2aaa1ddbfb6fba0b7
 DIST mutt-1.5.15.tar.gz 3517899 RMD160 0cc084d2fcdabc0bc41632fcff90703c206de3db SHA1 1adabf6e07e099bb664c83e3c0100bbbdfec7a9a SHA256 03fa1f45d4743cd395b634d19aebbc2c1918cf6b683e0af51076ccc79f643a9a
 DIST mutt-1.5.16-gentoo-patches-r1.tar.bz2 58021 RMD160 bff5f1c5f0053635419eba6e46a3b9f729efe162 SHA1 68641237e7c3398a133406457340c363d87a92f1 SHA256 2bcee97b6dbb0cae997b6a1bf640520e719aa3c15ce4de67f2e5779a830d4cbd
 DIST mutt-1.5.16.tar.gz 3534894 RMD160 3b345599aa62a956b9c881994ffd74156a5bf808 SHA1 4aaa82bdc75d5e12acc72df4f61fbbf87fd64fc1 SHA256 825e920b394db6f56fa8deb45977c061331f59d953944e27ff595625bbad3e83
+DIST mutt-1.5.19-gentoo-patches.tar.bz2 62837 RMD160 6f0eb14f7e06440608ffdb73b23884aa14bbb5cd SHA1 5d1a6a5af621453dca768b1070e049ba54a1545a SHA256 dc247df06be57dae2095d4a1494e5cd175b91523a467106e9b99acab4c0423a8
+DIST mutt-1.5.19.tar.gz 3558746 RMD160 dcb8d027593bfccd62eb7aba338007bce3c7e22e SHA1 96e4cc1e1419ba816fcc19d77255978e62c20793 SHA256 b160baedf2676a4c2c1a5c74049e2c63f00fccff43ee2594367087a08bfd63c8
 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 patch-1.5.10.tt.assumed_charset.1.gz 2565 RMD160 7d3fb6d32c266ed35babdb10d13aae731783a64e SHA1 f7894822ba9107b3ac443f9b40babbd3ae3c778a SHA256 97cdb63694055e218dff8b85e8c0db8b5e0c7435a91d47479604480319156c6b
 DIST patch-1.5.11.rr.compressed.gz 9995 RMD160 f19cdeb949389cd3dd8f250ac96178f13ce92f67 SHA1 5d678038c7a2109761535bef2c7b65d93814e3d2 SHA256 1e2697136e0431508d2447de8b67fb32114d0b08ec043cc929e3ddf07202fcb5
 DIST patch-1.5.11.vvv.nntp-gentoo.bz2 44351 RMD160 e0d0754fd3f11f7a815dc6c64f0d96b13b2f580f SHA1 5618878a741199f17b61a3fea6d85976ee696814 SHA256 1e94c9862956c4292f518ead7f66192b6ad56abf5ba8660944393956bb32c723
 DIST patch-1.5.16.sidebar.20070704.txt 51103 RMD160 a91a1eefe48c15a048231a632fe285cb2360f365 SHA1 0284a09dfa000d279a0f87c9a0a296f473d4509b SHA256 49123e14bebd33d0e8c7733cab319f3e5bfa591d5f5d74a3dd8964b44bf34ae7
+DIST patch-1.5.18.sidebar.20080611.txt 52201 RMD160 c1c27ea98786abd3fd44b85449dc84aab40ca58e SHA1 c5df4de9d2940a8420cfd66e9c191a0e5b1fdfdc SHA256 a94bc11072dbfe9a4a7d5a761105bf40a496bb2706e9940978de7b64d1555fa7
 DIST patch-1.5.4.lpr.collapse_flagged 4790 RMD160 f8d8ea63c61557321c0afcc2a857a6b53a09629f SHA1 7118628e88a584daeb6a41e961b184ec92784993 SHA256 f0fc39fdad2f7c5ad23ee0ee7f484c2809340ac117a3f7dd8ebad57129a61a4a
 DIST patch-1.5.6.dw.mbox-hook.1 6445 RMD160 baa6e066fd834720ce02ad335c97d37982bcfab7 SHA1 e68073c37cb3a7ab30359e84470a39c58300cde5 SHA256 eaaa1b8279e358b47dca189721fb7fdcbe63576203b76e879868b30206b6166c
 DIST patch-1.5.6.dw.pgp-timeout.1 1448 RMD160 2907033013961301e3e356232c6b6cc646750746 SHA1 2675169ff3e176a431ad59054a83a4acbdd59129 SHA256 9ec9bcca7afccac1c4138be149ceb623fd9fbf60a31cec914d030ec94cde3f38
@@ -40,12 +40,6 @@ EBUILD mutt-1.5.13.ebuild 4288 RMD160 2efb7190a04587ffc6389903ecaf4ee58f49ccbe S
 EBUILD mutt-1.5.14.ebuild 4477 RMD160 854063ac3471204336557b95f2f0b84db782e1a7 SHA1 48f12bd49d495620870f39e80a295d6c009a609f SHA256 cc27d01f1d3d727b37c9b9dad92fff1afd9600301238d195cbcb69d47244bb29
 EBUILD mutt-1.5.15-r2.ebuild 4528 RMD160 2359d39b6d5758d977b1cbfce4c320dc0abb0ed7 SHA1 9a34328905989c05c7ebc5892c0e8151433897b0 SHA256 37c613bcdc54cef3d93b013c6cb792deb2be3ca2de85765a937323bae5041264
 EBUILD mutt-1.5.16.ebuild 4864 RMD160 a50874228d923be535350d8bed9dcdd4b9c20e94 SHA1 0041956d50876272bfd681b90d2ba0db77e2e07d SHA256 f4f8ddf4df5bec18d133986f2abe3a4ba5f62e2c88c5840fab953fd4c0da02f4
-MISC ChangeLog 27593 RMD160 007c6e86e962e1afcfac1c06e2ea6dc7cf9e0087 SHA1 da4f776150d65aab0d210bccf86dd9cc984cef33 SHA256 104cb12c63ce2d187ec7ba6e24de8c3032ba5e64151302c0530bcc987399e19d
+EBUILD mutt-1.5.19.ebuild 5682 RMD160 db8c0f1e4197576391ad587a067bf149152a30fe SHA1 935997fe8dee8da089ad06fa59cff7b612d4c1d3 SHA256 69c022011fb2e4ac88fe90a993634af4a3019ecac75dfe92c2fb77c851c09104
+MISC ChangeLog 27796 RMD160 ccb74b8ccf45d476d5bca5a6f0686583af9fa4bd SHA1 93fc9f73924ec594a0c1f4a4e409fa97fd0e68da SHA256 a3221c5ea9d24498f5e386ef69b6fe12301abb6633dbded5e743fe315b7729b2
 MISC metadata.xml 647 RMD160 1086c89914f6570115977578df14c0870401e0a0 SHA1 a1a497a1e4985546ad2e82dd7ab19df6e98aa225 SHA256 2a016fb1d2d9836d2370d5f958801506db1476361eba3232638fcf015a6950e4
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkivaysACgkQoeSe8B0zEfwTwwCeMG4+glQugP6DGaOgpRGbVa+H
-ChEAn3vUYBKMeuzRVYZhjEWQ/FTR5BC+
-=neiu
------END PGP SIGNATURE-----
diff --git a/mail-client/mutt/mutt-1.5.19.ebuild b/mail-client/mutt/mutt-1.5.19.ebuild
new file mode 100644
index 000000000000..21931273ad82
--- /dev/null
+++ b/mail-client/mutt/mutt-1.5.19.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.19.ebuild,v 1.1 2009/01/11 11:19:55 grobian Exp $
+
+inherit eutils flag-o-matic autotools
+
+PATCHSET_REV=""
+
+# note: latest sidebar patches can be found here:
+# http://www.lunar-linux.org/index.php?option=com_content&task=view&id=44
+SIDEBAR_PATCH_N="patch-1.5.18.sidebar.20080611.txt"
+
+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? (
+		!sidebar? (
+			mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
+			http://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
+		)
+	)
+	sidebar? (
+		http://www.lunar-linux.org/~tchan/mutt/${SIDEBAR_PATCH_N}
+	)"
+IUSE="berkdb crypt debug gdbm gnutls gpgme idn imap mbox nls nntp pop qdbm sasl
+sidebar smime smtp ssl vanilla"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+RDEPEND=">=sys-libs/ncurses-5.2
+	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 )
+	gpgme?   ( >=app-crypt/gpgme-0.9.0 )
+	smime?   ( >=dev-libs/openssl-0.9.6 )
+	app-misc/mime-types"
+DEPEND="${RDEPEND}
+	net-mail/mailbase
+	!vanilla? (
+		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_unpack() {
+	unpack ${A//${SIDEBAR_PATCH_N}} && cd "${S}" || die "unpack failed"
+
+	if ! use vanilla && ! use sidebar ; then
+		use nntp || rm "${PATCHDIR}"/06-nntp.patch
+		for p in "${PATCHDIR}"/*.patch ; do
+			epatch "${p}"
+		done
+	fi
+
+	if use sidebar ; then
+		use vanilla || \
+			ewarn "The sidebar patch is only applied to a vanilla mutt tree."
+		epatch "${DISTDIR}"/${SIDEBAR_PATCH_N}
+	fi
+
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_compile() {
+	declare myconf="
+		$(use_enable nls) \
+		$(use_enable gpgme) \
+		$(use_enable imap) \
+		$(use_enable pop) \
+		$(use_enable smtp) \
+		$(use_enable crypt pgp) \
+		$(use_enable smime) \
+		$(use_enable debug) \
+		$(use_with idn) \
+		--with-curses \
+		--sysconfdir=/etc/${PN} \
+		--with-docdir=/usr/share/doc/${PN}-${PVR} \
+		--with-regex \
+		--enable-nfs-fix --enable-external-dotlock \
+		$(use_with !nntp mixmaster) \
+		--with-exec-shell=/bin/sh"
+
+	case $CHOST in
+		*-darwin7)
+			# locales are broken on Panther
+			myconf="${myconf} --enable-locales-fix --without-wc-funcs"
+			myconf="${myconf} --disable-fcntl --enable-flock"
+		;;
+		*-darwin*)
+			# wc-funcs are buggy on OSX
+			myconf="${myconf} --without-wc-funcs"
+			myconf="${myconf} --disable-fcntl --enable-flock"
+		;;
+		*-solaris*)
+			# Solaris has no flock in the standard headers
+			myconf="${myconf} --enable-fcntl --disable-flock"
+		;;
+		*)
+			myconf="${myconf} --disable-fcntl --enable-flock"
+		;;
+	esac
+
+	# 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 qdbm; then
+		myconf="${myconf} --enable-hcache \
+		--with-qdbm --without-gdbm --without-bdb"
+	elif use gdbm ; then
+		myconf="${myconf} --enable-hcache \
+			--without-qdbm --with-gdbm --without-bdb"
+	elif use berkdb; then
+		myconf="${myconf} --enable-hcache \
+			--without-gdbm --without-qdbm --with-bdb"
+	else
+		myconf="${myconf} --disable-hcache \
+			--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
+
+	# See Bug #11170
+	case ${ARCH} in
+		alpha|ppc) replace-flags "-O[3-9]" "-O2" ;;
+	esac
+
+	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
+
+	# charset.alias is installed by libiconv
+	rm -f "${D}"/usr/lib/charset.alias
+	rm -f "${D}"/usr/share/locale/locale.alias
+
+	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
+}