Security bump, include hunspell fix for dictionaries

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/mail-client/mozilla-thunderbird/ChangeLog b/mail-client/mozilla-thunderbird/ChangeLog
index cc0d8529ae1246305636fd3b921e92db0cc6b20d..2ed1af4d7aad8baa90af37b267f668ca020b4cce 100644 (file)
--- a/mail-client/mozilla-thunderbird/ChangeLog
+++ b/mail-client/mozilla-thunderbird/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-client/mozilla-thunderbird
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.323 2010/03/21 22:36:26 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.324 2010/04/08 03:47:25 anarchy Exp $
+
+*mozilla-thunderbird-3.0.4 (08 Apr 2010)
+
+  08 Apr 2010; <anarchy@gentoo.org>
+  +files/1002_fix-system-hunspell-dict-detections.patch,
+  +mozilla-thunderbird-3.0.4.ebuild:
+  Security bump, include hunspell fixup for dictionaries.
 
 *mozilla-thunderbird-3.0.3-r2 (21 Mar 2010)
 

diff --git a/mail-client/mozilla-thunderbird/Manifest b/mail-client/mozilla-thunderbird/Manifest
index 405bc493fffed5e6d8a7fb6ad416cecefe830aab..67da5091b40a1765fbfe9de1e19cfb155f946114 100644 (file)
--- a/mail-client/mozilla-thunderbird/Manifest
+++ b/mail-client/mozilla-thunderbird/Manifest
@@ -1,4 +1,5 @@
 AUX 1000_fix-menus-gentoo.patch 584 RMD160 5de352211941f11d7eb24763667d2ad9cbbc1017 SHA1 30c2ba82764a8c3837ebc4419b734fc999791394 SHA256 5ab1d65ea9d581b89332ad34e3b2f88646e2c2d9181ae90110495d87240986fc
+AUX 1002_fix-system-hunspell-dict-detections.patch 3466 RMD160 f8fa846e5d7c80a15d0abf0c6aedb7302ead1f83 SHA1 091febd913c09c86c9242b1be8960fb012ee7c8d SHA256 7ce51cae6bbd6655c8bc543365370627e37d2fc5aa7f7e1270671f7482df344a
 AUX icon/mozilla-thunderbird-unbranded.desktop 183 RMD160 2aeecc5f6127adee0c9ab1e1c83a29bafb82f41e SHA1 3c7533d73abf8208e2117de1601ac31935994021 SHA256 b42bda8d82722d069049889f14887aabc9f3e139a023186780ffff222ca5722d
 AUX icon/mozilla-thunderbird.desktop 173 RMD160 03faca4ba9ff401e5d5ffc6ebb0a27ddbd9dd36c SHA1 cfdaa810fda5599a2e8454933157d5c2e590bd7f SHA256 1990dde085dbb37be74766a39eab72c0a0812cb1fde6f1c3fd10ce64dc8f5623
 AUX icon/thunderbird-icon-unbranded.png 13280 RMD160 1654b2cfa39631e2084da982001113972eb41c09 SHA1 2fdca79e57c79d2485eb56d31de7afb05337898e SHA256 28b605529bee4d8245afdbb2cab5a705d8fa8977a11635b54c7bc5a7d6a9619c
@@ -86,10 +87,47 @@ DIST mozilla-thunderbird-3.0.3-tr.xpi 205351 RMD160 48576c53026628f11801b9da16e1
 DIST mozilla-thunderbird-3.0.3-uk.xpi 231320 RMD160 24d4507a933326d92c839290f069528a8231c6f4 SHA1 127c16575bb94f115fe5b0fdb1c812f590fff976 SHA256 96274ac226462ad9cb12e8898cccea6e17066da13ca1f59c485f109abe62db3e
 DIST mozilla-thunderbird-3.0.3-zh-CN.xpi 208235 RMD160 ab0ba5dc1c49fb36d591e557d72927408cef3d88 SHA1 e7bbc514d78b19b9836e983ced633fa0ce7e43d2 SHA256 0099416a08911919ac2a18ed72591a7ca199c3ba5c1a08a7654c5901e9fce26e
 DIST mozilla-thunderbird-3.0.3-zh-TW.xpi 208655 RMD160 3ad3cc109f29ac28ea159d9dbbb5c2584df94a60 SHA1 abfdddb28d07be2addf999e0b3a71cc5eb0c450f SHA256 900d605a6c96f61e608a6eb460172b2b40b7ecb916e2ead266c3621dc85495b7
