Initial import of tb-3.3_alpha3 to tree for testing/porting

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

8 files changed, 423 insertions, 3 deletions

diff --git a/mail-client/thunderbird/ChangeLog b/mail-client/thunderbird/ChangeLog
index 30f1edc9f0df..b1c5acd92c1d 100644
--- a/mail-client/thunderbird/ChangeLog
+++ b/mail-client/thunderbird/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for mail-client/thunderbird
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.70 2011/03/18 17:20:35 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.71 2011/04/04 02:33:57 anarchy Exp $
+
+*thunderbird-3.3_alpha3-r1 (04 Apr 2011)
+
+  04 Apr 2011; Jory A. Pratt <anarchy@gentoo.org>
+  +files/1001-xulrunner_fix_jemalloc_vs_aslr.patch,
+  +files/enigmail-1.1.2-20110124-locale-fixup.diff,
+  +thunderbird-3.3_alpha3-r1.ebuild,
+  +files/thunderbird-3.3-gconf-config-update.patch,
+  +files/2000-thunderbird_gentoo_install_dirs.patch:
+  Add tb-3.3a3 to tree for testing/porting
 
   18 Mar 2011; Raúl Porcel <armin76@gentoo.org> thunderbird-3.1.9.ebuild:
   alpha/ia64/sparc stable wrt #357057
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index aeb2e6dbab9f..8fbbd7f57394 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -1,6 +1,9 @@
+AUX 1001-xulrunner_fix_jemalloc_vs_aslr.patch 1936 RMD160 4edd9e5ab5082f86cb66ad1fc158e4c105f861ce SHA1 20df285bac8e0704559c0479f7dfe02f030afa8a SHA256 0beb08f2b3fc504897b1024caabcf2887b55fae31c021341c66d3491dc63e32b
 AUX 1002_fix-system-hunspell-dict-detections.patch 3466 RMD160 f8fa846e5d7c80a15d0abf0c6aedb7302ead1f83 SHA1 091febd913c09c86c9242b1be8960fb012ee7c8d SHA256 7ce51cae6bbd6655c8bc543365370627e37d2fc5aa7f7e1270671f7482df344a
+AUX 2000-thunderbird_gentoo_install_dirs.patch 813 RMD160 802697aab947df43693d7330f5d83700a62a6b50 SHA1 d2621bc80130239d7d65562ce8de8488dcbf60e2 SHA256 f663f3e59ac1752d681ed5d09bd599693009a65f603c89fa6d2e851b3487a8c4
 AUX bug-606109.patch 1259 RMD160 6d3f5d354524268e34293e9ce2d8b173c47163af SHA1 e1488807cc61ec04b2caa50019c000ba5d077450 SHA256 f2e645dfaa03cabcf46703be5bdeff8ee021694896465d3d263b038682dc0395
 AUX cups-1.4.4-fixup.patch 5439 RMD160 e907f65012a88b0810979c0beda4244e817835e6 SHA1 4099626a22b61802c958faad8171d506a95f9fca SHA256 501f95e278c2fdf3dec2b5586a2dc5ae35d78557a0db9939a1501c4782e54be5
+AUX enigmail-1.1.2-20110124-locale-fixup.diff 125 RMD160 8704469817cd93c99665a35655fa626b74253920 SHA1 708e101ae0576f99d6f10ac778fbc2b76c3ff6ea SHA256 60627ed65b032e33935d14eea4c7224f940641c4a11ab8bdf2c5d6056a76bfda
 AUX icon/thunderbird-icon-unbranded.png 13280 RMD160 1654b2cfa39631e2084da982001113972eb41c09 SHA1 2fdca79e57c79d2485eb56d31de7afb05337898e SHA256 28b605529bee4d8245afdbb2cab5a705d8fa8977a11635b54c7bc5a7d6a9619c
 AUX icon/thunderbird-icon.png 6499 RMD160 1aeece7719c1c1629b98fc11870641769681a048 SHA1 651d244e96fa0edf13f68f5ef9047432eb6ed3bf SHA256 ff9749e42b82b80425bb52883d63baa53298af7be98870ee6b73f0a6cf0ab22d
 AUX icon/thunderbird-unbranded.desktop 183 RMD160 2aeecc5f6127adee0c9ab1e1c83a29bafb82f41e SHA1 3c7533d73abf8208e2117de1601ac31935994021 SHA256 b42bda8d82722d069049889f14887aabc9f3e139a023186780ffff222ca5722d
