Include the listtext modifications from lists.gentoo.org that offer hints about unsubscribing from the digest form of the list.

(Portage version: 2.2_rc58/cvs/Linux x86_64)

3 files changed, 64 insertions, 2 deletions

diff --git a/net-mail/mlmmj/ChangeLog b/net-mail/mlmmj/ChangeLog
index e9297bedd4f2..924925902c46 100644
--- a/net-mail/mlmmj/ChangeLog
+++ b/net-mail/mlmmj/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/mlmmj
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mlmmj/ChangeLog,v 1.30 2009/12/16 19:38:38 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mlmmj/ChangeLog,v 1.31 2009/12/16 21:15:57 robbat2 Exp $
+
+  16 Dec 2009; Robin H. Johnson <robbat2@gentoo.org> mlmmj-1.2.16-r1.ebuild,
+  +files/mlmmj-1.2.16-unsub-digest-text.patch:
+  Include the listtext modifications from lists.gentoo.org that offer hints
+  about unsubscribing from the digest form of the list.
 
 *mlmmj-1.2.16-r1 (16 Dec 2009)
 
diff --git a/net-mail/mlmmj/files/mlmmj-1.2.16-unsub-digest-text.patch b/net-mail/mlmmj/files/mlmmj-1.2.16-unsub-digest-text.patch
new file mode 100644
index 000000000000..2b8792419efe
--- /dev/null
+++ b/net-mail/mlmmj/files/mlmmj-1.2.16-unsub-digest-text.patch
@@ -0,0 +1,56 @@
+Provide more hints to the users on how to unsubscribe from the nomail
+and digest forms. Frequently seen where users try to unsubscribe from
+the normal version of the list when they are really subscribed to the
+digest form.
+
+Signed-off-by: "Robin H. Johnson" <robbat2@gentoo.org>
+
+diff -Nuar mlmmj-1.2.16.orig/listtexts/en/listhelp mlmmj-1.2.16/listtexts/en/listhelp
+--- mlmmj-1.2.16.orig/listtexts/en/listhelp	2008-10-30 20:06:29.000000000 +0000
++++ mlmmj-1.2.16/listtexts/en/listhelp	2009-12-16 20:58:30.864716161 +0000
+@@ -8,6 +8,14 @@
+ 
+ $listunsubaddr$
+ 
++To unsubscribe from the digest of this list send a message to:
++
++$digestunsubaddr$
++
++To unsubscribe from the "nomail" version this list send a message to:
++
++$nomailunsubaddr$
++
+ To subscribe to the digest of this list send a message to:
+ 
+ $digestsubaddr$
+diff -Nuar mlmmj-1.2.16.orig/listtexts/en/sub-subscribed mlmmj-1.2.16/listtexts/en/sub-subscribed
+--- mlmmj-1.2.16.orig/listtexts/en/sub-subscribed	2008-10-30 20:06:30.000000000 +0000
++++ mlmmj-1.2.16/listtexts/en/sub-subscribed	2009-12-16 20:59:21.504710982 +0000
+@@ -11,6 +11,14 @@
+ 
+ $listunsubaddr$
+ 
++To unsubscribe from the digest of this list send a message to:
++
++$digestunsubaddr$
++
++To unsubscribe from the "nomail" version this list send a message to:
++
++$nomailunsubaddr$
++
+ And for help send a message to:
+ 
+ $helpaddr$
+diff -Nuar mlmmj-1.2.16.orig/listtexts/en/unsub-notsubscribed mlmmj-1.2.16/listtexts/en/unsub-notsubscribed
+--- mlmmj-1.2.16.orig/listtexts/en/unsub-notsubscribed	2008-10-30 20:06:30.000000000 +0000
++++ mlmmj-1.2.16/listtexts/en/unsub-notsubscribed	2009-12-16 20:59:00.624713133 +0000
+@@ -6,6 +6,9 @@
+ 
+ You are not subscribed to this list, so you cannot unsubscribe.
+ 
++To unsubscribe from the digest of this list send a message to:
++
++$digestunsubaddr$
+ 
+ To subscribe send a message to:
+ 
diff --git a/net-mail/mlmmj/mlmmj-1.2.16-r1.ebuild b/net-mail/mlmmj/mlmmj-1.2.16-r1.ebuild
index 2579247932ad..1d33ea161b1a 100644
--- a/net-mail/mlmmj/mlmmj-1.2.16-r1.ebuild
+++ b/net-mail/mlmmj/mlmmj-1.2.16-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mlmmj/mlmmj-1.2.16-r1.ebuild,v 1.1 2009/12/16 19:38:38 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mlmmj/mlmmj-1.2.16-r1.ebuild,v 1.2 2009/12/16 21:15:57 robbat2 Exp $
 
 inherit eutils
 
@@ -21,6 +21,7 @@ SHAREDIR="/usr/share/mlmmj"
 src_unpack() {
 	unpack ${A}
 	epatch "${FILESDIR}"/${PN}-1.2.16-requeue-unlink-fix.patch
+	epatch "${FILESDIR}"/${PN}-1.2.16-unsub-digest-text.patch
 	cd "${S}"
 	for i in "${S}" "${S}"/contrib/recievestrip ; do
 		pushd "${i}"