Add http fallback, update to official dictionary support

Package-Manager: portage-2.1.12.4/cvs/Linux x86_64
Manifest-Sign-Key: 0xB4D088B4

3 files changed, 367 insertions, 17 deletions

diff --git a/mail-client/thunderbird/ChangeLog b/mail-client/thunderbird/ChangeLog
index 794e847bf8c6..078b67631cfd 100644
--- a/mail-client/thunderbird/ChangeLog
+++ b/mail-client/thunderbird/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/thunderbird
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.219 2013/05/25 20:47:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.220 2013/06/10 04:03:50 anarchy Exp $
+
+*thunderbird-17.0.6-r1 (10 Jun 2013)
+
+  10 Jun 2013; Jory A. Pratt <anarchy@gentoo.org>
+  +thunderbird-17.0.6-r1.ebuild:
+  Add http fallback, update to official dictionary support
 
   25 May 2013; Agostino Sarubbo <ago@gentoo.org> thunderbird-17.0.6.ebuild:
   Stable for ppc64, wrt bug #469868
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 5f86294e5156..42c51a11c27a 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -1,11 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX icon/thunderbird-unbranded.desktop 228 SHA256 9c3486c4944c7a7471ae5d5f6ab8b716a9e51ad677d140b7ef58de99b9a7f334 SHA512 adb886d443fbd01c3c0b34ef4ad8eb7e790eb81dd8c6bee347a03061742dfa1a4ffb5137e0451253ed60a28eea5a752175a51e41c21ae0bff6a0673d056b3c70 WHIRLPOOL 851d5428ab36bd0622529f7ac9c54ab22ff1729d78a2ba185d80efd2f8ee105401c3db26229cc55bc7e28cd5f63c21e62703e94b60396e8c61575d514a6d5567
 AUX icon/thunderbird.desktop 218 SHA256 5fd4cd2b2a41cf8e526e16fa26a1b17292a9df9ef314bbb768057e921679898f SHA512 0ab09379603c90f53fabf7b41a4e3281191b7ceb8f8c2f64cada5ddc83d72a9032534c9a39fa9b63f5945f89d277b41ff15f7e20e44bb3e8fcb0348ddd450828 WHIRLPOOL 0dd5f139c30f0b5b18b853d5781ad55e775db6367dff393ab8984ff76a2bb5533b34fc4d2088cb750420178d85dfa2d7ce3710fdff95f3b932258a3e4267beaf
 AUX thunderbird-gentoo-default-prefs-1.js-1 426 SHA256 b5aba51045c700ae4d465e079f3e776600d4950806212f7c2fe1841fa25cf9d6 SHA512 b40e7b4789b7f43c382589f7d0eaa6043072bce86ab79fb3dda4800e9ab6a43af11f43b0cb3b6ab1c71d887aa1cf9356ac858f0a81dad013cef5b8a4b2107983 WHIRLPOOL cc3535e9a710d55c5386db51d7bd6ca24f6b36685a54e42d049a806fe99fd0b08afe7998d1478036bfa306129616778b8ac1386e14649646fc0a7ae4d37b830d
 DIST enigmail-1.5.1.tar.gz 1213954 SHA256 234ca3c8f7c74afb64ebdaa4762e358f35a72c1f8de007b992497fc2db803af0 SHA512 90d0fa7ce4aa8edd788be234cd85e8e10b6ed7043f1f7aab23a94f0f7958b23b37dce4b96fd552d523c9bdccf13da1dab5624d279a1bc0c4b35be2712c379cf2 WHIRLPOOL c8ffaef0f89f5403f2ba51f2d37eb23a1ae0b3d5abcc28328b6e293ad2a6498368863df0e718ae339b7b7e1622d78d95e1575080b3f600861daafe59a43c8aec
 DIST firefox-17.0-patches-0.5.tar.xz 52792 SHA256 832d8bb1575473773dc78a66ab2bbf14a1de429f3ca8dc09600f0aa41747b1e1 SHA512 7a28c4c8253e73ab9ffa273ea6b8da7bf2a9422e31dcc1ec6fad1c17e5d8490c9432b517952c1db4b29ea93bbbb8e0f5727dd6ac476d670115810d4cf4b002b7 WHIRLPOOL a2a4c1a9d0503471c206def35452b113e9aadd3a8136d343e45955dba70fb39dfa6f649fdacab54e1b1f606037189e3cbc42743a6ed43aa912a42e4fe43e3529