@@ -8,11 +11,13 @@ AUX icon/thunderbird.desktop 173 RMD160 03faca4ba9ff401e5d5ffc6ebb0a27ddbd9dd36c
 AUX libnotify-0.7.patch 1809 RMD160 5d88eedd2769b3cf318f759717df75444a823fcb SHA1 41c1c7f7b0259cf1857f9d38b1d5be0c1027c304 SHA256 97fb2338cd5e813afef08a128358c5702cb63e5399afca3004b20b863ab8281b
 AUX thunderbird-3.1-gcc45.patch 1051 RMD160 d01dcbdc7c25d8a4c077d07abc247111a6c5f77c SHA1 e6bb3ac4796d5d8d10573f8131892281c094486e SHA256 0bc2214d4b705bf2edb515c471e2748eac5c84f765af44d2134704572bd5e435
 AUX thunderbird-3.1-noalsa-fixup.patch 1087 RMD160 ad7807e9d42c65b9f1a8965e43db349a4c1fd38f SHA1 36f66207e3df9aa2481a7e2cb43c6ba0e74dc912 SHA256 62a9044ad373a3ead7c8547e7a342891c55f04d5fe0225e5ac05115fbad962e1
+AUX thunderbird-3.3-gconf-config-update.patch 1569 RMD160 e237530c4d95de84aa295927fd1c703d8a54b9a9 SHA1 6f78524f88fd7b3f4fef4eec1666eabe96c89992 SHA256 9da47f2752f7bb353297b93be3aaecf2d6004af3c91717d22e35a347ee6cf2a2
 AUX thunderbird-gentoo-default-prefs-1.js 311 RMD160 3542b008d6ba40a0290e5921d3388b81c817437c SHA1 bd307aa373458fed7c30c749d3e7acaf26e0b05e SHA256 1c9e25533118fc41e7dd8c276ce60106f6fb1959cab3887438759d23fdbc5445
 AUX thunderbird-gentoo-default-prefs.js 494 RMD160 9eed5d9ac1f7953bb563354176a3656c09e62744 SHA1 6a155c0e3bf74f37ddb2e506df5cb35af5e7105f SHA256 e9831135f0f893944df3f51d3c754db9eb330a1293d7e6b79b7682d6ce60b48f
 AUX thunderbird-respect-ldflags.patch 1640 RMD160 889a63b2fb04878e99b2a14d47713e47621ab334 SHA1 fec674ca325de52a547af336864b66e113fb2df7 SHA256 3db9aea0cdfc77c6c7de20591a44b92eecb9636fdb6c45676a173905a8bd7ae1
 AUX thunderbird-xul-1.9.2-arm-fixes.patch 603 RMD160 952db59f2c3d526b04323fec830cf04c28dfb84d SHA1 b1e2f12c0b204bf2c6434303c0638750dcb1b73d SHA256 19d230805cb5d62a99fef32dfc373661dcc3361bf8d1f6077854120a5e9a9821
 AUX xulrunner-1.9.2-gtk+-2.21.patch 679 RMD160 060d514faa98768312d047985c81934342935745 SHA1 d672469ce9f8271a4788639a7fa36c7d606ef442 SHA256 25432a427c70fcaf929e45312ff9e4a617d709d59efa89932a77b42c3f7b0230