+DIST mozilla-thunderbird-3.0.4-af.xpi 200344 RMD160 4059b543f2536a148de331408f763e4befd52079 SHA1 fd35228f6f41975ed09339682eeab469b570029e SHA256 89d3836b7bc6db283618c0073313b39a11bd4ce658a2d15272a6b3e093a9f2df
+DIST mozilla-thunderbird-3.0.4-be.xpi 189168 RMD160 4bb82e374b76e1bcc7d992bc76752dfcacbaab3e SHA1 1da844bbd7d6bd33f565bca6f5b10065a1b39239 SHA256 7bd80849948f2189d7d172647c789a3df41ef852b6848beb2e435fc8ab2da08b
+DIST mozilla-thunderbird-3.0.4-bg.xpi 222580 RMD160 e7dc7374de70bc797c7aa756207706d7d39950f9 SHA1 4bfe6b3999bad71a9a8d10d0d0553114a18e0986 SHA256 0ea5c3f3e4028ae6bfa631acc9f5323c9278c762db0dac4d92f39954ecbfeea9
+DIST mozilla-thunderbird-3.0.4-ca.xpi 207478 RMD160 588bc61a1fd9f27650d4843a46b9d34dffff7a5d SHA1 f320507a8fab983be7735c121a2da92ae56f7e36 SHA256 3293c5924d28edfd43a2b73340be8924812c05e5bc2cadff25c71b7f930efb4b
+DIST mozilla-thunderbird-3.0.4-cs.xpi 207806 RMD160 be68f11e3e87592bd77a5c75a75299e10bfb24d1 SHA1 81574a723678c21604596c08b6327ece2527ad9a SHA256 8940d533a37f9f09cbbe43136f2ad2484774e6905bcbb59390c5569ba808e958
+DIST mozilla-thunderbird-3.0.4-da.xpi 192313 RMD160 98c7975d2212a5b29d2c9f5a6fd9e146489f9952 SHA1 15c0ccad8528e85724326c4404bfc387dfe2b57a SHA256 668f723cf2ddd3803a3dbe0ef4aa6f8480af8042731155e67de2789c4d7d4532
+DIST mozilla-thunderbird-3.0.4-de.xpi 211370 RMD160 1ae9dbedd7148b1a669af614f0a3210ff1ba1791 SHA1 e9a5d65bfd11d1fd29795ca749046d0b9d02e708 SHA256 a85c1b17172a3b499104b8e458cf8f39eab40ae3bc548cc280cf65c3e5de78fc
+DIST mozilla-thunderbird-3.0.4-el.xpi 226833 RMD160 c26298c3aaf3a7afacecb5c8e2f1d1a9e24d63f3 SHA1 e3c43265b6bb1929db1dccc3c2bf85c0766c4d13 SHA256 278db35e5228c1fd7a98949fc71712be5b2a83c125e8cdba6de5782f5e7fb45d
+DIST mozilla-thunderbird-3.0.4-en-GB.xpi 193363 RMD160 978858c48f1d48e6c297d332c665cafbd8b968b7 SHA1 c87666a819058f91b87aa42ab612e0f83ac4ee6d SHA256 5e820168613f1a9a93601001423c8348bc65b95a876231c8c84eca48ce7f2879
+DIST mozilla-thunderbird-3.0.4-es-AR.xpi 207551 RMD160 9f78d2c99600fb48f8fac0d07ce345e7def9cde1 SHA1 bfe00410cf6077e4ef95b54f2d45439df7149681 SHA256 221b17bb253e2d78eacf87878cb0a8b35dcb06e3709bb72f4f6194a21c084e5c
+DIST mozilla-thunderbird-3.0.4-es-ES.xpi 168103 RMD160 942964f1e97ff233a36a6ca6ec66995c67053ca3 SHA1 10f777d860daabc8b836e983708dcd2c1c7fed9c SHA256 ad7b3e15226ef02c7bcd13b15c828876f70b9b476c773610c577a2f3d551bf78
+DIST mozilla-thunderbird-3.0.4-eu.xpi 200881 RMD160 fecdb5a3bdd3c6c07900cf5b96f8e1acdee0fa3d SHA1 4b3da17555a31bb9024dc3b0c8d43b29878464f0 SHA256 dd875d111c0a89315af6f38f1b3568c95c9d24769ee1bfc6b6d519c4e701f3bf
+DIST mozilla-thunderbird-3.0.4-fi.xpi 208409 RMD160 b7b6aaec9bc5c5af94d78896293d0c6f2d876abc SHA1 a389cad5153c400aafe0ddeb83a854e8fac301a3 SHA256 6971b0d6f2785e2a7fd4caea73c84b776ea3c903472c5b0e1cd780141f6cebd2
+DIST mozilla-thunderbird-3.0.4-fr.xpi 210269 RMD160 f33f93b14d521a7e0224cf536584c499a7b96f0d SHA1 23da9a07a763803452d0b4640f25bf0aefb5908d SHA256 11bc2ea84d386407ed97139df220a6268f5a047a4d920f4a3a9ec0697a802b62
+DIST mozilla-thunderbird-3.0.4-ga-IE.xpi 208893 RMD160 563de3548dcd60c0d21ba54e0e54af8b853e9a61 SHA1 d03d6abc9636ef468b6a6ab548940843e6b10896 SHA256 887e3a864a4cb4d3e9ac0dd77797d23776a49f92950687af1d634e341793509a
+DIST mozilla-thunderbird-3.0.4-he.xpi 192161 RMD160 e642b4e36c29f7aa3528094a67ba7f24d916c878 SHA1 69f9e789a426ebbfe6da9e1c3123661e373b3328 SHA256 42a99496a439b81f81427f807eec7e4848ed4c897b74c7a836520dcc2e3c981d
+DIST mozilla-thunderbird-3.0.4-hu.xpi 215543 RMD160 65a8bdc85b5063f414ab495858e4203ece193ddb SHA1 7e2657747e5080b8246f27ba5fc139a4b1d3b8eb SHA256 51680792ff3accc8f1624dbf779830ee5f0ebc70ee66f145035d834950a3344d
+DIST mozilla-thunderbird-3.0.4-it.xpi 166878 RMD160 349df8d47650785e97a2a00b7db12b13e4a5816c SHA1 65f80f5e35beffb233ea75ab8c13fc07677aa3c8 SHA256 64b9454a1353246d7e7bc8429a08208702051b9d798a3fb6e9ff170a381d7375
+DIST mozilla-thunderbird-3.0.4-ja.xpi 224448 RMD160 7973d977cd20394abf6e598440b3f2052b408aef SHA1 543fcf7777d8d4d099144bf5a0fb2aad9eccfb6d SHA256 474027ac9235f93c4dbd28b337d968101b6dc2c1651845706637313ef8b21632
+DIST mozilla-thunderbird-3.0.4-ko.xpi 186230 RMD160 be60c588e443e735e41a507c20a674787d2f5fff SHA1 ba0b9184147c77c9737601560012dc0fc1df8b6d SHA256 1eb2d30b1c8264bb0863a58ac08079d77d11b49b689acfa5beab77cf08c4700c
+DIST mozilla-thunderbird-3.0.4-lt.xpi 224317 RMD160 c96c035dd0c69768f5cb1786d26e745dd2f17fe8 SHA1 a105b93c0b94ec9dc3199a8b3157a350886294da SHA256 788f1c9b7d98735bd49dcfb8dbd234e9b392c496b1186da01a52d4b3fb3a0d0e
+DIST mozilla-thunderbird-3.0.4-nb-NO.xpi 202706 RMD160 702a47ef3a6e992ce207cf4ac8f412414fef446f SHA1 c86a3e3c737dca672fd52f5d9a74f68b758caa3b SHA256 b88385dcac008f991d8368d103ed2e157b61a7983c99e2f0055cf96c615b521a
+DIST mozilla-thunderbird-3.0.4-nl.xpi 205718 RMD160 c06d4fd913813735f31d8e262b4877a15fc4cb57 SHA1 fd32db0c756180b675abe0eb5516598c7ee29e82 SHA256 0039283244e383c497ed994ebf6f927a844c14915ad98bef16caf7fb1f6b9348
+DIST mozilla-thunderbird-3.0.4-nn-NO.xpi 204477 RMD160 991fce254905db9777587bc170ea89598476c1e4 SHA1 1e11503692ebcc7b11d27f93c31dd49a1a176558 SHA256 f4f382862b751d4e8b3c09ed456aab1fef154f5cc694fd49f4f7df6da28c0fe8
+DIST mozilla-thunderbird-3.0.4-pa-IN.xpi 230403 RMD160 fd6da905e0036c795f896fcf576a8d9d2b8a99b6 SHA1 d5f469048ab737a525ae65cb537ba5a5608c3b52 SHA256 c45dd6411b96ec511f77b4e93ee70fbe68dbf15d73cfde4adcef6a994d8441cc
+DIST mozilla-thunderbird-3.0.4-pl.xpi 197858 RMD160 46b199179bfdc112ba71c1902c310eed2c19f514 SHA1 884dc68cb6e9eafc6101739cb39f33960d36d7e9 SHA256 0c520f459db52412827e4b9d512c20630bff415fc29352849be7d21edb2215e6
+DIST mozilla-thunderbird-3.0.4-pt-BR.xpi 204079 RMD160 0977a85df37a069d0492ffaf3a56a186a963da2a SHA1 e8ec3d3d23ca1b336dcdab6f81c5a4ab96fbdb2a SHA256 bfae068bd4baa201aed9ac19bcfc13fe2105ecf35d5c71e4d2271364a64ededd
+DIST mozilla-thunderbird-3.0.4-pt-PT.xpi 204088 RMD160 db71faa76a4fd83c788285341b1a47018b943354 SHA1 1e573e08ea19f5f2f7f2f6a562bba9de5ebeb15c SHA256 322c43515b97b7fe4c0a9b0464a76557717b50e2b69b3ce7d66003bfb0d06873
+DIST mozilla-thunderbird-3.0.4-ru.xpi 192111 RMD160 1b621a8a5876630f6c66f370c13f34ce4e3e77a1 SHA1 9c0ce277e011d46a7ee9b13784cbf88d3a156b4a SHA256 136e60a3cc8fc77e4320c97be1c23b8083316dae8bfc887aa3928e2c4ae1a052
+DIST mozilla-thunderbird-3.0.4-sk.xpi 213234 RMD160 2ae50f2245ce0d5246ee4780c4a2d1fb1bc26f06 SHA1 3201ffacd7a7e45410bc956108363c53c5e003e4 SHA256 e808ca38337002a4d76dea5eed9c83319d51ffaa79ccf2af2ba93c0740302e52
+DIST mozilla-thunderbird-3.0.4-sv-SE.xpi 210596 RMD160 ec3bd5cd21d4f1bcdc68b22cb10073c2257d245c SHA1 1c0b765ef3c042bf9f92101731a902855679de90 SHA256 9334e543e7b16ead6c15510be0c717efb73b3365d85b5cebb0500a654fbc1e27
+DIST mozilla-thunderbird-3.0.4-tr.xpi 205351 RMD160 83d6fbc09355c658bd0332c6dab01e5adf102365 SHA1 c436e0877c1ffb165af8c37b12397892f64f5f84 SHA256 5a7cf78cf367ba60b514cc8c6a9a559f50bb11c73f0cfa7c235d54a5dcc38fbc
+DIST mozilla-thunderbird-3.0.4-uk.xpi 231347 RMD160 0e7886ef0b069ea124bf8815f730086d1a4ca36c SHA1 6db0b8e2ba46fc0cd1a4375bab3e66328b635fb5 SHA256 a35fad57ac46825a4764a4207b92ed1ee8e7e53c856e3b98f3c475983c1ad6cd
+DIST mozilla-thunderbird-3.0.4-zh-CN.xpi 208275 RMD160 5e043d2c83ec1c593934de80dfded61a68335d88 SHA1 9052693e710c713c374c56b7d8249341b48f8221 SHA256 f7928b8b9afc85375d50ace6a1053e03098fec0011b2212a5bdc5b04fdcd97ad
+DIST mozilla-thunderbird-3.0.4-zh-TW.xpi 208650 RMD160 f83b711265b8c276a76903ef1c0a964c2319ccca SHA1 9fede55b4beee3e5ce05bf6653dfe0cd3fd97f91 SHA256 39aa611a7efdf4d92bb8bbdf7c12dcb24fca9e917116787cd1e3b262fc99d2a3
 DIST thunderbird-2.0.0.23-source.tar.bz2 38860245 RMD160 a1ef4af80121cdd8000c796e0c5fb575bea30348 SHA1 a237bfb92ec9c4b2bed7ea744e95d01ec43e07f1 SHA256 2c5007dfa1d094d8f089d42208e77d673e811a49980b7df77b04ed1606d30d21
 DIST thunderbird-3.0.3.source.tar.bz2 59938891 RMD160 53612faa4d0c5c63801217e16e76d3d75f86fbb5 SHA1 e4bd34fa4a55c04cd0982e7717f4e811902b9a3c SHA256 d567b7aee5c4f224da2c77d9f8be558a3855d6e970eb70485865827ef94cf1a6
