Version bump wrt security #180436

(Portage version: 2.1.3_rc1)

3 files changed, 370 insertions, 1 deletions

diff --git a/mail-client/mozilla-thunderbird/ChangeLog b/mail-client/mozilla-thunderbird/ChangeLog
index 5ae59396bc0f..f896f1465cd2 100644
--- a/mail-client/mozilla-thunderbird/ChangeLog
+++ b/mail-client/mozilla-thunderbird/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/mozilla-thunderbird
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.204 2007/06/13 13:13:46 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.205 2007/06/15 11:33:53 armin76 Exp $
+
+*mozilla-thunderbird-2.0.0.4 (15 Jun 2007)
+
+  15 Jun 2007; Raúl Porcel <armin76@gentoo.org>
+  +mozilla-thunderbird-2.0.0.4.ebuild:
+  Version bump wrt security #180436
 
   13 Jun 2007; Raúl Porcel <armin76@gentoo.org>
   mozilla-thunderbird-2.0.0.0.ebuild:
diff --git a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-2.0.0.4 b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-2.0.0.4
new file mode 100644
index 000000000000..a6e512fdb1fd
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-2.0.0.4
@@ -0,0 +1,105 @@
+MD5 827e701e5db1a655f48eb3ea23252435 mozilla-thunderbird-2.0.0.4-be.xpi 184807
+RMD160 e430d21756edb84adba7c0f08331029faef4b52e mozilla-thunderbird-2.0.0.4-be.xpi 184807
+SHA256 d32201b2413efad26dc67fc2003d91c070f2dd727016c61c470e28a044781bac mozilla-thunderbird-2.0.0.4-be.xpi 184807
+MD5 502fa620d7f1732fb5fdb45bed7a9d9f mozilla-thunderbird-2.0.0.4-bg.xpi 196591
+RMD160 bb395b3146a3bf3e37f84378e29730f0b1d3dcb6 mozilla-thunderbird-2.0.0.4-bg.xpi 196591
+SHA256 1a15d44bb5676c46855023306d972477e62ec10909692c3e9fc63f18da2beab9 mozilla-thunderbird-2.0.0.4-bg.xpi 196591
+MD5 6fbcb7f16d28ff3df60cf611592a4748 mozilla-thunderbird-2.0.0.4-ca.xpi 184223
+RMD160 d7e3682459234cd4d8ffbd4b12beb90fb29669c4 mozilla-thunderbird-2.0.0.4-ca.xpi 184223
+SHA256 dc00b5776880b30fb78b2986a50a3a949a6924ae5bfc20bf47819348fd405fc9 mozilla-thunderbird-2.0.0.4-ca.xpi 184223
+MD5 90982f0c99525460d66dce6629a3cc51 mozilla-thunderbird-2.0.0.4-cs.xpi 186152
+RMD160 2d0178926a0cf7b1d3534e0abdb960ee39415221 mozilla-thunderbird-2.0.0.4-cs.xpi 186152
+SHA256 fe1d532d61be3ebc7ef52284fcde49c657de144a1b634add5d0c22ce372a520b mozilla-thunderbird-2.0.0.4-cs.xpi 186152
+MD5 41824d0d3dd90f9de32098ed8c0cc5c0 mozilla-thunderbird-2.0.0.4-da.xpi 179124
+RMD160 e5a106e855e0cc82459e43aa67bb91639d621d73 mozilla-thunderbird-2.0.0.4-da.xpi 179124
+SHA256 6d5dca0e3700774c0a82da62d1bc73e3649cfd3c9a59387676d97a34a3b424c2 mozilla-thunderbird-2.0.0.4-da.xpi 179124
+MD5 fb52770502d9cf9a006dc00320ae86a7 mozilla-thunderbird-2.0.0.4-de.xpi 159054
+RMD160 e30ce98c60c89ff4b48141fc2ef83c6f48aae11a mozilla-thunderbird-2.0.0.4-de.xpi 159054
+SHA256 ba5ec6b5d9c712eb4ddc2a9ead6b2f6b61109a37617eed2fb816d8e9b9f24ddb mozilla-thunderbird-2.0.0.4-de.xpi 159054
+MD5 76e09a9584d8729f180d83745982be6c mozilla-thunderbird-2.0.0.4-el.xpi 183062
+RMD160 1fb0803ca38e5803508fb75875bd85f9b729ffee mozilla-thunderbird-2.0.0.4-el.xpi 183062
+SHA256 3a83f2f913d0dca2ba52a52c8658f42a971ecc7e07c3830344c88e5e786aad9f mozilla-thunderbird-2.0.0.4-el.xpi 183062
+MD5 16fbacc27c89befdcb1e858281858733 mozilla-thunderbird-2.0.0.4-en-GB.xpi 173042
+RMD160 514c7bdf8fad0183bf7ecae84a14b62f25bd8125 mozilla-thunderbird-2.0.0.4-en-GB.xpi 173042
+SHA256 9ea20271bcfe6b5fb731b30d37631b0446c277c7e251c91985d7e2390e4f2f8d mozilla-thunderbird-2.0.0.4-en-GB.xpi 173042
+MD5 ef02921844ceb3b800d3c43f0374042f mozilla-thunderbird-2.0.0.4-es-AR.xpi 184674
+RMD160 25b50f1d21a925bb7485103aecf61abb0feb5527 mozilla-thunderbird-2.0.0.4-es-AR.xpi 184674
+SHA256 f8d7e8b706f8e910d7a0d5596d93b6a4d84381bb515191d6af96766a231f4f73 mozilla-thunderbird-2.0.0.4-es-AR.xpi 184674
+MD5 5872d0aa97f7d4665b86d63971723e6e mozilla-thunderbird-2.0.0.4-es-ES.xpi 149558
+RMD160 08dd0fcbbf9785650539b5f3551bd9ca51b07613 mozilla-thunderbird-2.0.0.4-es-ES.xpi 149558
+SHA256 93944690d6734f4c620dcee7121c180b5364546aa500ebe546eaec7c72d271a2 mozilla-thunderbird-2.0.0.4-es-ES.xpi 149558
+MD5 eed07f8a15bbfb4318d032593fd18e69 mozilla-thunderbird-2.0.0.4-eu.xpi 181784
+RMD160 4d075de5e1f1d9fb91d957b131d6bddb6f17e95e mozilla-thunderbird-2.0.0.4-eu.xpi 181784
+SHA256 4413b17fb47869049efad06b93411e3e8a3d6bbfe2999aff72b1ebaf55610660 mozilla-thunderbird-2.0.0.4-eu.xpi 181784
+MD5 abf78b586c74131364cbc7754e7e977b mozilla-thunderbird-2.0.0.4-fi.xpi 187725
+RMD160 e8f1d5db892caa114dbfec3c6dbcf6ac2fc49b3e mozilla-thunderbird-2.0.0.4-fi.xpi 187725
+SHA256 860a52e82d079e7edabb9ca5c36ccf803b055e3c1f0f4e34e5e17b88d6143fdb mozilla-thunderbird-2.0.0.4-fi.xpi 187725
+MD5 581a40f0df61a0baab2d9f03b4681a2d mozilla-thunderbird-2.0.0.4-fr.xpi 191234
+RMD160 27ef9670b612c217e5970ce3dd399fbebf33107e mozilla-thunderbird-2.0.0.4-fr.xpi 191234
+SHA256 a2916170adef6af90d6272c017f0c5685c1afb29506960392410d39fcadd5a42 mozilla-thunderbird-2.0.0.4-fr.xpi 191234
+MD5 5282a607f7262bf11710593efe1d17ab mozilla-thunderbird-2.0.0.4-ga-IE.xpi 185955
+RMD160 9713cc262a13a9910edfae5058b873963fb82906 mozilla-thunderbird-2.0.0.4-ga-IE.xpi 185955
+SHA256 f0811287770cdc2f8774cded73614a58f7badee32c47679e5c76dc181a431b19 mozilla-thunderbird-2.0.0.4-ga-IE.xpi 185955
+MD5 c0ace8783daa1aa329dee85cab9552c9 mozilla-thunderbird-2.0.0.4-hu.xpi 191687
+RMD160 aa76327f08a5dabaecc1d726f24806f157340b47 mozilla-thunderbird-2.0.0.4-hu.xpi 191687
+SHA256 d97c423a6857d6701945fa5fc93ba10f7206faa180a8d0c2a8164fd249d1fc4b mozilla-thunderbird-2.0.0.4-hu.xpi 191687
+MD5 8b003a26d305592fae53cf542bc95023 mozilla-thunderbird-2.0.0.4-it.xpi 152554
+RMD160 06f5047ce47ffa1fa0ab555bbce4eb1d091b3899 mozilla-thunderbird-2.0.0.4-it.xpi 152554
+SHA256 071cbb16b69bf499bc8c860a1d323a820158af240fc53bf9b986c87a582e03a0 mozilla-thunderbird-2.0.0.4-it.xpi 152554
+MD5 d878a9afd6e436983c60c0c79713b174 mozilla-thunderbird-2.0.0.4-ja.xpi 199401
+RMD160 ab3eb73875ea9d2329e1baa31ab05b7b8f58f4bf mozilla-thunderbird-2.0.0.4-ja.xpi 199401
+SHA256 07e4e84be70bccb4e57b30c241c6b42479cf03a99ae06936e5505a018ce3115b mozilla-thunderbird-2.0.0.4-ja.xpi 199401
+MD5 c95b32bc5ba45593acd139cd4de6dd5f mozilla-thunderbird-2.0.0.4-lt.xpi 189445
+RMD160 c567ca6ba28ea1bcfe44183799e308e053b18ef1 mozilla-thunderbird-2.0.0.4-lt.xpi 189445
+SHA256 27f50d1d4ac1905d6659c6c237aba463466aab33e67a5927a8b628e7b983af6b mozilla-thunderbird-2.0.0.4-lt.xpi 189445
+MD5 6742d424dca483557c0d4db105237a11 mozilla-thunderbird-2.0.0.4-mk.xpi 196597
+RMD160 5a838d6b9694a2d93a55c24f5d21412dbed911c3 mozilla-thunderbird-2.0.0.4-mk.xpi 196597
+SHA256 9f34de7816b5358627d3ef6ffdf97e6ef7821a546b7c1dc5b51897c1ac0b0984 mozilla-thunderbird-2.0.0.4-mk.xpi 196597
+MD5 5dcf7ae70448bd8e4cbdd1028af4e877 mozilla-thunderbird-2.0.0.4-nb-NO.xpi 183234
+RMD160 b8d84abd5d2f4c7e3c52db484945829ac24121df mozilla-thunderbird-2.0.0.4-nb-NO.xpi 183234
+SHA256 1b9827db9921c51eb5757f118a17a41dc5d3eb7f18a822520753a2fc481fbfbc mozilla-thunderbird-2.0.0.4-nb-NO.xpi 183234
+MD5 f7b0436b7603dcc0e0fd27d7784e3aed mozilla-thunderbird-2.0.0.4-nl.xpi 184156
+RMD160 c01d1ed5c5697bbf47cd089f08965f99cff0ba4b mozilla-thunderbird-2.0.0.4-nl.xpi 184156
+SHA256 1d746a8a7c0f9b1e480d38840e51fd74e708773ec0ffcc4436900ed82e01b837 mozilla-thunderbird-2.0.0.4-nl.xpi 184156
+MD5 e20f76ffaad1b24680926a76b83feb0b mozilla-thunderbird-2.0.0.4-nn-NO.xpi 184110
+RMD160 9980cea2ceeada90628d074fd07bfae2c8141a49 mozilla-thunderbird-2.0.0.4-nn-NO.xpi 184110
+SHA256 0d83ec785da1d505c846f93d71efdc90a33d0e391621a3763e6ccc3ede431131 mozilla-thunderbird-2.0.0.4-nn-NO.xpi 184110
+MD5 1ccea4aca0eda45181e215bc76db0e11 mozilla-thunderbird-2.0.0.4-pa-IN.xpi 205012
+RMD160 9e3339660d9764458eb39d008928ba1e07455e11 mozilla-thunderbird-2.0.0.4-pa-IN.xpi 205012
+SHA256 6179beca29ef35f89159f3eb7bf131324a3551ffa330b2c745ac565ae6c111e0 mozilla-thunderbird-2.0.0.4-pa-IN.xpi 205012
+MD5 8270991e3d7f83aa1e33af64cca9d714 mozilla-thunderbird-2.0.0.4-patches-0.1.tar.bz2 28506
+RMD160 3af7b07b20243edb4465e9e482ed83d7ad75c413 mozilla-thunderbird-2.0.0.4-patches-0.1.tar.bz2 28506
+SHA256 2cf91839e8b609034cb0e843d0b87b2e3d1e8aa3db2ff636153a9120393a4272 mozilla-thunderbird-2.0.0.4-patches-0.1.tar.bz2 28506
+MD5 269832cb82e9aa9a748f63cd212c0b46 mozilla-thunderbird-2.0.0.4-pl.xpi 177385
+RMD160 944b992491ed823e5b7e96686301137c09432f8e mozilla-thunderbird-2.0.0.4-pl.xpi 177385
+SHA256 924f888bbf7298d51d0accea1ef345098577de01309fd2b719c19545a5d0104b mozilla-thunderbird-2.0.0.4-pl.xpi 177385
+MD5 6efba1be57129692d05c07b083bbe8c0 mozilla-thunderbird-2.0.0.4-pt-BR.xpi 183058
+RMD160 5c97c13167f3673d2e3b73034b26ea3abcbabc6f mozilla-thunderbird-2.0.0.4-pt-BR.xpi 183058
+SHA256 dd3dccdee3c26506305dd7cef768acca46b13cfbea50f6ae52f898969617282a mozilla-thunderbird-2.0.0.4-pt-BR.xpi 183058
+MD5 1aa61101599766e19132997f053026e8 mozilla-thunderbird-2.0.0.4-pt-PT.xpi 183919
+RMD160 88994856f6d086597c44b3dcd84f98b21913a934 mozilla-thunderbird-2.0.0.4-pt-PT.xpi 183919
+SHA256 588c4ff8f97a0c57656ef38a3eae00cb3f6b9cae4e11f321038917166b513532 mozilla-thunderbird-2.0.0.4-pt-PT.xpi 183919
+MD5 f99abf9ed0b0eefd83d6b93c37e5c717 mozilla-thunderbird-2.0.0.4-ru.xpi 173834
+RMD160 7f06875f052538493f9951150f4b0329349752ff mozilla-thunderbird-2.0.0.4-ru.xpi 173834
+SHA256 fb35da7401497963e223ffa47e35915eadccaa763c2ebd7a4f450b9bfa628c8c mozilla-thunderbird-2.0.0.4-ru.xpi 173834
+MD5 2fb46cc40e4d6ca0e4c6c99ca54e89a3 mozilla-thunderbird-2.0.0.4-sk.xpi 191717
+RMD160 c79e29559fde5a648ef3d5a9e756703fa14f709e mozilla-thunderbird-2.0.0.4-sk.xpi 191717
+SHA256 c9e7ccb906e9d410d7c7993fb047e6484aea151625af630926687f9300b2afdd mozilla-thunderbird-2.0.0.4-sk.xpi 191717
+MD5 80c59413f6b664b63ee7bc12981c2637 mozilla-thunderbird-2.0.0.4-sl.xpi 188015
+RMD160 c88db4997c5cd97c276c176496b305e8eea50444 mozilla-thunderbird-2.0.0.4-sl.xpi 188015
+SHA256 8e8113c7e4156f1b2ca43f997a57ccbd44646e83fdadb471ed4d9722bc621277 mozilla-thunderbird-2.0.0.4-sl.xpi 188015
+MD5 2f283be837c936e0915ef7084a88cef9 mozilla-thunderbird-2.0.0.4-sv-SE.xpi 191919
+RMD160 729ea5ac041dfed13e7a2b176d0cd7f51fe80c2d mozilla-thunderbird-2.0.0.4-sv-SE.xpi 191919
+SHA256 8e325810bf6367f85f4fff4d3bd3a5ab36a813f6311cc2631dc79689415cbc56 mozilla-thunderbird-2.0.0.4-sv-SE.xpi 191919
+MD5 d3b3d9c3fc336d2c63f0ea0092ce6240 mozilla-thunderbird-2.0.0.4-tr.xpi 157692
+RMD160 fcb1e2b7d382e83b828f0f89047fcc950eeeed6c mozilla-thunderbird-2.0.0.4-tr.xpi 157692
+SHA256 634ae9997beab810c09efb73f8401fa2bb66c5654894a29353952fc063be941e mozilla-thunderbird-2.0.0.4-tr.xpi 157692
+MD5 a840e1fb7e378cf01827f7ded8137bf9 mozilla-thunderbird-2.0.0.4-zh-CN.xpi 147617
+RMD160 d68f4a3017d7fa4f850c0e5dfdbb7965e91f392f mozilla-thunderbird-2.0.0.4-zh-CN.xpi 147617
+SHA256 d3587cc376da64e3c253dfafb85da907b409124f90527b5a8ec2dd4e9d83935b mozilla-thunderbird-2.0.0.4-zh-CN.xpi 147617
+MD5 64d058faaad7a98a1d63fef56d6e8614 mozilla-thunderbird-2.0.0.4-zh-TW.xpi 153696
+RMD160 7780845c451975138b18639e8357aed05f998b0b mozilla-thunderbird-2.0.0.4-zh-TW.xpi 153696
+SHA256 3d2739415ad0fd3c2753bcf0c7a9c36e7e96d03e41f058850fa4843fc29c4279 mozilla-thunderbird-2.0.0.4-zh-TW.xpi 153696
+MD5 26cdf3e2c8d95421345af8e88ebc9aff thunderbird-2.0.0.4-source.tar.bz2 37391875
+RMD160 ab9d3a0a76bfc69248c4398a4482334fdb08b98f thunderbird-2.0.0.4-source.tar.bz2 37391875
+SHA256 62cf3b9238184a9756323676b763b6c0fe312dbbfc4042e64930af0e46710a7a thunderbird-2.0.0.4-source.tar.bz2 37391875
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0.0.4.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0.0.4.ebuild
new file mode 100644
index 000000000000..73ad38f1dddc
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0.0.4.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0.0.4.ebuild,v 1.1 2007/06/15 11:33:53 armin76 Exp $
+
+WANT_AUTOCONF="2.1"
+
+inherit flag-o-matic toolchain-funcs eutils mozconfig-2 mozilla-launcher makeedit multilib mozextension autotools
+
+LANGS="be bg ca cs da de el en-GB es-AR es-ES eu fi fr ga-IE hu it ja lt mk nb-NO nl nn-NO pa-IN pl pt-BR pt-PT ru sk sl sv-SE tr zh-CN zh-TW"
+NOSHORTLANGS="en-GB es-AR pt-BR zh-TW"
+PATCH="${P}-patches-0.1"
+MY_PV=${PV/_/}
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="http://www.mozilla.org/projects/thunderbird/"
+
+MOZ_URI="http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${MY_PV}"
+SRC_URI="${MOZ_URI}/source/thunderbird-${MY_PV}-source.tar.bz2
+	mirror://gentoo/${PATCH}.tar.bz2"
+
+KEYWORDS="~alpha ~amd64 ~ia64 -mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+SLOT="0"
+LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
+IUSE="ldap crypt bindist mozdom replytolist"
+
+# These are in
+#
+#  http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${MY_PV}/linux-i686/xpi/
+#
+# for i in $LANGS $SHORTLANGS; do wget $i.xpi -O ${P}-$i.xpi; done
+
+for X in ${LANGS} ; do
+	SRC_URI="${SRC_URI}
+		linguas_${X/-/_}? ( http://dev.gentooexperimental.org/~armin76/dist/${P}-xpi/${P}-${X}.xpi )"
+	IUSE="${IUSE} linguas_${X/-/_}"
+	# english is handled internally
+	if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then
+		SRC_URI="${SRC_URI}
+			linguas_${X%%-*}? ( http://dev.gentooexperimental.org/~armin76/dist/${P}-xpi/${P}-${X}.xpi )"
+		IUSE="${IUSE} linguas_${X%%-*}"
+	fi
+done
+
+RDEPEND=">=www-client/mozilla-launcher-1.56
+	>=dev-libs/nss-3.11.5
+	>=dev-libs/nspr-4.6.5-r1"
+
+PDEPEND="crypt? ( >=x11-plugins/enigmail-0.95.0 )
+		replytolist? ( x11-plugins/replytolist )"
+
+S=${WORKDIR}/mozilla
+
+# Needed by src_compile() and src_install().
+# Would do in pkg_setup but that loses the export attribute, they
+# become pure shell variables.
+export BUILD_OFFICIAL=1
+export MOZILLA_OFFICIAL=1
+export MOZ_CO_PROJECT=mail
+
+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() {
+	use moznopango && warn_mozilla_launcher_stub
+}
+
+src_unpack() {
+	unpack ${A}
+
+	linguas
+	for X in ${linguas}; do
+		[[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi"
+	done
+	if [[ ${linguas} != "" ]]; then
+		elog "Selected language packs (first will be default): ${linguas}"
+	fi
+
+	# Apply our patches
+	cd "${S}" || die "cd failed"
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}"/patch
+
+	# Fix a compilation issue using the 32-bit userland with 64-bit kernel on
+	# PowerPC, because with that configuration, it detects a ppc64 system.
+	# -- hansmi, 2005-11-13
+	if use ppc && [[ "${PROFILE_ARCH}" == ppc64 ]]; then
+		sed -i -e "s#OS_TEST=\`uname -m\`\$#OS_TEST=${ARCH}#" \
+			${S}/configure
+		sed -i -e "s#OS_TEST :=.*uname -m.*\$#OS_TEST:=${ARCH}#" \
+			${S}/security/coreconf/arch.mk
+	fi
+
+	WANT_AUTOCONF="2.1" \
+		eautoreconf || die "failed running autoreconf"
+}
+
+src_compile() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	# tb-specific settings
+	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
+
+	# Bug #72667
+	if use mozdom; then
+		mozconfig_annotate '' --enable-extensions=default,inspector
+	else
+		mozconfig_annotate '' --enable-extensions=default
+	fi
+
+	if ! use bindist; then
+		mozconfig_annotate '' --enable-official-branding
+	fi
+
+	# Finalize and report settings
+	mozconfig_final
+
+	# hardened GCC uses -fstack-protector-all by default, which breaks us
+	gcc-specs-ssp && append-flags -fno-stack-protector-all
+	replace-flags -fstack-protector-all -fstack-protector
+
+	####################################
+	#
+	#  Configure and build
+	#
+	####################################
+	append-flags -freorder-blocks -fno-reorder-functions
+
+	CPPFLAGS="${CPPFLAGS}" \
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+	econf || die
+
+	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
+	# requirements while compiling
+	edit_makefiles
+
+	emake || die
+}
+
+pkg_preinst() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	echo ""
+	elog "Removing old installs though some really ugly code.  It potentially"
+	elog "eliminates any problems during the install, however suggestions to"
+	elog "replace this are highly welcome.  Send comments and suggestions to"
+	elog "mozilla@gentoo.org"
+	rm -rf ${ROOT}${MOZILLA_FIVE_HOME}
+	echo ""
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	# Most of the installation happens here
+	dodir ${MOZILLA_FIVE_HOME}
+	cp -RL "${S}/dist/bin/"* "${D}${MOZILLA_FIVE_HOME}" || die "Copy of files failed"
+
+	linguas
+	for X in ${linguas}; do
+		[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}"
+	done
+
+	local LANG=${linguas%% *}
+	if [[ ${LANG} != "" && ${LANG} != "en" ]]; then
+		ebegin "Setting default locale to ${LANG}"
+		sed -i "s:pref(\"general.useragent.locale\", \"en-US\"):pref(\"general.useragent.locale\", \"${LANG}\"):" \
+			${D}${MOZILLA_FIVE_HOME}/defaults/pref/all-thunderbird.js \
+			${D}${MOZILLA_FIVE_HOME}/defaults/pref/all-l10n.js
+		eend $? || die "sed failed to change locale"
+	fi
+
+	# Create directory structure to support portage-installed extensions.
+	# See update_chrome() in mozilla-launcher
+	keepdir ${MOZILLA_FIVE_HOME}/chrome.d
+	keepdir ${MOZILLA_FIVE_HOME}/extensions.d
+	cp ${D}${MOZILLA_FIVE_HOME}/chrome/installed-chrome.txt \
+		${D}${MOZILLA_FIVE_HOME}/chrome.d/0_base-chrome.txt
+
+	# Create /usr/bin/thunderbird
+	install_mozilla_launcher_stub thunderbird ${MOZILLA_FIVE_HOME}
+
+	if ! use bindist; then
+		doicon "${FILESDIR}"/icon/thunderbird-icon.png
+		domenu "${FILESDIR}"/icon/${PN}.desktop
+	else
+		doicon "${FILESDIR}"/icon/thunderbird-icon-unbranded.png
+		newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
+			${PN}.desktop
+	fi
+	####################################
+	#
+	# Install files necessary for applications to build against firefox
+	#
+	####################################
+
+	ewarn "Installing includes and idl files..."
+	dodir ${MOZILLA_FIVE_HOME}/idl ${MOZILLA_FIVE_HOME}/include
+	cd ${S}/dist
+	cp -LfR include/* ${D}${MOZILLA_FIVE_HOME}/include || die "failed to copy"
+	cp -LfR idl/* ${D}${MOZILLA_FIVE_HOME}/idl || die "failed to copy"
+
+	# Dirty hack to get some applications using this header running
+	dosym ${MOZILLA_FIVE_HOME}/include/necko/nsIURI.h \
+		/usr/$(get_libdir)/${MOZILLA_FIVE_HOME##*/}/include/nsIURI.h
+
+	# Warn user that remerging enigmail is neccessary on USE=crypt
+	use crypt && ewarn "Please remerge x11-plugins/enigmail after updating mozilla-thunderbird."
+
+}
+
+pkg_postinst() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	# This should be called in the postinst and postrm of all the
+	# mozilla, mozilla-bin, firefox, firefox-bin, thunderbird and
+	# thunderbird-bin ebuilds.
+	update_mozilla_launcher_symlinks
+}
+
+pkg_postrm() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	update_mozilla_launcher_symlinks
+}