Fix the MIME testsuite for systems without the en_US.utf-8 locale.

Package-Manager: portage-2.2.0_alpha4/cvs/Linux x86_64

4 files changed, 59 insertions, 11 deletions

diff --git a/mail-client/cone/ChangeLog b/mail-client/cone/ChangeLog
index 78b87d3c7093..a4a029fddb35 100644
--- a/mail-client/cone/ChangeLog
+++ b/mail-client/cone/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-client/cone
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/cone/ChangeLog,v 1.30 2010/11/12 08:37:00 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/cone/ChangeLog,v 1.31 2010/11/15 02:37:53 radhermit Exp $
+
+  15 Nov 2010; Tim Harder <radhermit@gentoo.org>
+  cone-0.84.20100819-r1.ebuild,
+  +files/cone-0.84.20100819-rfc2045-tests-lang.patch:
+  Fix the MIME testsuite for systems without the en_US.utf-8 locale.
 
 *cone-0.84.20100819-r1 (12 Nov 2010)
 
diff --git a/mail-client/cone/Manifest b/mail-client/cone/Manifest
index e4c32a6f203e..4831397c09ec 100644
--- a/mail-client/cone/Manifest
+++ b/mail-client/cone/Manifest
@@ -3,20 +3,21 @@ Hash: SHA1
 
 AUX cone-0.79-gcc45.patch 380 RMD160 c52b9c706e39abed142da4d02d0afcd3ab42566f SHA1 0055302bf293571c51a2b9ba2ca079328df73471 SHA256 f30efabc11341ed7d7cb8ccc816796af7a8fed705f7585d0f224f37a28479183
 AUX cone-0.84.20100819-aspell-automagic.patch 2704 RMD160 428aa2128d5405597adbb5f2258e6bcf5a5300b4 SHA1 861afa1bf8a335fceaed68c8b27025707f8062b7 SHA256 54ec67591eafca6fee8cf9abcde06680af9481d6fbeba2afc3177b8ab030c3e8
+AUX cone-0.84.20100819-rfc2045-tests-lang.patch 2879 RMD160 7ed22368c6802e3cdf72d3cd73ff475f27d296de SHA1 445b8887400ffcfc496ae657279e2e68dcbe63bf SHA256 e45e5d6ab29cbfb336981be6fbec1e1a0199277da3da5afe0a6e4062d82ea3d5
 DIST cone-0.79.tar.bz2 4120869 RMD160 7d48955e95a792d5b3e55c207c81a0911b53085e SHA1 621a6ef628de355223882212f2eac3daa5f21607 SHA256 8f0cf2ddd19e8ce2a1243a427d315a4a91cf6d6affe75c57e8b60f91583e5182
 DIST cone-0.84.20100819.tar.bz2 4079663 RMD160 4627f2db060c58af55b5932208648d5b501e72e5 SHA1 40da74dbc53f97f567a041582c07244afaabc0bf SHA256 a699241613087f186db4c70dd65e578a4baa3d04a8151b0b39007f558740086a
 EBUILD cone-0.79.ebuild 921 RMD160 2f12f7b86c4ffd3763a23e2d618911eb30ea0ec9 SHA1 066a414affd5191416ac0da1bf3fe1896ba71da4 SHA256 b2429d9ecac1807fe1da9399c8a45a82fda9cd5f60c1bc28e391646c5d9aad6b