+DIST firefox-17.0-patches-0.6.tar.xz 52708 SHA256 0e1f5b026bf9d1f351257127de21c9f1378fc70d2e96b5d1eac4009dcff84309 SHA512 24aaf56e80b12f5bd52abe975817ec9d1cbd40041ca9d6d207ac02fedd8c01bbefc7a56de38a2e1965019389b7ce8c1b9d694b974ebe94cbb91110770f3a826e WHIRLPOOL 0733719bfa567e13de75645ddbfb52a7f4ff2722f0c4b2f6d1ebbe911938a60adebfe8163d91f7cffa7666d686f8a9a1aedb515f70177da07737289745f738e1
 DIST thunderbird-17.0-patches-01.tar.xz 820 SHA256 79bf322258e0efc7682ce71ea84398e4dbec55b912acb264e16ddae72917bd8e SHA512 94ad743f86d95cb437bbe3be52beb8ab7c97acd9f703841f9445f94672d764cf6b9a3dfc065a6c54f24eeb16113a62708290512a3f54389c538a52fa93be7e06 WHIRLPOOL eb234826caf0f648d3ea8043b49fc2650f3a011eb28db661122e50abab0a6098b467e580d3c120b97a29919934c072e931f956bfa6676a2759cf46a2db88f282
 DIST thunderbird-17.0.5esr-ar.xpi 445976 SHA256 a895c50567eb0060854019921ab1b7f9d68ca56d76f7f73d7d2fe4fa201fbb50 SHA512 73ef90e9a7c0ef67c512f844dc237ca3c581bbe144acafc834c5131596c3cde393e2cd3a9ae703a3e11968f603f97e3c34161f4c13bd5830ef21645c0f69b5e2 WHIRLPOOL e3f8d970ac62f45aead2d57a2e0dd20661582b1a6e3509920d6218be7188fee1c63a4f3a752b538dc42c777a84acdec944793b54e6aa0fef7183032aed79041f
 DIST thunderbird-17.0.5esr-ast.xpi 388038 SHA256 7afb6f84579dfa49e2b0059358c8e6aebc7b5783950ba47fc3426ff55e16d937 SHA512 eefa2d7aef3fa23cee741555bf7c6504049fb51568c8e44dbc88dcd4f62064e756376dba0fa63e3a812a5f7e313c34c66522f0517d9f06902f815c4fa0f377f3 WHIRLPOOL 6f59a451a467dd6c32d1d8cb872bcd650f6b5eb3a7f3cac06e8447261d23a25fc9362985696eba5860cd1389935462217cc7f4da63f22fd67ead1517c24e4a0b
@@ -118,23 +119,18 @@ DIST thunderbird-17.0.6esr-zh-CN.xpi 436083 SHA256 ab7bb32363d8681d961f5affa4107
 DIST thunderbird-17.0.6esr-zh-TW.xpi 437591 SHA256 4c11cdaf70f57ec3e09fdd68476bcb73aa0a7eb2c3519e8c4bb14397cba94011 SHA512 03211b5252b24b9552a7d45d312d54217759c6e7092799bb2cb8f40b6bbadeff8d804a8d3c371b8ec5b0d6ec537bff5b5123fd154b0f31cb5af76ef87aa82dac WHIRLPOOL a615fd6bffc22cb8784bc86b670b195768acc4ed9d6e45f42fec1714798e88eee5bfb6347f1f5d0355fa5d156a848c54574dc9961b28933acc0e67b7cef501bc
 DIST thunderbird-17.0.6esr.source.tar.bz2 113885201 SHA256 ddae9e083f14e248d1b552c93d8aecf7989795a494f7b45492bbceb0b8c495e7 SHA512 df41ff680d4f99193555a45bb02395020d76600d7c2bcae8a85b7c69e2d71bd8169dfcca975cae52de77f8eb37a13a667393b1532ad43e9555e9bc70cb4f6f89 WHIRLPOOL e96fef6f49e1a436372acec4be8d9487c1d0942336b96a289333975b8877888c27be5ce0f45b00651fe18d1c73258c43ffcba928afc18789457e3549802bfccd
 EBUILD thunderbird-17.0.5.ebuild 10647 SHA256 279a8fb0b9695ec710f71059410bff8e9b417ec57ceef45c90e3d2df37854432 SHA512 a3d87d1092914d086d7938672c242bbf6e80fa15c45ff56b6a10e27a893b1bee09f286af265de92a3fe3dcefcb5026ca1409681fc9030a309e0d37102bc4efc8 WHIRLPOOL e874301e8729514fd803555393646352f1f92e6e6dce4099efc1e2f76c2bc0791eb32b37a06da084aba6e7dc16ceceb8a3686c3a7f70dbef3898749ba671880c
