New snapshot; upstream included three of our patches

(Portage version: 2.1_pre7-r1)

5 files changed, 364 insertions, 4 deletions

diff --git a/mail-client/muttng/ChangeLog b/mail-client/muttng/ChangeLog
index 108212fe5dab..bd4743c1f289 100644
--- a/mail-client/muttng/ChangeLog
+++ b/mail-client/muttng/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-client/muttng
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/muttng/ChangeLog,v 1.15 2006/03/18 12:13:42 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/muttng/ChangeLog,v 1.16 2006/03/30 15:58:41 grobian Exp $
+
+*muttng-20060329 (30 Mar 2006)
+
+  30 Mar 2006; Fabian Groffen <grobian@gentoo.org>
+  +files/muttng-20060317-sigremovereply.patch, +muttng-20060329.ebuild:
+  New snapshot; upstream included three of our patches.  Added sigremovereply
+  patch from upstream patch-repo, see strip_sig var.
 
 *muttng-20060309 (18 Mar 2006)
 
diff --git a/mail-client/muttng/Manifest b/mail-client/muttng/Manifest
index b06afb00763a..7ba146de773d 100644
--- a/mail-client/muttng/Manifest
+++ b/mail-client/muttng/Manifest
@@ -1,12 +1,15 @@
-MD5 98f1c6d471e584e9a876aa1daa8ce01a ChangeLog 3115
-RMD160 d194a9c3e9a565483238927d09024f976450b141 ChangeLog 3115
-SHA256 c521d7cb6ddd0ccb01596490b935e14fd24d503d5888639a3e1432365507e704 ChangeLog 3115
+MD5 e4229a03b64f772dd89f33f3c865d412 ChangeLog 3402
+RMD160 4d74bee917105c061dcc10b09d6f7f3839842ddd ChangeLog 3402
+SHA256 06c4a0bf6d1b4b2a5bd5b6ad0d48707f03a3af30b9fad7f141b5a3b97d04d002 ChangeLog 3402
 MD5 bd54bd286ea38a392d06d9f2dcaebbf1 files/digest-muttng-20060212 250
 RMD160 f5937103f1591cc596adeffd16533b46fff92de9 files/digest-muttng-20060212 250
 SHA256 412bbe4aa846e0686601a0e9b360e2f95b6b68806f91666bf503b810347cafed files/digest-muttng-20060212 250
 MD5 671bed51cc0241195b83035bda561573 files/digest-muttng-20060309 250
 RMD160 7eb42190f22ec6981831ddcfd465e0bd8f0c5fe9 files/digest-muttng-20060309 250
 SHA256 09967931e6b1c1bc408544d8e2210579bc080d934207666e483876de4fe928ba files/digest-muttng-20060309 250
+MD5 5696ebb596f8b997371a8eebfd1d3791 files/digest-muttng-20060329 250
+RMD160 21ee78a71d1cf96bfc1e797e1bd12d65cf9d2e9c files/digest-muttng-20060329 250
+SHA256 80dc49fd4d3ddd31a5cbc73df37f3e69261a9ebaa03a518299d37926fee8b508 files/digest-muttng-20060329 250
 MD5 c21325b42cf2c622ab52c80de5521fe0 files/muttng-20060309-break_thread.patch 437
 RMD160 649315818212db525833557b6c1db83601196bc4 files/muttng-20060309-break_thread.patch 437
 SHA256 5a0b5b7e6ba41d7c7aa3b7aaf27d7c89af4801ae4b7548c7564b7af1a333e474 files/muttng-20060309-break_thread.patch 437
@@ -19,6 +22,9 @@ SHA256 97d7dc7611e178bd220f730de1b090b9a7654f0a835bccb780a9b71b80665b64 files/mu
 MD5 f9b88fa28c766dcc15f27ded3bf7f892 files/muttng-20060309-statusbar_length.patch 549
 RMD160 4cf9bb0c64d1adda69ad836e46d6ea053e9f3bdd files/muttng-20060309-statusbar_length.patch 549
 SHA256 f2c2e6651f14e0aa488d028673417b1531a4dcef0e5d66c37f3af6501c39b399 files/muttng-20060309-statusbar_length.patch 549
+MD5 65b707b3a6eeaafec18588ab59e0249e files/muttng-20060317-sigremovereply.patch 5676
+RMD160 7aa2296fa0892b584a707361a3b2ae9ddc169227 files/muttng-20060317-sigremovereply.patch 5676
+SHA256 0b9f29d8e038d150863009f0cbfc6daadd2857ceb674a1f7d10100f4bd666bdd files/muttng-20060317-sigremovereply.patch 5676
 MD5 856e89d80001e53a31845405dfef7f03 metadata.xml 227
 RMD160 616aff994f5c341874112505920241b3d4d9cbfa metadata.xml 227
 SHA256 1c5377e37b9c43ed35a6528e7240e31408fa418ee710e571afe23e37a132e09c metadata.xml 227