-EBUILD cone-0.84.20100819-r1.ebuild 1364 RMD160 aa886b45ebb6e2e0c170f2647b06d17d706d302f SHA1 8f3df4c3b27c4885ab3801617bb2329b4407d913 SHA256 8304384db4daa6ac21aff360e7c7e71dc03cc596bc23c27174d003a3c835240b
-MISC ChangeLog 4873 RMD160 9ae8d102c27ba3f939a6dee3fbb1a3f8b59a1192 SHA1 dc51060c36c6150fbf9ba1d8b09f7734d958bfa6 SHA256 1d06912b6980e4b93e6ba302112489cbec227d83fe21a8d2e6d11629593dcb05
+EBUILD cone-0.84.20100819-r1.ebuild 1416 RMD160 71ee82e772422887278180f16f438c2ad169ba2d SHA1 f892bae815d5ec7a9f93d189c54a610a4f73200d SHA256 3b62bbdeb8539750300dd23694f0bfcdfbd5de5ce95786e47988643880b92c53
+MISC ChangeLog 5078 RMD160 555cfd92526f05c918e9da5b6a60d015aaf8a453 SHA1 ce1f41beaab95d9513ac21d1ca8db8a8279f636e SHA256 4ca89143981f084a671ace37850e63d1a1b4fac17fac3c98562305aca6c4ad4e
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQEcBAEBAgAGBQJM3Py2AAoJEEqz6FtPBkyjfBMIAK2MkKDdjQAIKnhB+HKqsbgr
-8wB3iFlORBGoTIe7TBTs9pqw9YCKtbKkP+um4hwOpR1fkO5DuhSPCtw1toakp1XI
-iiNV4NEHwWEsFrILQxlzrlqJ3EM6L2aRCvFvhrY/y4/iERrH4ilxMVPA7UbAbJIF
-8DXyZ/oAwsLrVZtPFCQA6iEJ6dPaqwoIGmNyOWGcUaph3TYIIwQeeFVqoa7y7l8D
-z3NcAiTbkw581lDrpIsph6mIAqLaPGS9nnDp6u7KdQKzOsM+vN+ovCSKdXfJgsRh
-hChd+CYmfTGtZcjOWwLJhZ7RLCD/tvuX0hggqBp9VJR1ig4VTDjNqocOtFMkTkI=
-=QBgU
+iQEcBAEBAgAGBQJM4J0MAAoJEEqz6FtPBkyjUt0H/RQePWgg3ItYzA4CKHPepvyT
+ouxN3tyi/fDxxx0KiAmS1H0yWk9eWAW47QQjwMaX7ZpLEkfWcXhSf+3p5KmCfoGS
+07NtexLp5pTAUh3b5rkkxFBC7svf5mu/0h9/zVbLaT7dYdd7NZgIaGVlxIuStrYP
+jKgx86EI5p5MTZMN/GN9zbbpVXTs8zsW1l4GHV4SA67tq+y4NeINehVPI0Y2VxYc
+1c9fiqITFEzhBRaKyh4NuObOZTS8kr9lGL4vqKma6f/84yRnBY0SAKHevTlNzkdB
+WXk6r+dC7Yh2EXNIXMHn+9JgHHLLN21RHBqRRu6wWxVmvDLMoNVmsQV2gctBN+E=
+=78Fm
 -----END PGP SIGNATURE-----
diff --git a/mail-client/cone/cone-0.84.20100819-r1.ebuild b/mail-client/cone/cone-0.84.20100819-r1.ebuild
index c877eab64ca6..cb4a94de77ef 100644
--- a/mail-client/cone/cone-0.84.20100819-r1.ebuild
+++ b/mail-client/cone/cone-0.84.20100819-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/cone/cone-0.84.20100819-r1.ebuild,v 1.1 2010/11/12 08:37:00 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/cone/cone-0.84.20100819-r1.ebuild,v 1.2 2010/11/15 02:37:53 radhermit Exp $
 
 EAPI="2"
 
@@ -30,6 +30,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-aspell-automagic.patch
+	epatch "${FILESDIR}"/${P}-rfc2045-tests-lang.patch
 
 	cd cone
 	LIBTOOLIZE="true" eautoreconf