+EBUILD thunderbird-17.0.6-r1.ebuild 10952 SHA256 6e4781c7a2e13e26402885a9a3f417c8546e3b5ca0ad222d09e3add32fc4064d SHA512 d50d40af1cc2f240304a8a24612ff234a09e17160e165c26087b1097a3551d992db51158514dc7189f4189d378f7c5577acc81e86223b1b30ec12c8b03f41ea4 WHIRLPOOL 64ffbb39b039df8529d82b6fdf18a4d42c08d5129c179ec0706bf12d47c0a706406f58e52f7090122b93ac8f6a6e9ddb73d86cbce756254e85ea145db51638ec
 EBUILD thunderbird-17.0.6.ebuild 10638 SHA256 88d0b9c255f56e03ac49660f75e2eed3b62e259f25c3f439f5159b2b7e71a7bb SHA512 ecaa00bf0ce48a6a6eb501815abacf562636e9f9a51bc0c6308bb5055eeb473b528435cd13bb12469ce0b1aca65dc1dbe8dd31dd9bd454b22854fb44424f7f6b WHIRLPOOL 272784e1d515ca815d7c77087e88a0e2ce41ca90cac4d4fd199093cea3954938745e5a823e7c124ef28f48b3ce13a544b17116ec6f7f2749e91a674612740761
-MISC ChangeLog 84473 SHA256 5f870ce8a3e796b0398d52bf831e500957c4eaf47bbeea1a30642f0a825ace43 SHA512 873396c1ff630b65c213370e0b6f2b33d96f833c51bc1403db3d2ac78ce146869db2bcf877941fc4c010ded71e9914f9127d1dc67a275d8d92d9999ab267fe89 WHIRLPOOL 7286d8021ef7b76e089a16a3c737fcdfb38a0cd5c9315a4e2abc58c8385c9cbbcb6f651c3885085cde02e63239aed5c907d594977f46726c1779bbb2f1e947b3
+MISC ChangeLog 84658 SHA256 57593b8b5112baa4eed41aa653d2984a8ee6ee31d0419f56d16903ec89f6b15a SHA512 d0f5df8bc01987420065871ad58c9f1265ef1e729b8df1be57c784dce16e677534ecaa26863511f69fc3a896838f376a103b47b428526f4a1edda41ab15e4867 WHIRLPOOL 3bc5dca35574851fa55d7c5bac1e59fb2c9fc6388ef950b47ee13a7fde6a29deaf6618928342242493715bba5bf15e923cd20176a32fe563dd9a3ef3aff2136c
 MISC metadata.xml 951 SHA256 391bc08ac3ec5dc4218da6f2f821eb38d0c87080ddb4c095d66a8ce9541ed360 SHA512 b77eaade2754cec1d4042cee06a7475accb824ddd5a5ad2c1fb33faba5796bc626800ed96930618eafe301cd500839fd0f32d6a7d4e1a95aa818dcc73928ccc9 WHIRLPOOL bde63af9b38c3b2edb23542eed62d242f7db81f493b56bc7abeffb5cf4c2211e089b4dbd70283cb559777844febc220f0bd0edfa577820acc8ca1e800c3ae83b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRoSLVAAoJELp701BxlEWf+p0P/1vC95V9a/VKGTrIvDBllsRt