@@ -28,3 +34,6 @@ SHA256 145501566aee5e68bbc65d8c8c2590468fadda75d41e503b33694a9349f629a5 muttng-2
 MD5 37629dbc4b6c927e29c74d3991f894e0 muttng-20060309.ebuild 4556
 RMD160 e443ab44743f70ae9a6eb8ec9ca892e69a39272b muttng-20060309.ebuild 4556
 SHA256 c892b7047af9cb8753ca74d834d31621456f138c8c92186859c64ae529797a21 muttng-20060309.ebuild 4556
+MD5 4a8297e9831901922831b4a1c4dae6df muttng-20060329.ebuild 4538
+RMD160 f4e0af1bd3882465ff0a126ec57826b8ef24ef1c muttng-20060329.ebuild 4538
+SHA256 2aae24de661fa1509a6a32d4e56faf718ddf68fc744f43cb6efd7fa20827e413 muttng-20060329.ebuild 4538
diff --git a/mail-client/muttng/files/digest-muttng-20060329 b/mail-client/muttng/files/digest-muttng-20060329
new file mode 100644
index 000000000000..b5072f351d01
--- /dev/null
+++ b/mail-client/muttng/files/digest-muttng-20060329
@@ -0,0 +1,3 @@
+MD5 80efb81839800ffde62219e30fdfbe63 muttng-20060329.tar.gz 2733880
+RMD160 c790c3dd05da28aff13d8eeec56b3a544e9a9d2f muttng-20060329.tar.gz 2733880
+SHA256 3ac5f98f0125bf61e802bf15f4b34ac6719f5f37b907dd0acf6c19de39d8e16f muttng-20060329.tar.gz 2733880
diff --git a/mail-client/muttng/files/muttng-20060317-sigremovereply.patch b/mail-client/muttng/files/muttng-20060317-sigremovereply.patch
new file mode 100644
index 000000000000..782a0148442b
--- /dev/null
+++ b/mail-client/muttng/files/muttng-20060317-sigremovereply.patch
@@ -0,0 +1,184 @@
+Index: mutt.h
+===================================================================
+--- mutt.h	(revision 537)
++++ mutt.h	(working copy)
+@@ -413,6 +413,7 @@
+   OPTSTRICTMAILTO,
+   OPTSTRICTMIME,
+   OPTSTRICTTHREADS,
++  OPTSTRIPSIG,
+   OPTSTRIPWAS,
+   OPTSTUFFQUOTED,
+   OPTSUSPEND,
+Index: state.c
+===================================================================
+--- state.c	(revision 537)
++++ state.c	(working copy)
+@@ -67,6 +67,9 @@
+ 
+ void state_prefix_putc (char c, STATE * s)
+ {
++  if (s->flags & M_FINISHED)
++    return;
++
+   if (s->flags & M_PENDINGPREFIX) {
+     int i;
+ 
+@@ -77,46 +80,54 @@
+       char buf[2 * SHORT_STRING];
+       int j = 0, offset = 0;
+       regmatch_t pmatch[1];
+-#ifdef DEBUG
+       unsigned char save = '\0';
+-#endif
+ 
+-      state_reset_prefix (s);
+-      while (regexec
+-             ((regex_t *) QuoteRegexp.rx, &Quotebuf[offset], 1, pmatch,
+-              0) == 0)
+-        offset += pmatch->rm_eo;
++      /* quotebuf may be '^-- \n$' which fails to match $strip_sig */
++      if (Quotebuf[i-1] == '\n') {
++        save = Quotebuf[i-1];
++        Quotebuf[i-1] = '\0';
++      }
+ 
+-      if (!option (OPTQUOTEEMPTY) && Quotebuf[offset] == '\n') {
+-        buf[0] = '\n';
+-        buf[1] = '\0';
++      debug_print (1, ("quote == '%s\n", Quotebuf));
++
++      if (option (OPTSTRIPSIG) && (s->flags & M_REPLYING) &&
++          regexec ((regex_t*) StripSigRegexp.rx, Quotebuf, 1, pmatch, 0) == 0) {
++        debug_print (1, ("seen sig dashes, finishing\n"));
++        s->flags |= M_FINISHED;
+       }
+-      else if (!option (OPTTEXTFLOWED) && option (OPTQUOTEQUOTED) && offset) {
+-        for (i = 0; i < offset; i++)
+-          if (Quotebuf[i] != ' ')
+-            j = i;
+-        strncpy (buf, Quotebuf, j + 1);
+-        strcpy (buf + j + 1, Quotebuf + j);
+-      }
+-      else
+-        snprintf (buf, sizeof (buf), "%s%s", NONULL (s->prefix), Quotebuf);
++      else {
+ 
+-#ifdef DEBUG
+-      if (str_len (buf) >= 2) {
+-        save = buf[str_len (buf) - 1];
+-        buf[str_len (buf) - 1] = '\0';
+-        debug_print (2, ("buf = '%s'\n", buf));
+-        buf[str_len (buf)] = save;
++        if (save != '\0')
++          Quotebuf[i-1] = save;
++
++        state_reset_prefix (s);
++        while (regexec
++              ((regex_t *) QuoteRegexp.rx, &Quotebuf[offset], 1, pmatch,
++                0) == 0)
++          offset += pmatch->rm_eo;
++
++        if (!option (OPTQUOTEEMPTY) && Quotebuf[offset] == '\n') {
++          buf[0] = '\n';
++          buf[1] = '\0';
++        }
++        else if (!option (OPTTEXTFLOWED) && option (OPTQUOTEQUOTED) && offset) {
++          for (i = 0; i < offset; i++)
++            if (Quotebuf[i] != ' ')
++              j = i;
++          strncpy (buf, Quotebuf, j + 1);
++          strcpy (buf + j + 1, Quotebuf + j);
++        }
++        else
++          snprintf (buf, sizeof (buf), "%s%s", NONULL (s->prefix), Quotebuf);
++
++        state_puts (buf, s);
+       }
+-#endif
+-
+-      state_puts (buf, s);
+     }
+   }
+   else
+     state_putc (c, s);
+ 
+-  if (c == '\n') {
++  if (c == '\n' && !(s->flags & M_FINISHED)) {
+     state_set_prefix (s);
+     Quotebuf[0] = '\0';
+   }
+Index: state.h
+===================================================================
+--- state.h	(revision 537)
++++ state.h	(working copy)
+@@ -30,6 +30,7 @@
+ #define M_PRINTING	(1<<5)  /* are we printing? - M_DISPLAY "light" */
+ #define M_REPLYING	(1<<6)  /* are we replying? */
+ #define M_FIRSTDONE	(1<<7)  /* the first attachment has been done */
++#define M_FINISHED      (1<<8) /* premature end? */
+ 
+ #define state_set_prefix(s) ((s)->flags |= M_PENDINGPREFIX)
+ #define state_reset_prefix(s) ((s)->flags &= ~M_PENDINGPREFIX)
+Index: rfc3676.c
+===================================================================
+--- rfc3676.c	(revision 537)
++++ rfc3676.c	(working copy)
+@@ -142,6 +142,7 @@
+                quotelevel = 0, newql = 0;
+   int buf_off, buf_len;
+   int delsp = 0, fixed = 0;
++  regmatch_t pmatch[1];
+ 
+   /* respect DelSP of RfC3676 only with f=f parts */
+   if ((t = (char*) mutt_get_parameter ("delsp", a->parameter))) {
+@@ -201,6 +202,13 @@
+       continue;
+     }
+ 
++    if (option (OPTSTRIPSIG) && (s->flags & M_REPLYING) &&
++        regexec ((regex_t*) StripSigRegexp.rx, buf, 1, pmatch, 0) == 0) {
++      debug_print (1, ("f=f: seen sig dashes, finishing\n"));
++      s->flags |= M_FINISHED;
++      break;
++    }
++
+     /* signature separator also flushes the previous paragraph */
+     if (strcmp(buf + buf_off, "-- ") == 0 && curline && *curline) {
+       print_flowed_line (curline, s, quotelevel);
+Index: globals.h
+===================================================================
+--- globals.h	(revision 537)
++++ globals.h	(working copy)
+@@ -92,6 +92,7 @@
+ WHERE rx_t Smileys;
+ WHERE rx_t GecosMask;
+ WHERE rx_t StripWasRegexp;
++WHERE rx_t StripSigRegexp;
+ 
+ #ifdef USE_SOCKET
+ WHERE char *Preconnect INITVAL (NULL);
+Index: init.h
+===================================================================
+--- init.h	(revision 537)
++++ init.h	(working copy)
+@@ -3563,6 +3563,19 @@
+   ** trailing part of the ``Subject'' line when replying if it won't be empty
+   ** afterwards.
+   **/
++  {"strip_sig", DT_BOOL, R_NONE, OPTSTRIPSIG, "no" },
++  /**
++  ** .pp
++  ** When \fIset\fP, Mutt-ng will remove signatures when preparing replies.
++  ** .pp
++  ** Signature separators are detected by $$$strip_sig_regex.
++  **/
++  {"strip_sig_regex", DT_RX, R_NONE, UL &StripSigRegexp, "^-- $"},
++  /**
++  ** .pp
++  ** When non-empty, this regular expression specifies a signature delimiter after
++  ** which to ignore content if $$$strip_sig is \fIset\fP.
++  **/
+   {"stuff_quoted", DT_BOOL, R_BOTH, OPTSTUFFQUOTED, "no" },
+   /*
+    ** .pp
diff --git a/mail-client/muttng/muttng-20060329.ebuild b/mail-client/muttng/muttng-20060329.ebuild
new file mode 100644
index 000000000000..cc2870eb52a8
--- /dev/null
+++ b/mail-client/muttng/muttng-20060329.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/muttng/muttng-20060329.ebuild,v 1.1 2006/03/30 15:58:41 grobian Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="mutt-ng -- fork of mutt with added features"
+HOMEPAGE="http://www.muttng.org/"
+SRC_URI="http://nion.modprobe.de/mutt-ng/snapshots/${P}.tar.gz"
+IUSE="berkdb buffysize cjk crypt debug gdbm gnutls gpgme idn imap mbox nls nntp pop qdbm sasl slang smime smtp ssl doc"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc-macos ~sparc ~x86"
+RDEPEND="nls? ( sys-devel/gettext )
+	>=sys-libs/ncurses-5.2
+	idn?     ( net-dns/libidn )
+	qdbm?	 ( dev-db/qdbm )
+	!qdbm?	 (
+		gdbm?  ( sys-libs/gdbm )
+		!gdbm? ( berkdb? ( >=sys-libs/db-4 ) )
+	)
+	slang?   ( >=sys-libs/slang-1.4.2 )
+	smtp?    ( net-libs/libesmtp )
+	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 )
+	)
+	gpgme?   ( >=app-crypt/gpgme-0.9.0 )
+	doc?     (
+		www-client/lynx
+		dev-libs/libxslt
+		app-text/htmltidy
+		app-text/openjade
+		app-text/tetex
+	)"
+DEPEND="${RDEPEND}
+	sys-devel/automake
+	>=sys-devel/autoconf-2.5
+	net-mail/mailbase"
+
+src_unpack() {
+	unpack ${A}                     || die "unpack failed"
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-20060309-smarttime.patch"
+	epatch "${FILESDIR}/${PN}-20060317-sigremovereply.patch"
+
+	use doc || epatch "${FILESDIR}/${PN}-20060309-nodoc.patch"
+
+#	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"
+#	WANT_AUTOCONF=2.5 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_enable nntp) \
+		$(use_with idn) \
+		$(use_with smtp libesmtp) \
+		--enable-compressed \
+		--sysconfdir=/etc/${PN} \
+		--with-docdir=/usr/share/doc/${PN}-${PVR} \
+		--with-regex \
+		--disable-fcntl --enable-flock --enable-nfs-fix \
+		--with-mixmaster \
+		--without-sasl \
+		--enable-external-dotlock"
+
+	# muttng prioritizes qdbm over gdbm, 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 \
+			--with-gdbm --without-qdbm --without-bdb"
+	elif use berkdb; then
+		myconf="${myconf} --enable-hcache \
+			--with-bdb --without-gdbm --without-qdbm"
+	else
+		myconf="${myconf} --disable-hcache \
+			--without-gdbm --without-qdbm --without-bdb"
+	fi
+
+	# there's no need for gnutls or ssl 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 sasl2)"
+	else
+		myconf="${myconf} --without-gnutls --without-ssl --without-sasl2"
+	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 slang; then
+		myconf="${myconf} --with-slang"
+		ewarn "If you want a transparent background, merge ${PN} with USE=-slang."
+	else
+		# --without-slang doesn't work;
+		# specify --with-curses if you don't want slang
+		# (26 Sep 2001 agriffis)
+		myconf="${myconf} --with-curses"
+	fi
+
+	if use mbox; then
+		myconf="${myconf} --with-mailpath=/var/spool/mail"
+	else
+		myconf="${myconf} --with-homespool=Maildir"
+	fi
+
+	econf ${myconf}
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "install failed"
+	find ${D}/usr/share/doc -type f | grep -v "html\|manual" | xargs gzip
+
+	dodoc COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO
+}
+
+pkg_postinst() {
+	echo
+	einfo "NOTE: muttng is still under heavy development"
+	einfo "If you find a bug please report at http://bugs.gentoo.org"
+	echo
+}