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

Package-Manager: portage-2.2_rc58/cvs/Linux x86_64

4 files changed, 67 insertions, 4 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/Manifest b/net-mail/mlmmj/Manifest
index 71d17e6cc226..bc1d26968e05 100644
--- a/net-mail/mlmmj/Manifest
+++ b/net-mail/mlmmj/Manifest
@@ -1,6 +1,7 @@
 AUX mlmmj-1.2.11_subscriber_mmap.patch 397 RMD160 51c8e143634a754928164630a65710fda44fe3ba SHA1 65c7489b822612167ad4d6e05e6941abbb91e73d SHA256 c1d28b44fc943ee73e7d80fe7bbf81592e070be7d4f6b365cd97f3a836ecd6e5
 AUX mlmmj-1.2.15_mmap_zero_byte.patch 1411 RMD160 455168e47365b9ea4b70440fc238c21c2ad1d634 SHA1 3312a0bed19f7abc0f274b47b22be8fdf0dada1a SHA256 15b5be768f14f1c91ad779dfd082aa110c7ea0d3b7a6adec82f3953bf61ea759
 AUX mlmmj-1.2.16-requeue-unlink-fix.patch 1085 RMD160 800b2083d9a9d4ce85cdb1b1a3ec34db9f93feaf SHA1 15369e76465c6c1f8e90b60a3a844e0c3ecf2284 SHA256 2bd6b6a15b42dead78f6f13e29f35c38adaef599f96d03242c46b8181af8459e
+AUX mlmmj-1.2.16-unsub-digest-text.patch 1844 RMD160 317a3375947cdbdac40463148a85403f7110d86b SHA1 f8583aca4bc3cf6d48048ce406b2523089070127 SHA256 90039e23d16f75db26d20404e06b9aef8793886cf7e346930c1ff056b1b9bfba
 DIST mlmmj-1.2.10.tar.bz2 143526 RMD160 1539f6fa1c785b64e90719875ea6d3c50330693a SHA1 d77f7983abd4aea9df7a7575711e2e5b50c1e841 SHA256 55fcf4122f7175b2f466afdbea6a3cade3e0039011553d9b161159adebbe8607
 DIST mlmmj-1.2.11.tar.bz2 143586 RMD160 058e4d28f010ccb3bdca59143b05afa9b19eeefd SHA1 46ddb87d9fb51c9fdd2e8db4985866739a185b78 SHA256 f24890d14c38c9a45b36c1d6af71859190c968675777d9d8d8a0ce906c8748c9
 DIST mlmmj-1.2.12.tar.bz2 149784 RMD160 0310b61c8d4667ed7b87cdcbc5847d489079b0ba SHA1 e0e4e21aef5c1dd3666ee57f983116e4d606ba42 SHA256 7946f761c704b6c9bded10cd440a9883567c683551632ea578309d5025e319f3
@@ -19,10 +20,10 @@ EBUILD mlmmj-1.2.13.ebuild 1192 RMD160 00fd12fb773bc4d39754c8282d053e6a8ae72235
 EBUILD mlmmj-1.2.14.ebuild 1192 RMD160 ae0f7279219d130c0cbab719ce989c82ba83ed4b SHA1 fb128d3213e8babf9f7128ea84c8c6fda780c431 SHA256 3517c5630f84847127acab8323da26ef772abb597fc7f7d425af62ae34555496
 EBUILD mlmmj-1.2.15-r1.ebuild 1459 RMD160 909c3fa94d133eff8292da631f2e931527a8ad0b SHA1 387b7ea62416d317f1aef70f80a0739360f805f8 SHA256 0d7b9f081e290dc797f07ab017ce1b9201c99991c13d67a6d0b3315363faab3a
 EBUILD mlmmj-1.2.15.ebuild 1388 RMD160 daebee38f12004def66dcee3d9e390ae5d989aa7 SHA1 81d3bbb80ee5faaa762ae645f0dea148b8f99665 SHA256 d0a81d59599bf2df2d838e2bd5360a849f022da94b1c8d5c5b4f068de726a06a
-EBUILD mlmmj-1.2.16-r1.ebuild 1475 RMD160 0134affb1fcf250ac24e2c7044e7f842ad4bf39c SHA1 90c064be7cac6adc36b3bd65c328d185f84797e7 SHA256 a0f3dbf676078037c1b19013a2cda4acbe7f33973098958b2f828cdc35e61935
+EBUILD mlmmj-1.2.16-r1.ebuild 1534 RMD160 b201ec8fbd4ea8036f638f5b6f830175e1237999 SHA1 707b76e448331d723ffad377f5d2b0b8fd8106cb SHA256 ea4e4de86c29c9475c7d0c652a57853552f753c6dce5a79de6d049c71407881a
 EBUILD mlmmj-1.2.16.ebuild 1461 RMD160 625db333f451367d906d8da540c8535fb442e962 SHA1 81b2ce3f8702a611219034243d8d158ce44bd18d SHA256 7dee5bcea9ff8cceea94c7b76942487e6170d311cb0a4abb71ec6cda882ee9a5
 EBUILD mlmmj-1.2.4.ebuild 1139 RMD160 5c4495ad0a92b950970e2ace276312f2506c86d4 SHA1 250a5657144abbeb920ca959db1fc35e3aa7596d SHA256 4c5c69be7db5901a6f77d6b34106c4896dcdae562b032bd6fdad9a185d798528
 EBUILD mlmmj-1.2.8.ebuild 1139 RMD160 26acd6abf3398b2935663a6d6f69433e349c3005 SHA1 e2173ebbe06b0a2a696a96632ec4bb420acacd39 SHA256 d4ee686c9af056bc720a2303a3dc0f96c8dd986cdbd59dada1e0e8e2c9a3d39c
 EBUILD mlmmj-1.2.9.ebuild 1191 RMD160 dc10eaf3c52bd05c4ef6f15fd3a4a70b39370704 SHA1 482c3b31a6573629a707f1e377348cd9f8572684 SHA256 8eca1b69b5942edebc91e374ce9cceb91524412b413699ed6c7414d7f92b68a2
-MISC ChangeLog 5288 RMD160 a302d8f3ba75259dd0132930c7581f1b52fb9448 SHA1 0e6c3d85c188206e20f1bafdedc6f99ecd711551 SHA256 0cb93cbf70cc7bba94d1f5e1b7b90f19f74fe900329d719a77b3f8d595b41ba2
+MISC ChangeLog 5545 RMD160 da12749cc562f49a21efc96a9c2f8c15e01e1a7c SHA1 90603f36cb6106e88f54174eaf61ff7ff5125a60 SHA256 0a3addd870e5c530fd2ca3de412709b4c443b94ec97d61ec0ff9750551e5abd1
 MISC metadata.xml 224 RMD160 1f8313d73dc37b4c91c0947d68ca058ee0727744 SHA1 f5cbb921c4390958ec580f3c587b1066354f2ad7 SHA256 eef0fff1da926bc7c91be50c8b0eb207a3a5d6a293066b9b6e7ffb558ce90672
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}"