-K5LatdxAA1Fv8pk+/Vr8g7Z5wnW/rtg+eI9gOQrXWYF4BviuXG8sdFla5duQBEzM
-3ra+KLfVAKrIMtZFng+5yinE6jTOTkhj5GKHJvuHtLGo7v3NqgEcr7AhfFJNIoxw
-giYusLcZ+Arn5jntCnRT+4soR3hvF1D/ZHMA04hxGUSdDnnJeqQ0IeVXAq/eLutf
-rksgjFY1mACD//1Nq/3FKrm2IeqKyU02XG631aylVu2dL6CAl4dW013peWgxf3Hd
-W0NVmNuBF0hvYBmm2x4ARm1d/btlIAg5IMJMbB0nDsy/xi1+yBKeTGOCDdwrYvE2
-XJ+SG45pUgXnU+TLwkH1SSpaiIyalsPVgohsGLKy/IcjswV3f91YwkFzErjuyB8I
-tWTZk4myRo0/dYs+G/R/cRJYsNsSmSW0F29LTjXyaJYC1F/ucCODSB3u4iz5dsm4
-/X3FvHuVReG1Dk1B8CGNsx5Y2v7Jx9OWU4PYNTX+jG5gWiOMaE2UU0X2wTrqZGqd
-Z6FYahXqiUWb0emmsFF/DvBzNh2lHpGWH20kKnvz80KwoJ4gc9Pksj7hP97HWFCq
-R5TSGYOcYklOES+rHP7okgmkdYlU0h8+AUvTWaW49nZiyNCjnLHvaD0GdwN8vj3x
-e+++Y8St/AE/ECxDRhYi
-=fGRY
+iQEcBAEBCAAGBQJRtVAiAAoJEKDMw7q00Ii0PsIH/239LIp9V6e3e4MibYl7v4ls
+oy8umN6FU65RgkIvYNk898MhBOYpSQIlqCwqUQzayoCKk+bwFQfmmCil/2jAmrFg
+z0b1XXTRoTC90sfRaAuJ2HfXronL5P/5f6/Wzbh6G6XytgDcRr3FzsKnJVKKMp9n
+7SPKlEykgZysExZlwCZQHhB0l31VyR8R+hjFWq/sUcUoq5cwXAeVGWwyx4wsuKYu
+DyTBHqFSV1MD+GuP9RtaQf4GKD5OhNDLrRa9dQhMO38Kr+6lJm9tV43lYQ+CIw9H
+q1q9UWkmTQJlcj3TScR+waU2Rq7VUmr+iC3EGNGDytet+ZnZcadpx47/wTKnDR4=
+=nuKn
 -----END PGP SIGNATURE-----