diff --git a/mail-client/cone/files/cone-0.84.20100819-rfc2045-tests-lang.patch b/mail-client/cone/files/cone-0.84.20100819-rfc2045-tests-lang.patch
new file mode 100644
index 000000000000..aa00d553b259
--- /dev/null
+++ b/mail-client/cone/files/cone-0.84.20100819-rfc2045-tests-lang.patch
@@ -0,0 +1,41 @@
+--- cone-0.84.20100819/rfc2045/testsuite.orig	2010-11-14 13:37:06.025969423 -0800
++++ cone-0.84.20100819/rfc2045/testsuite	2010-11-14 13:37:23.489105624 -0800
+@@ -56,7 +56,7 @@
+ 
+ --aaa---
+ EOF
+-LANG=en_US.utf-8 ./reformime -i <testsuite.dat | sed 's/^charset:.*/charset: iso-8859-1/'
++./reformime -i <testsuite.dat | sed 's/^charset:.*/charset: iso-8859-1/'
+ 
+ echo "foo" >confmdtest
+ 
+@@ -65,7 +65,7 @@
+ ./makemime -c application/octet-stream -C utf-8 -N footest:1 confmdtest
+ ./makemime -c application/octet-stream -C utf-8 -N f:::::::::::::::::::::::::1 confmdtest
+ 
+-LANG=en_US.utf-8 ./reformime -h '=?iso-8859-1?Q?H=F3la!?= test =?iso-8859-1?Q?H=F3la!_?=  =?iso-8859-1?Q?H=F3la!?=  test'
++./reformime -h '=?iso-8859-1?Q?H=F3la!?= test =?iso-8859-1?Q?H=F3la!_?=  =?iso-8859-1?Q?H=F3la!?=  test'
+ rm -f confmdtest
+ 
+ cat >testsuite.dat <<EOF
+@@ -77,13 +77,13 @@
+ 
+ testing
+ EOF
+-LANG=en_US.utf-8 ./reformime -i <./testsuite.dat
+-LANG=en_US.utf-8 ./reformime -H '=?iso-8859-1?Q?H=F3la!?= test <test1@example.com>'
+-LANG=en_US.utf-8 ./reformime -H '=?iso-8859-1?Q?H=F3la=22?= test <test1@example.com>'
+-LANG=en_US.utf-8 ./reformime -O 'Hóla <user@Hóla.example.com>, user@example.com (Hóla), John Smith <user@example.com>, user2@example.com, "John Smith (Accounting)" <user3@example.com>, "Hóla Smith (Accounting)" <user4@example.com>, john smith <user@hóla.example.com>'
++./reformime -i <./testsuite.dat
++./reformime -H '=?iso-8859-1?Q?H=F3la!?= test <test1@example.com>'
++./reformime -H '=?iso-8859-1?Q?H=F3la=22?= test <test1@example.com>'
++./reformime -O 'Hóla <user@Hóla.example.com>, user@example.com (Hóla), John Smith <user@example.com>, user2@example.com, "John Smith (Accounting)" <user3@example.com>, "Hóla Smith (Accounting)" <user4@example.com>, john smith <user@hóla.example.com>'
+ 
+-LANG=en_US.utf-8 ./reformime -H '=?UTF-8?B?SMOzbGE=?= <user@xn--hla-gna.example.com>, =?UTF-8?B?SMOzbGE=?= <user@example.com>, John Smith <user@example.com>, user2@example.com, "John Smith (Accounting)" <user3@example.com>, =?UTF-8?B?SMOzbGE=?= Smith =?UTF-8?B?KEFjY291bnRpbmcp?= <user4@example.com>, john smith <user@xn--hla-gna.example.com>'
++./reformime -H '=?UTF-8?B?SMOzbGE=?= <user@xn--hla-gna.example.com>, =?UTF-8?B?SMOzbGE=?= <user@example.com>, John Smith <user@example.com>, user2@example.com, "John Smith (Accounting)" <user3@example.com>, =?UTF-8?B?SMOzbGE=?= Smith =?UTF-8?B?KEFjY291bnRpbmcp?= <user4@example.com>, john smith <user@xn--hla-gna.example.com>'
+ 
+-LANG=en_US.utf-8 ./reformime -H 'list: address1 <address1@example.com>, address2 <address2@example.com>;'
++./reformime -H 'list: address1 <address1@example.com>, address2 <address2@example.com>;'
+ 
+-LANG=en_US.utf-8 ./reformime -O 'list: address1 <address1@example.com>, address2 <address2@example.com>;'
++./reformime -O 'list: address1 <address1@example.com>, address2 <address2@example.com>;'