+DIST enigmail-1.2a1-20110316.tar.bz2 905604 RMD160 57bb867f70f6b37ee11d426a8e155f2ccf5d56d2 SHA1 371e3c8bd7157ed8aee7648a271df591db75f8c2 SHA256 113db06ab1621328635c5394174afe02bef9c154c46b62ea7c605ac0a0b2beba
 DIST thunderbird-3.1-patches-1.2.tar.bz2 3427 RMD160 354d9003e8132e0aaf7069aec84459ff28237f61 SHA1 36ad5f9af77eaacc02c7df744b5d2563fb54bed8 SHA256 6586cf569b035bd1b9179036678a0cbedbf3def88ca7d69852451542b52693a0
 DIST thunderbird-3.1.7-af.xpi 210611 RMD160 f14882bffe66cd8f41fc819e12f385870268e42a SHA1 8d2042974e99cdae13873ffdba675fc43b485937 SHA256 6ab42b6e69e0da306d165414ff3fe9fb51b124d29a41a3cf102a4c823257fb85
 DIST thunderbird-3.1.7-ar.xpi 230312 RMD160 dd0f3a50977811eceb6ee0b71839a5f673e04ad0 SHA1 cae652843c60fc2f769b9b94377b3e200cb76de7 SHA256 48073e7d016781302283818fb3c2f34c8996e7fea76ec041c591ed73246cc45c
@@ -106,7 +111,9 @@ DIST thunderbird-3.1.9-uk.xpi 244831 RMD160 87f7f8ab4c93cc4afb10ae8b95e3402c3ce4
 DIST thunderbird-3.1.9-zh-CN.xpi 219646 RMD160 a48694168186adec3841840390bbffd772e7211a SHA1 469270dd5b5f4c6efdfd9856b1cb438ae4806337 SHA256 c700b7b46fd66142a0b8afe979dc7eed86354a2d1f996aabb7f649e19511172a
 DIST thunderbird-3.1.9-zh-TW.xpi 220577 RMD160 d13efbae626df159e32e17b40134f082451d013d SHA1 41f064ed29960c57f4e0d2c9676d3e8557f43a2b SHA256 029e44c508e71056c9e6ce9045cc935cba40c714840755dff99bc9efc131a70a
 DIST thunderbird-3.1.9.source.tar.bz2 68760361 RMD160 9c85e4b76929792a7c2c8cbc0435c86cb9961a4d SHA1 22b153102939430180ae1873ce15ef52286ff08d SHA256 8b499ec3d81d3242b0cc2de27effb1891a07259adf7e5e4c06150f8c9f5254c2
+DIST thunderbird-3.3a3.source.tar.bz2 83692340 RMD160 79ec91e73d6f1e64f16efae9c6ec333a2e54b220 SHA1 416c085e92a04c12c49b7f1ad41effb7ef24ece9 SHA256 7f5487449023a68784d800fdd38c25d30356972b27b0a23c2ba162c149161618
 EBUILD thunderbird-3.1.7.ebuild 7952 RMD160 b2d9fc6d2ea3afcb330e40dd6b23ff7080f03988 SHA1 110dd02b1f59c1070e66eb0b9b666d3009aa0538 SHA256 da50f722a29ef5b549cac4f3fa1a3c55712288bf080c97a9eba5a1a936b6fe9d
 EBUILD thunderbird-3.1.9.ebuild 8158 RMD160 9449819e59ccdc9d07562b2ae9ec06721d4bf4f8 SHA1 37af9f8927b915ce73d55575717349006df331c0 SHA256 6cdf7ae2246f6d0f503ead630776d166194fc10db3cbf68a3f2480ecf40b0f10