diff --git a/mail-client/thunderbird/thunderbird-17.0.6-r1.ebuild b/mail-client/thunderbird/thunderbird-17.0.6-r1.ebuild
new file mode 100644
index 000000000000..5ff33a46af2f
--- /dev/null
+++ b/mail-client/thunderbird/thunderbird-17.0.6-r1.ebuild
@@ -0,0 +1,348 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-17.0.6-r1.ebuild,v 1.1 2013/06/10 04:03:50 anarchy Exp $
+
+EAPI="3"
+WANT_AUTOCONF="2.1"
+MOZ_ESR="1"
+
+# This list can be updated using scripts/get_langs.sh from the mozilla overlay
+MOZ_LANGS=(ar ast be bg bn-BD br ca cs da de el en en-GB en-US es-AR
+es-ES et eu fi fr fy-NL ga-IE gd gl he hr hu hy-AM id is it ja ko lt nb-NO
+nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi
+zh-CN zh-TW )
+
+# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
+MOZ_PV="${PV/_beta/b}"
+# ESR releases have slightly version numbers
+if [[ ${MOZ_ESR} == 1 ]]; then
+	MOZ_PV="${MOZ_PV}esr"
+fi
+MOZ_P="${PN}-${MOZ_PV}"
+
+# Enigmail version
+EMVER="1.5.1"
+# Upstream ftp release URI that's used by mozlinguas.eclass
+# We don't use the http mirror because it deletes old tarballs.
+MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/"
+MOZ_HTTP_URI="http://ftp.mozilla.org/pub/${PN}/releases/"
+
+inherit flag-o-matic toolchain-funcs mozconfig-3 makeedit multilib autotools pax-utils check-reqs nsplugins mozlinguas
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="bindist gconf +crypt +jit +ipc ldap +lightning +minimal mozdom selinux"
+
+PATCH="thunderbird-17.0-patches-01"
+PATCHFF="firefox-17.0-patches-0.6"
+
+SRC_URI="${SRC_URI}
+	${MOZ_FTP_URI}${MOZ_PV}/source/${MOZ_P}.source.tar.bz2
+	${MOZ_HTTP_URI}${MOZ_PV}/source/${MOZ_P}.source.tar.bz2
+	crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-${EMVER}.tar.gz )
+	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz
+	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCHFF}.tar.xz
+	http://dev.gentoo.org/~nirbheek/mozilla/patchsets/${PATCHFF}.tar.xz
+	http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz"
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+RDEPEND=">=sys-devel/binutils-2.16.1
+	>=dev-libs/nss-3.14.1
+	>=dev-libs/nspr-4.9.4
+	>=dev-libs/glib-2.26
+	gconf? ( >=gnome-base/gconf-1.2.1:2 )
+	>=media-libs/libpng-1.5.11[apng]
+	>=x11-libs/cairo-1.10
+	>=x11-libs/pango-1.14.0
+	>=x11-libs/gtk+-2.14
+	kernel_linux? ( media-libs/alsa-lib )
+	>=media-libs/libvpx-1.0.0
+	virtual/libffi
+	!x11-plugins/enigmail
+	system-sqlite? ( || (
+		>=dev-db/sqlite-3.7.16:3[secure-delete,debug=]
+		=dev-db/sqlite-3.7.15*[fts3,secure-delete,threadsafe,unlock-notify,debug=]
+		=dev-db/sqlite-3.7.14*[fts3,secure-delete,threadsafe,unlock-notify,debug=]
+		=dev-db/sqlite-3.7.13*[fts3,secure-delete,threadsafe,unlock-notify,debug=]
+	) )
+	selinux? ( sec-policy/selinux-thunderbird )
+	crypt?  ( || (
+		( >=app-crypt/gnupg-2.0
+			|| (
+				app-crypt/pinentry[gtk]
+				app-crypt/pinentry[qt4]
+			)
+		)
+		=app-crypt/gnupg-1.4*
+	) )"
+
+DEPEND="${RDEPEND}
+	!elibc_glibc? ( dev-libs/libexecinfo )
+	virtual/pkgconfig
+	amd64? ( ${ASM_DEPEND}
+		virtual/opengl )
+	x86? ( ${ASM_DEPEND}
+		virtual/opengl )"
+
+if [[ ${PV} =~ beta ]]; then
+	S="${WORKDIR}/comm-beta"
+elif [[ ${MOZ_ESR} == 1 ]]; then
+	S="${WORKDIR}/comm-esr${PV%%.*}"
+else
+	S="${WORKDIR}/comm-release"
+fi
+
+pkg_setup() {
+	moz_pkgsetup
+
+	export MOZILLA_DIR="${S}/mozilla"
+
+	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"
+		elog
+	fi
+
+	# Ensure we have enough disk space to compile
+	CHECKREQS_DISK_BUILD="4G"
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+}
+
+src_prepare() {
+	# Apply our Thunderbird patchset
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}/thunderbird"
+
+	# Apply our patchset from firefox to thunderbird as well
+	pushd "${S}"/mozilla &>/dev/null || die
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}/firefox"
+	popd &>/dev/null || die
+
+	if use crypt ; then
+		mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
+		cd "${S}"
+	fi
+
+	# Disable gnomevfs extension
+	sed -i -e "s:gnomevfs::" "${S}/"mozilla/browser/confvars.sh \
+		-e "s:gnomevfs::" "${S}/"mozilla/xulrunner/confvars.sh \
+		|| die "Failed to remove gnomevfs extension"
+
+	#Fix compilation with curl-7.21.7 bug 376027
+	sed -e '/#include <curl\/types.h>/d'  \
+		-i "${S}"/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc \
+		-i "${S}"/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc \
+		-i "${S}"/mozilla/config/system-headers \
+		-i "${S}"/mozilla/js/src/config/system-headers || die "Sed failed"
+
+	# Don't error out when there's no files to be removed:
+	sed 's@\(xargs rm\)$@\1 -f@' \
+		-i "${S}"/mozilla/toolkit/mozapps/installer/packager.mk || die
+
+	# Shell scripts sometimes contain DOS line endings; bug 391889
+	grep -rlZ --include="*.sh" $'\r$' . |
+	while read -r -d $'\0' file ; do
+		einfo edos2unix "${file}"
+		edos2unix "${file}"
+	done
+
+	# Allow user to apply any additional patches without modifing ebuild
+	epatch_user
+
+	eautoreconf
+	# Ensure we run eautoreconf in mozilla to regenerate configure
+	cd "${S}"/mozilla
+	eautoconf
+}
+
+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"
+
+	# We must force enable jemalloc 3 threw .mozconfig
+	echo "export MOZ_JEMALLOC=1" >> ${S}/.mozconfig
+
+	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
+	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+	mozconfig_annotate '' --with-default-mozilla-five-home="${EPREFIX}${MOZILLA_FIVE_HOME}"
+	mozconfig_annotate '' --with-user-appdir=.thunderbird
+	mozconfig_annotate '' --with-system-png
+	mozconfig_annotate '' --enable-system-ffi
+	mozconfig_annotate '' --target="${CTARGET:-${CHOST}}"
+	mozconfig_annotate '' --build="${CTARGET:-${CHOST}}"
+
+	# Use enable features
+	mozconfig_use_enable lightning calendar
+	mozconfig_use_enable gconf
+	mozconfig_use_enable ldap
+	# Features know to cause problems with hardened.
+	mozconfig_use_enable jit methodjit
+	mozconfig_use_enable jit tracejit
+
+	# Bug #72667
+	if use mozdom; then
+		MEXTENSIONS="${MEXTENSIONS},inspector"
+	fi
+
+	# Use an objdir to keep things organized.
+	echo "mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/tbird" >> "${S}"/.mozconfig
+
+	# 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
+	elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]]; then
+		if use amd64 || use x86; then
+			append-flags -mno-avx
+		fi
+	fi
+}
+
+src_compile() {
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
+	emake -f client.mk || die
+
+	# Only build enigmail extension if crypt enabled.
+	if use crypt ; then
+		cd "${S}"/mailnews/extensions/enigmail || die
+		./makemake -r 2&> /dev/null
+		cd "${S}"/tbird/mailnews/extensions/enigmail
+		emake || die "make enigmail failed"
+		emake xpi || die "make enigmail xpi failed"
+	fi
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	declare emid
+	local obj_dir="tbird"
+	cd "${S}/${obj_dir}"
+
+	# Copy our preference before omnijar is created.
+	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js-1 \
+		"${S}/${obj_dir}/mozilla/dist/bin/defaults/pref/all-gentoo.js" || die
+
+	# Set default path to search for dictionaries.
+	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
+		>> "${S}/${obj_dir}/mozilla/dist/bin/defaults/pref/all-gentoo.js" || die
+
+	# Without methodjit and tracejit there's no conflict with PaX
+	if use jit; then
+		# Pax mark xpcshell for hardened support, only used for startupcache creation.
+		pax-mark m "${S}"/${obj_dir}/mozilla/dist/bin/xpcshell
+	fi
+
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	# Install language packs
+	mozlinguas_src_install
+
+	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/aurora/content/icon48.png thunderbird-icon-unbranded.png
+		newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
+			${PN}.desktop
+
+		sed -i -e "s:Mozilla\ Thunderbird:EarlyBird:g" \
+			"${ED}"/usr/share/applications/${PN}.desktop
+	fi
+
+	if use crypt ; then
+		cd "${T}" || die
+		unzip "${S}"/${obj_dir}/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}"/${obj_dir}/mozilla/dist/bin/enigmail*.xpi || die
+	fi
+
+	if use lightning ; then
+		emid="{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}"
+		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
+		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
+		unzip "${S}"/${obj_dir}/mozilla/dist/xpi-stage/gdata-provider.xpi
+
+		emid="calendar-timezones@mozilla.org"
+		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
+		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
+		unzip "${S}"/${obj_dir}/mozilla/dist/xpi-stage/calendar-timezones.xpi
+
+		emid="{e2fda1a4-762b-4020-b5ad-a41df1933103}"
+		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
+		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
+		unzip "${S}"/${obj_dir}/mozilla/dist/xpi-stage/lightning.xpi
+
+		# Fix mimetype so it shows up as a calendar application in GNOME 3
+		# This requires that the .desktop file was already installed earlier
+		sed -e "s:^\(MimeType=\):\1text/calendar;:" \
+			-e "s:^\(Categories=\):\1Calendar;:" \
+			-i "${ED}"/usr/share/applications/${PN}.desktop
+	fi
+
+	if use jit ; then
+		pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/{thunderbird-bin,thunderbird}
+	fi
+
+	# Plugin-container needs to be pax-marked for hardened to ensure plugins such as flash
+	# continue to work as expected.
+	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container
+
+	# Plugins dir
+	share_plugins_dir
+
+	if use minimal; then
+		rm -rf "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk} || \
+			die "Failed to remove sdk and headers"
+	fi
+}
+
+pkg_postinst() {
+	elog
+	elog "If you are experience problems with plugins please issue the"
+	elog "following command : rm \${HOME}/.thunderbird/*/extensions.sqlite ,"
+	elog "then restart thunderbird"
+}