+DIST thunderbird-3.0.4.source.tar.bz2 61094371 RMD160 ed8c905e3a6061c0ff896857fda3d96146bbc6a8 SHA1 5a6e89096da61a520e5cecb61f8afeb981f90412 SHA256 fdf28d6a9ea42c98557554ba28d0a3a8db11475eee49f16aa4a3aaf2ca1f1343
 EBUILD mozilla-thunderbird-2.0.0.23.ebuild 7778 RMD160 f290a913aa014b6dd7dc17793ff1bf23b8cd5c4f SHA1 07aa45c6e167bce56f66a8295405587ecb5335ca SHA256 bc64e142a94a3c8e138312e8ccd2b76ebb405f53e60319d7dd3e6d92c0ce2fed
 EBUILD mozilla-thunderbird-3.0.3-r2.ebuild 6652 RMD160 f5901954748814b6368693856ea909f2a1f22dd0 SHA1 8527febe6dbb9315cb4bce0aaae0a459389ac056 SHA256 4d6e6185ab9cf90acfa726c7786dc23b7435e91f2e3611adfc0dcbb9d3c7542e
 EBUILD mozilla-thunderbird-3.0.3.ebuild 6567 RMD160 71d660b8b7e78e3b91f56cc46aef2cc1bb78601b SHA1 fbe690b085bcefb7c607c9e03da1ae61938520ad SHA256 cdd133a0886e61c8e1f4f48bebc8355190e70a45b5e39c38739025b737f7e23d