-MISC ChangeLog 60889 RMD160 9bbd6da7adc3ce4afd5ff901804c32d10852e02d SHA1 f1bac410685e5af81a7fbd598f9c9d2a4c990706 SHA256 ec39e4e31e2a2e4060db27e7e9b98bfdbbce569d013b078ca6d6583f8e6b4c37
-MISC metadata.xml 471 RMD160 dd596368f27518e6d32d724e878d8dfb0303fb68 SHA1 147c70ac08b477679be27a428679c4c06ce0c1f0 SHA256 8f3f2c2b7c204fa12ce8ab51e655985374ea469d3870680b6925d541dbf56ef3
+EBUILD thunderbird-3.3_alpha3-r1.ebuild 7735 RMD160 ea15a378fe285df3902a561b4079b46601f1fb0e SHA1 8e6030abe8c68b33b58b40a9d9c59b73aada3e1b SHA256 593f5e4739c5e7f4b670f93e8c865bb1f2326fda23a51cee7c23dcb0f59f124a
+MISC ChangeLog 61271 RMD160 54a5d37d2d68c0cb374934c25e6c8fba7f4b6091 SHA1 4daf8e98539c7b1dccab763b1881f25bf86858ee SHA256 d1a8fa95f0006952a60efbafb69a2216a1fb6404ee092ea569039ab6bd9351e2
+MISC metadata.xml 732 RMD160 87468b1b9c1c1ec539c026f04e05265a4dc32cdd SHA1 283661cc3d68f2f7c2a3b82455692f7239bed63b SHA256 3b0e7f6f49598b82aaeee92a5f96f99877713866fbbb73c797bfa65f2c0b4d75
diff --git a/mail-client/thunderbird/files/1001-xulrunner_fix_jemalloc_vs_aslr.patch b/mail-client/thunderbird/files/1001-xulrunner_fix_jemalloc_vs_aslr.patch
new file mode 100644
index 000000000000..7511ac7c3c2a
--- /dev/null
+++ b/mail-client/thunderbird/files/1001-xulrunner_fix_jemalloc_vs_aslr.patch
@@ -0,0 +1,55 @@
+diff -urpx 'cscope*' -x '.*.swp' mozilla-1.9.1-orig/memory/jemalloc/jemalloc.c mozilla-1.9.1/memory/jemalloc/jemalloc.c
+--- mozilla-orig/memory/jemalloc/jemalloc.c	2009-07-30 17:30:25.000000000 +0200
++++ mozilla/memory/jemalloc/jemalloc.c	2009-08-10 14:28:59.000000000 +0200
+@@ -392,7 +392,7 @@ __FBSDID("$FreeBSD: head/lib/libc/stdlib
+ static const bool __isthreaded = true;
+ #endif
+ 
+-#if defined(MOZ_MEMORY_SOLARIS) && defined(MAP_ALIGN) && !defined(JEMALLOC_NEVER_USES_MAP_ALIGN)
++#if defined(MOZ_MEMORY_SOLARIS) || defined(MOZ_MEMORY_LINUX) || defined(MOZ_MEMORY_BSD)
+ #define JEMALLOC_USES_MAP_ALIGN	 /* Required on Solaris 10. Might improve performance elsewhere. */
+ #endif
+ 
+@@ -2305,20 +2305,31 @@ pages_map_align(size_t size, int pfd, si
+ 	 * We don't use MAP_FIXED here, because it can cause the *replacement*
+ 	 * of existing mappings, and we only want to create new mappings.
+ 	 */
+-#ifdef MALLOC_PAGEFILE
+-	if (pfd != -1) {
+-		ret = mmap((void *)alignment, size, PROT_READ | PROT_WRITE, MAP_PRIVATE |
+-		    MAP_NOSYNC | MAP_ALIGN, pfd, 0);
+-	} else
+-#endif
+-	       {
+-		ret = mmap((void *)alignment, size, PROT_READ | PROT_WRITE, MAP_PRIVATE |
+-		    MAP_NOSYNC | MAP_ALIGN | MAP_ANON, -1, 0);
+-	}
++	ret = mmap(NULL, size + alignment, PROT_READ | PROT_WRITE, MAP_PRIVATE |
++		    MAP_NOSYNC| MAP_ANON, -1, 0);
+ 	assert(ret != NULL);
+ 
+ 	if (ret == MAP_FAILED)
+ 		ret = NULL;
++	else {
++		uintptr_t aligned_ret;
++		size_t extra_size;
++
++		aligned_ret = (uintptr_t)ret + alignment - 1;
++		aligned_ret &= ~(alignment - 1);
++		extra_size = aligned_ret - (uintptr_t)ret;
++		munmap(ret, extra_size);
++		munmap(ret + extra_size + size, alignment - extra_size);
++		ret = (void *)aligned_ret;
++#ifdef MALLOC_PAGEFILE
++		if (pfd != -1) {
++			ret = mmap(ret, size, PROT_READ | PROT_WRITE, MAP_PRIVATE |
++			    MAP_NOSYNC | MAP_FIXED, pfd, 0);
++		}
++		if (ret == MAP_FAILED)
++			ret = NULL;
++#endif
++	}
+ 	return (ret);
+ }
+ #endif
+
diff --git a/mail-client/thunderbird/files/2000-thunderbird_gentoo_install_dirs.patch b/mail-client/thunderbird/files/2000-thunderbird_gentoo_install_dirs.patch
new file mode 100644
index 000000000000..b3af6f35fa88
--- /dev/null
+++ b/mail-client/thunderbird/files/2000-thunderbird_gentoo_install_dirs.patch
@@ -0,0 +1,22 @@
+diff -ur work.orig/config/autoconf.mk.in work/config/autoconf.mk.in
+--- work.orig/config/autoconf.mk.in	2009-04-28 16:55:24.000000000 +0000
++++ work/config/autoconf.mk.in	2009-04-28 16:57:12.000000000 +0000
+@@ -60,14 +60,14 @@
+ prefix		= @prefix@
+ exec_prefix	= @exec_prefix@
+ bindir		= @bindir@
+-includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++includedir	= @includedir@/thunderbird
+ libdir		= @libdir@
+ datadir		= @datadir@
+ mandir		= @mandir@
+-idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++idldir		= $(datadir)/idl/thunderbird
+ 
+-installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir	= $(libdir)/thunderbird
++sdkdir		= $(libdir)/thunderbird-devel
+ 
+ MOZDEPTH	= $(DEPTH)/mozilla
+ DIST		= $(MOZDEPTH)/dist
diff --git a/mail-client/thunderbird/files/enigmail-1.1.2-20110124-locale-fixup.diff b/mail-client/thunderbird/files/enigmail-1.1.2-20110124-locale-fixup.diff
new file mode 100644
index 000000000000..e5e52f1979c8
--- /dev/null
+++ b/mail-client/thunderbird/files/enigmail-1.1.2-20110124-locale-fixup.diff
@@ -0,0 +1,8 @@
+--- enigmail/lang/current-languages.txt
++++ enigmail/lang/current-languages.txt
+@@ -1,5 +1,4 @@
+ ar
+-bg-BG
+ ca
+ cs-CZ
+ de-AT
diff --git a/mail-client/thunderbird/files/thunderbird-3.3-gconf-config-update.patch b/mail-client/thunderbird/files/thunderbird-3.3-gconf-config-update.patch
new file mode 100644
index 000000000000..8bb723771f4f
--- /dev/null
+++ b/mail-client/thunderbird/files/thunderbird-3.3-gconf-config-update.patch
@@ -0,0 +1,50 @@
+diff --git a/configure.in b/configure.in
+--- a/configure.in
++++ b/configure.in
+@@ -5031,16 +5031,21 @@ then
+             fi
+             MOZ_ENABLE_GIO=
+         ])
+     fi
+ 
+     dnl ========================================================
+     dnl = GConf support module
+     dnl ========================================================
++    MOZ_ARG_DISABLE_BOOL(gconf,
++    [  --disable-gconf      Disable Gconf support ],
++        MOZ_ENABLE_GCONF=,
++        MOZ_ENABLE_GCONF=force)
++
+     if test "$MOZ_ENABLE_GCONF"
+     then
+         PKG_CHECK_MODULES(MOZ_GCONF, gconf-2.0 >= $GCONF_VERSION gobject-2.0 ,[
+             MOZ_ENABLE_GCONF=1
+         ],[
+             MOZ_ENABLE_GCONF=
+         ])
+      fi
+diff --git a/mozilla/configure.in b/mozilla/configure.in
+--- a/mozilla/configure.in
++++ b/mozilla/configure.in
+@@ -5701,16 +5701,21 @@ then
+ 
+     AC_SUBST(MOZ_ENABLE_GIO)
+     AC_SUBST(MOZ_GIO_CFLAGS)
+     AC_SUBST(MOZ_GIO_LIBS)
+    
+     dnl ========================================================
+     dnl = GConf support module
+     dnl ========================================================
++    MOZ_ARG_DISABLE_BOOL(gconf,
++    [  --disable-gconf      Disable Gconf support ],
++        MOZ_ENABLE_GCONF=,
++        MOZ_ENABLE_GCONF=force)
++
+     if test "$MOZ_ENABLE_GCONF"
+     then
+         PKG_CHECK_MODULES(MOZ_GCONF, gconf-2.0 >= $GCONF_VERSION gobject-2.0 ,[
+             MOZ_GCONF_LIBS=`echo $MOZ_GCONF_LIBS | sed 's/-llinc\>//'`
+             MOZ_ENABLE_GCONF=1
+         ],[
+             if test "$MOZ_ENABLE_GCONF" = "force"
+             then
diff --git a/mail-client/thunderbird/metadata.xml b/mail-client/thunderbird/metadata.xml
index 0ce54c745783..4322881dbfd0 100644
--- a/mail-client/thunderbird/metadata.xml
+++ b/mail-client/thunderbird/metadata.xml
@@ -8,5 +8,9 @@
 	<flag name='custom-optimization'>Enable user CFLAGS</flag>
 	 <flag name='system-sqlite'>Use the system-wide <pkg>dev-db/sqlite</pkg>
 		 installation with secure-delete enabled</flag>
+	<flag name="ipc">Use inter-process communication between tabs and plugins.
+		Allows for greater stability in case of plugin crashes</flag>
+	<flag name="crashreporter">Enable crash reporter for bugs</flag>
+	<flag name="gconf">Enable gnome2 gconf support</flag>
 </use>
 </pkgmetadata>
diff --git a/mail-client/thunderbird/thunderbird-3.3_alpha3-r1.ebuild b/mail-client/thunderbird/thunderbird-3.3_alpha3-r1.ebuild
new file mode 100644
index 000000000000..c21537d5dd08
--- /dev/null
+++ b/mail-client/thunderbird/thunderbird-3.3_alpha3-r1.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-3.3_alpha3-r1.ebuild,v 1.1 2011/04/04 02:33:57 anarchy Exp $
+
+EAPI="3"
+WANT_AUTOCONF="2.1"
+
+inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib mozextension autotools pax-utils python
+
+# This list can be updated using get_langs.sh from the mozilla overlay
+#LANGS="af ar be bg bn-BD ca cs da de el en en-GB en-US es-AR es-ES et eu fi fr \
+#fy-NL ga-IE he hu id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT ro ru si \
+#sk sl sq sv-SE tr uk zh-CN zh-TW"
+#NOSHORTLANGS="en-GB es-AR pt-BR zh-TW"
+
+MY_PV="${PV/_alpha/a}"
+MY_P="${P/_alpha/a}"
+EMVER="1.2a1"
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
+
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+IUSE="bindist gconf +crashreporter +crypt +ipc +lightning mozdom"
+#PATCH="${PN}-3.1-patches-1.2"
+
+REL_URI="http://releases.mozilla.org/pub/mozilla.org/${PN}/releases"
+SRC_URI="${REL_URI}/${MY_PV}/source/${MY_P}.source.tar.bz2
+	crypt? ( http://dev.gentoo.org/~anarchy/mozilla/firefox/enigmail-${EMVER}-20110316.tar.bz2 )"
+#	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2"
+
+#for X in ${LANGS} ; do
+#	if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
+#		SRC_URI="${SRC_URI}
+#			linguas_${X/-/_}? ( ${REL_URI}/${MY_PV}/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}/${MY_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.9
+	>=dev-libs/nspr-4.8.7
+	gconf? ( >=gnome-base/gconf-1.2.1:2 )
+	!x11-plugins/lightning
+	!x11-plugins/enigmail
+	crypt?  ( || (
+		( >=app-crypt/gnupg-2.0
+			|| (
+				app-crypt/pinentry[gtk]
+				app-crypt/pinentry[qt4]
+			)
+		)
+		=app-crypt/gnupg-1.4*
+	) )"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/comm-central
+
+#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() {
+	moz_pkgsetup
+
+	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() {
+	epatch "${FILESDIR}/1001-xulrunner_fix_jemalloc_vs_aslr.patch"
+	epatch "${FILESDIR}/2000-thunderbird_gentoo_install_dirs.patch"
+	epatch "${FILESDIR}/thunderbird-3.3-gconf-config-update.patch"
+
+	if use crypt ; then
+		mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
+		cd "${S}"/mailnews/extensions/enigmail || die
+		epatch "${FILESDIR}"/enigmail-1.1.2-20110124-locale-fixup.diff
+		cd enigmail
+		./makemake -r 2> /dev/null
+		sed -i -e 's:@srcdir@:${S}/mailnews/extensions/enigmail:' Makefile.in
+		cd "${S}"
+	fi
+
+	# Allow user to apply any additional patches without modifing ebuild
+	epatch_user
+
+	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
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	if use crypt ; then
+		# omni.jar breaks enigmail 
+		mozconfig_annotate '' --enable-chrome-format=jar
+	fi
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+	mozconfig_annotate '' --with-default-mozilla-five-home="${EPREFIX}${MOZILLA_FIVE_HOME}"
+	mozconfig_annotate '' --with-user-appdir=.thunderbird
+
+	# Use enable features
+	mozconfig_use_enable lightning calendar
+	mozconfig_use_enable gconf
+
+	# Bug #72667
+	if use mozdom; then
+		MEXTENSIONS="${MEXTENSIONS},inspector"
+	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() {
+	emake || die
+
+	# Only build enigmail extension if crypt enabled.
+	if use crypt ; then
+		emake -C "${S}"/mailnews/extensions/enigmail || die "make enigmail failed"
+		emake -C "${S}"/mailnews/extensions/enigmail xpi || die "make enigmail xpi failed"
+	fi
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	if use crypt ; then
+		cd "${T}" || die
+		unzip "${S}"/mozilla/dist/bin/enigmail*.xpi install.rdf || die
+		emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
+
+		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} || die
+		cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
+		unzip "${S}"/mozilla/dist/bin/enigmail*.xpi || die
+	fi
+
+	if use lightning ; then
+		declare emid emd1 emid2
+
+		emid="{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}"
+		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
+		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
+		unzip "${S}"/mozilla/dist/xpi-stage/gdata-provider.xpi
+
+		emid1="calendar-timezones@mozilla.org"
+		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid1}
+		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid1}
+		unzip "${S}"/mozilla/dist/xpi-stage/calendar-timezones.xpi
+
+		emid2="{e2fda1a4-762b-4020-b5ad-a41df1933103}"
+		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid2}
+		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid2}
+		unzip "${S}"/mozilla/dist/xpi-stage/lightning.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/unofficial/content/icon48.png thunderbird-icon-unbranded.png
+		newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
+			${PN}.desktop
+
+		sed -i -e "s:Mozilla\ Thunderbird:Lanikai:g" \
+			"${D}"/usr/share/applications/${PN}.desktop
+
+	fi
+
+	pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/thunderbird-bin
+
+	# Enable very specific settings for thunderbird-3
+	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js \
+		"${ED}/${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js" || \
+		die "failed to cp thunderbird-gentoo-default-prefs.js"
+}