-MISC ChangeLog 48776 RMD160 fc9c589e270e80df229535e4b0070f9c8577f334 SHA1 23dccea0a24a25387f8e7f55191ab6b3d74c69ca SHA256 706ddfe1bc8b38c47e9fbd8426959bb90be6c9c76f1ee9b2bc67b39127dc96d1
+EBUILD mozilla-thunderbird-3.0.4.ebuild 6719 RMD160 f98ad6d25bc55df0489ea723a80a93ca7a756031 SHA1 2c1c62a4485d757eb71bec5cbca17c6792a5a323 SHA256 887b649d4bfb73c515dc1a86fc50cd65d614600b0f425f86ad572f7884cfbbcd
+MISC ChangeLog 49007 RMD160 02aeccdba6e45645d0895d10f6f8edc403afa706 SHA1 31163a27303001c2aff4143e2d83752fc9fdc147 SHA256 04f6e336178cc080f004a9dab60f0a19f237f6808a1ec35b1eee9095681c400c
 MISC metadata.xml 638 RMD160 69ece61a118b4331cbf38dfeb658871963d29357 SHA1 f5a4acb54857595ad73793e9347321453712591a SHA256 7c168cc39644dad0cba0c7362d472c56a233b26c9c10959cfaf432e4b1f2efaf

diff --git a/mail-client/mozilla-thunderbird/files/1002_fix-system-hunspell-dict-detections.patch b/mail-client/mozilla-thunderbird/files/1002_fix-system-hunspell-dict-detections.patch
new file mode 100644 (file)
index 0000000..5a905aa
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/files/1002_fix-system-hunspell-dict-detections.patch
@@ -0,0 +1,112 @@
+diff -r e06632956519 mozilla/extensions/spellcheck/Makefile.in
+--- a/mozilla/extensions/spellcheck/Makefile.in        Sun Apr 04 07:02:14 2010 +0300
++++ b/mozilla/extensions/spellcheck/Makefile.in        Tue Apr 06 23:07:03 2010 -0500
+@@ -42,13 +42,19 @@
+ include $(DEPTH)/config/autoconf.mk
+ 
+ MODULE                = spellchecker
++ifndef MOZ_NATIVE_HUNSPELL
+ DIRS          = idl locales
++else
++DIRS          = idl
++endif
+ 
+ ifeq (camino,$(MOZ_BUILD_APP))
+ DIRS          += osxspell
+ else
++ifndef MOZ_NATIVE_HUNSPELL
+ DIRS          += hunspell
+ endif
++endif
+ 
+ DIRS += src
+ 
+diff -r e06632956519 mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp
+--- a/mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp       Sun Apr 04 07:02:14 2010 +0300
++++ b/mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp       Tue Apr 06 23:07:03 2010 -0500
+@@ -63,6 +63,9 @@
+ #include "nsISimpleEnumerator.h"
+ #include "nsIDirectoryEnumerator.h"
+ #include "nsIFile.h"
++#ifdef MOZ_NATIVE_HUNSPELL
++#include "nsILocalFile.h"
++#endif
+ #include "nsDirectoryServiceUtils.h"
+ #include "nsDirectoryServiceDefs.h"
+ #include "mozISpellI18NManager.h"
+@@ -307,7 +310,16 @@
+     return;
+ 
+   nsCOMPtr<nsIFile> dictDir;
+-  rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY,
++  #ifdef MOZ_NATIVE_HUNSPELL
++    nsCOMPtr<nsILocalFile>  localFile;
++    rv = NS_NewNativeLocalFile(nsDependentCString("/usr/share/myspell"),PR_TRUE, getter_AddRefs(localFile));
++    if (localFile && NS_SUCCEEDED(rv)) {
++      localFile->QueryInterface(NS_GET_IID(nsIFile), getter_AddRefs(dictDir));
++      LoadDictionariesFromDir(dictDir);
++    }
++    else {
++  #endif
++    rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY,
+                    NS_GET_IID(nsIFile), getter_AddRefs(dictDir));
+   if (NS_SUCCEEDED(rv)) {
+     LoadDictionariesFromDir(dictDir);
+@@ -332,6 +344,9 @@
+       LoadDictionariesFromDir(appDir);
+     }
+   }
++#ifdef MOZ_NATIVE_HUNSPELL
++  }
++#endif
+ 
+   nsCOMPtr<nsISimpleEnumerator> dictDirs;
+   rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY_LIST,
+diff -r e06632956519 mozilla/extensions/spellcheck/src/Makefile.in
+--- a/mozilla/extensions/spellcheck/src/Makefile.in    Sun Apr 04 07:02:14 2010 +0300
++++ b/mozilla/extensions/spellcheck/src/Makefile.in    Tue Apr 06 23:07:03 2010 -0500
+@@ -63,9 +63,15 @@
+                 txtsvc \
+                 uconv \
+                 unicharutil \
++                xulapp \
+                 $(NULL)
+ 
+-CPPSRCS               = \
++ifdef MOZ_NATIVE_HUNSPELL
++CPPSRCS         += mozHunspell.cpp \
++              mozHunspellDirProvider.cpp
++endif
++
++CPPSRCS               += \
+               mozSpellCheckerFactory.cpp      \
+               mozSpellChecker.cpp             \
+               mozPersonalDictionary.cpp       \
+@@ -80,8 +86,15 @@
+ SHARED_LIBRARY_LIBS += ../osxspell/src/$(LIB_PREFIX)osxspell_s.$(LIB_SUFFIX)
+ LOCAL_INCLUDES += -I$(srcdir)/../osxspell/src
+ else
++ifndef MOZ_NATIVE_HUNSPELL
+ SHARED_LIBRARY_LIBS += ../hunspell/src/$(LIB_PREFIX)hunspell_s.$(LIB_SUFFIX)
+ LOCAL_INCLUDES += -I$(srcdir)/../hunspell/src
++else
++LOCAL_INCLUDES += $(MOZ_HUNSPELL_CFLAGS) \
++              -I$(srcdir)/../hunspell/src \
++              -DMOZ_NATIVE_HUNSPELL \
++              $(NULL)
++endif
+ endif
+ 
+ EXTRA_DSO_LDOPTS = \
+@@ -96,3 +109,11 @@
+ LOCAL_INCLUDES += \
+       -I$(topsrcdir)/xpcom/io \
+       $(NULL)
++
++ifdef MOZ_NATIVE_HUNSPELL
++export:: $(srcdir)/../hunspell/src/mozHunspell.cpp $(srcdir)/../hunspell/src/mozHunspellDirProvider.cpp
++      $(INSTALL) $(srcdir)/../hunspell/src/mozHunspell.* $(srcdir)/../hunspell/src/mozHunspellDirProvider.* .
++GARBAGE += mozHunspell.$(OBJ_SUFFIX) mozHunspell.cpp mozHunspellDirProvider.$(OBJ_SUFFIX) mozHunspellDirProvider.cpp
++clean::
++      rm -f mozHunspell.* mozHunspellDirProvider.*
++endif

diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-3.0.4.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-3.0.4.ebuild
new file mode 100644 (file)
index 0000000..367d4a8
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/mozilla-thunderbird-3.0.4.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-3.0.4.ebuild,v 1.1 2010/04/08 03:47:25 anarchy Exp $
+EAPI="2"
+WANT_AUTOCONF="2.1"
+
+inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib mozextension autotools
+
+LANGS="af be bg ca cs da de el en-GB en-US es-AR es-ES eu fi fr ga-IE he hu it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT ru sk sv-SE tr uk zh-CN zh-TW"
+# Languages not rebuilt for "sl mk"
+NOSHORTLANGS="en-GB es-AR pt-BR zh-TW"
+
+MY_PV2="${PV/_rc/rc}"
+MY_P="${P/_rc/rc}"
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
+
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+SLOT="0"
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+IUSE="alsa ldap crypt bindist lightning mozdom system-sqlite"
+PATCH="${PN}-3.0-patches-0.3"
+
+REL_URI="http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases"
+SRC_URI="${REL_URI}/${MY_PV2}/source/thunderbird-${MY_PV2}.source.tar.bz2
+       http://dev.gentoo.org/~anarchy/dist/${PATCH}.tar.bz2"
+
+for X in ${LANGS} ; do
+       if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
+               SRC_URI="${SRC_URI}
+                       linguas_${X/-/_}? ( ${REL_URI}/${MY_PV2}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )"
+       fi
+       IUSE="${IUSE} linguas_${X/-/_}"
+       # english is handled internally
+       if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then
+               if [ "${X}" != "en-US" ]; then
+                       SRC_URI="${SRC_URI}
+                               linguas_${X%%-*}? ( ${REL_URI}/${PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )"
+               fi
+               IUSE="${IUSE} linguas_${X%%-*}"
+       fi
+done
+
+RDEPEND=">=sys-devel/binutils-2.16.1
+       >=dev-libs/nss-3.12.3
+       >=dev-libs/nspr-4.8
+       alsa? ( media-libs/alsa-lib )
+       system-sqlite? ( >=dev-db/sqlite-3.6.22-r2[fts3,secure-delete] )
+       >=media-libs/lcms-1.17
+       >=app-text/hunspell-1.2
+       x11-libs/cairo[X]
+       x11-libs/pango[X]
+       !x11-plugins/lightning"
+
+PDEPEND="crypt? ( >=x11-plugins/enigmail-1.0 )"
+
+S="${WORKDIR}"/comm-1.9.1
+
+linguas() {
+       local LANG SLANG
+       for LANG in ${LINGUAS}; do
+               if has ${LANG} en en_US; then
+                       has en ${linguas} || linguas="${linguas:+"${linguas} "}en"
+                       continue
+               elif has ${LANG} ${LANGS//-/_}; then
+                       has ${LANG//_/-} ${linguas} || linguas="${linguas:+"${linguas} "}${LANG//_/-}"
+                       continue
+               elif [[ " ${LANGS} " == *" ${LANG}-"* ]]; then
+                       for X in ${LANGS}; do
+                               if [[ "${X}" == "${LANG}-"* ]] && \
+                                       [[ " ${NOSHORTLANGS} " != *" ${X} "* ]]; then
+                                       has ${X} ${linguas} || linguas="${linguas:+"${linguas} "}${X}"
+                                       continue 2
+                               fi
+                       done
+               fi
+               ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA"
+       done
+}
+
+pkg_setup() {
+       export BUILD_OFFICIAL=1
+       export MOZILLA_OFFICIAL=1
+
+       if ! use bindist; then
+               elog "You are enabling official branding. You may not redistribute this build"
+               elog "to any users on your network or the internet. Doing so puts yourself into"
+               elog "a legal problem with Mozilla Foundation"
+               elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
+       fi
+}
+
+src_unpack() {
+       unpack ${A}
+
+       linguas
+       for X in ${linguas}; do
+               # FIXME: Add support for unpacking xpis to portage
+               [[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi"
+       done
+       if [[ ${linguas} != "" && ${linguas} != "en" ]]; then
+               einfo "Selected language packs (first will be default): ${linguas}"
+       fi
+}
+
+src_prepare() {
+       # Apply our patches
+       EPATCH_EXCLUDE="106-bz466250_att349521_fix_ftbfs_with_cairo_fb.patch"
+       EPATCH_SUFFIX="patch" \
+       EPATCH_FORCE="yes" \
+       epatch "${WORKDIR}"
+
+       epatch "${FILESDIR}/1002_fix-system-hunspell-dict-detections.patch"
+
+       eautoreconf
+
+       cd mozilla
+       eautoreconf
+       cd js/src
+       eautoreconf
+}
+
+src_configure() {
+       declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+       MEXTENSIONS="default"
+
+       ####################################
+       #
+       # mozconfig, CFLAGS and CXXFLAGS setup
+       #
+       ####################################
+
+       touch mail/config/mozconfig
+       mozconfig_init
+       mozconfig_config
+
+       # It doesn't compile on alpha without this LDFLAGS
+       use alpha && append-ldflags "-Wl,--no-relax"
+
+       mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+       mozconfig_annotate '' --enable-application=mail
+       mozconfig_use_enable ldap
+       mozconfig_use_enable ldap ldap-experimental
+       mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+       mozconfig_annotate '' --with-user-appdir=.thunderbird
+       mozconfig_annotate '' --with-system-nspr
+       mozconfig_annotate '' --with-system-nss
+       mozconfig_annotate 'broken' --disable-crashreporter
+
+       # Use enable features
+       mozconfig_use_enable lightning calendar
+       mozconfig_use_enable system-sqlite
+       mozconfig_use_enable alsa ogg
+       mozconfig_use_enable alsa wave
+
+       # Bug #72667
+       if use mozdom; then
+               MEXTENSIONS="${MEXTENSIONS},inspector"
+       fi
+
+       if ! use bindist; then
+               mozconfig_annotate '' --enable-official-branding
+       fi
+
+       # Finalize and report settings
+       mozconfig_final
+
+       ####################################
+       #
+       #  Configure and build
+       #
+       ####################################
+
+       # Disable no-print-directory
+       MAKEOPTS=${MAKEOPTS/--no-print-directory/}
+
+       if [[ $(gcc-major-version) -lt 4 ]]; then
+               append-cxxflags -fno-stack-protector
+       fi
+
+       CPPFLAGS="${CPPFLAGS}" \
+       CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+       econf || die
+}
+
+src_compile() {
+       # Should the build use multiprocessing? Not enabled by default, as it tends to break
+       [ "${WANT_MP}" = "true" ] && jobs=${MAKEOPTS} || jobs="-j1"
+       emake ${jobs} || die
+}
+
+src_install() {
+       declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+       emake DESTDIR="${D}" install || die "emake install failed"
+
+       if use lightning ; then
+               declare emid
+
+               cd "${T}"
+               unzip "${S}"/mozilla/dist/xpi-stage/gdata-provider.xpi install.rdf
+               emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
+
+               dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
+               cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid}
+               unzip "${S}"/mozilla/dist/xpi-stage/gdata-provider.xpi
+       fi
+
+       linguas
+       for X in ${linguas}; do
+               [[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}"
+       done
+
+       if ! use bindist; then
+               newicon "${S}"/other-licenses/branding/thunderbird/content/icon48.png thunderbird-icon.png
+               domenu "${FILESDIR}"/icon/${PN}.desktop
+       else
+               newicon "${S}"/mail/branding/nightly/content/icon48.png thunderbird-icon-unbranded.png
+               newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
+                       ${PN}.desktop
+       fi
+
+       # Warn user that remerging enigmail is neccessary on USE=crypt
+       use crypt && ewarn "Please remerge x11-plugins/enigmail after updating ${PN}."
+
+       # Enable very specific settings for thunderbird-3
+       cp "${FILESDIR}"/thunderbird-gentoo-default-prefs.js \
+               "${D}/${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js" || \
+               die "failed to cp thunderbird-gentoo-default-prefs.js"
+}