Fix desktop files, bug 185869 and now it uses the langpack according to the locale, bug 182175, and version bump wrt security #185737

(Portage version: 2.1.3_rc8)

5 files changed, 344 insertions, 3 deletions

diff --git a/mail-client/mozilla-thunderbird/ChangeLog b/mail-client/mozilla-thunderbird/ChangeLog
index 8daeaa4d1e8a..fac7d59492c0 100644
--- a/mail-client/mozilla-thunderbird/ChangeLog
+++ b/mail-client/mozilla-thunderbird/ChangeLog
@@ -1,6 +1,15 @@
 # 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.211 2007/06/19 13:33:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.212 2007/07/20 15:57:43 armin76 Exp $
+
+*mozilla-thunderbird-2.0.0.5 (20 Jul 2007)
+
+  20 Jul 2007; Raúl Porcel <armin76@gentoo.org>
+  files/icon/mozilla-thunderbird.desktop,
+  files/icon/mozilla-thunderbird-unbranded.desktop,
+  +mozilla-thunderbird-2.0.0.5.ebuild:
+  Fix desktop files, bug 185869 and now it uses the langpack according to the
+  locale, bug 182175, and version bump wrt security #185737
 
   19 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.5 b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-2.0.0.5
new file mode 100644
index 000000000000..cc609a5309f1
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-2.0.0.5
@@ -0,0 +1,105 @@
+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 7a14ab52d3c66dc075c1703d992b4e42 mozilla-thunderbird-2.0.0.5-be.xpi 184807
+RMD160 bd9833ba995c1513b223768f032c6a20ad3a60b7 mozilla-thunderbird-2.0.0.5-be.xpi 184807
+SHA256 260614bc2eb6c5fd52d8e6785dac403b625666ae2f012c17d6081bd52b574482 mozilla-thunderbird-2.0.0.5-be.xpi 184807
+MD5 36c3a08aa166e258644fd4dcd50470e2 mozilla-thunderbird-2.0.0.5-bg.xpi 196590
+RMD160 5ac5ebe5adb2f49c756762859e7ec5da62e36b46 mozilla-thunderbird-2.0.0.5-bg.xpi 196590
+SHA256 aebb0573fb21ec79bed6de711831b781dbdfedd356dca88327e355b7387503bc mozilla-thunderbird-2.0.0.5-bg.xpi 196590
+MD5 3c7daae322ac6a3d0a48ded7778ee102 mozilla-thunderbird-2.0.0.5-ca.xpi 184222
+RMD160 cbc742ffab51014b7b14bc149dac6ac89b4396a8 mozilla-thunderbird-2.0.0.5-ca.xpi 184222
+SHA256 da3cd0b467f524c66913b72382bd2912fe507f9734c1fe64adc8d06acd2d966f mozilla-thunderbird-2.0.0.5-ca.xpi 184222
+MD5 1eb2b8d07060faa549dc88014cb53b06 mozilla-thunderbird-2.0.0.5-cs.xpi 186152
+RMD160 5280a3217ff68eb58412b0f3b193eaee399bb03b mozilla-thunderbird-2.0.0.5-cs.xpi 186152
+SHA256 a30b5378c8a1dbc3b50dad07032824a4b4402a0f785a2acd4d106ed1375e8b4a mozilla-thunderbird-2.0.0.5-cs.xpi 186152
+MD5 0ed2d2b834a7c1194c943085df26d789 mozilla-thunderbird-2.0.0.5-da.xpi 179124
+RMD160 73e61c0747b168dae9370e2d954c2587dea54a33 mozilla-thunderbird-2.0.0.5-da.xpi 179124
+SHA256 a5fe8838a81b1ababcb1a5cbdfdb41ea6efa055e5b243befe1419d7060d3a0b2 mozilla-thunderbird-2.0.0.5-da.xpi 179124
+MD5 12dd1886e4337e7358faa2247d1cd824 mozilla-thunderbird-2.0.0.5-de.xpi 159066
+RMD160 ea5c539181753e2337756b840e6d07dfa1d0efd4 mozilla-thunderbird-2.0.0.5-de.xpi 159066
+SHA256 07ee167fd4c18325c2db6342daa8ac49e64cb054e20590348b803d51eeadb54b mozilla-thunderbird-2.0.0.5-de.xpi 159066
+MD5 b536721f7aaf15e08559a71109e40406 mozilla-thunderbird-2.0.0.5-el.xpi 183062
+RMD160 29f5da7757ae987f7fb1655ca9806826fe197c1d mozilla-thunderbird-2.0.0.5-el.xpi 183062
+SHA256 7984e171ee73488962402a6e3174f988c1588b394615c0516caea5cf1cfc801e mozilla-thunderbird-2.0.0.5-el.xpi 183062
+MD5 96e120eb068fad95dce7d61259abfbf1 mozilla-thunderbird-2.0.0.5-en-GB.xpi 173042
+RMD160 c7546a64b97ffc1821f357185a64fcc65d103e71 mozilla-thunderbird-2.0.0.5-en-GB.xpi 173042
+SHA256 caa1992f2d32d95a070338fd3cdac1207497d3d677e981fb4012cc8c59255f5f mozilla-thunderbird-2.0.0.5-en-GB.xpi 173042
+MD5 751e929be0430518e643274ec0c45442 mozilla-thunderbird-2.0.0.5-es-AR.xpi 184674
+RMD160 83bbe2c0d67904d6f7e15e5b27183de8f0b30d0e mozilla-thunderbird-2.0.0.5-es-AR.xpi 184674
+SHA256 9a82ab19bcfe7870b394d86a25506ac1485d8a25c442651acea135cfe0fff706 mozilla-thunderbird-2.0.0.5-es-AR.xpi 184674
+MD5 00aa66303309abe13509e8932459d867 mozilla-thunderbird-2.0.0.5-es-ES.xpi 149565
+RMD160 2a5cb852e495e7e16985139efc670675812545e8 mozilla-thunderbird-2.0.0.5-es-ES.xpi 149565
+SHA256 767e6df5361d411190fda962c9eb494d68ccac7b48c4f1041d51673a217c4523 mozilla-thunderbird-2.0.0.5-es-ES.xpi 149565
+MD5 b63a8db631eb98c175d7713b632e54ae mozilla-thunderbird-2.0.0.5-eu.xpi 181784
+RMD160 53087c81a00edcd7dcb8f5ada195f476beea5cea mozilla-thunderbird-2.0.0.5-eu.xpi 181784
+SHA256 0c40e38067882ffb8f502aaa3b41d378c9fbd4a1a9022548a24053bf7718ab6b mozilla-thunderbird-2.0.0.5-eu.xpi 181784
+MD5 3779e46c5b162056e7c77ea646a8c161 mozilla-thunderbird-2.0.0.5-fi.xpi 187725
+RMD160 3104acfeac8a681eb53bf50b18ff9a7bccbcc25c mozilla-thunderbird-2.0.0.5-fi.xpi 187725
+SHA256 0b6f3f8a465f55fee8bc50b2f4b7102e131970680a9bda1907bae0b2e267890e mozilla-thunderbird-2.0.0.5-fi.xpi 187725
+MD5 82b69ffe51c44c5ee936a6eaaed40a64 mozilla-thunderbird-2.0.0.5-fr.xpi 191233
+RMD160 a0233a23af6a632835f974abc1d1107f1dd8a679 mozilla-thunderbird-2.0.0.5-fr.xpi 191233
+SHA256 577ff555b98c229988b010fcabbde8e0a202080612886ecb8de8f70a977cfbca mozilla-thunderbird-2.0.0.5-fr.xpi 191233
+MD5 42ed8963359bda1c8da5164f0dd31e83 mozilla-thunderbird-2.0.0.5-ga-IE.xpi 185955
+RMD160 a40aad0ee11621818ea980171ecabbea4208e1c4 mozilla-thunderbird-2.0.0.5-ga-IE.xpi 185955
+SHA256 611f2bed727c534abc0ba411df838290dc0090b69376030c74f6aeda7c697940 mozilla-thunderbird-2.0.0.5-ga-IE.xpi 185955
+MD5 2a84b05f9224a6778f3d3729942d6ed7 mozilla-thunderbird-2.0.0.5-hu.xpi 191687
+RMD160 8a658e0c19573f85cca6ccde259586ea10f3e0cc mozilla-thunderbird-2.0.0.5-hu.xpi 191687
+SHA256 366d5f02331353c23d4f5d841e6457cdcdfef7afe61b535381a3a9a4f9ded8ba mozilla-thunderbird-2.0.0.5-hu.xpi 191687
+MD5 99394224d34b9ec151c0846afac0da8f mozilla-thunderbird-2.0.0.5-it.xpi 152543
+RMD160 d040bc8e80b13e356232d932ba30ef4bf0b73482 mozilla-thunderbird-2.0.0.5-it.xpi 152543
+SHA256 a2be54c6e09c290c571ab837c347bc7ee13faf3e52b1911aab73b22f613e40aa mozilla-thunderbird-2.0.0.5-it.xpi 152543
+MD5 85a720998dc0febad4785887ccad8ea7 mozilla-thunderbird-2.0.0.5-ja.xpi 199401
+RMD160 08f71288a9c80464b33dde88b478244f768604b3 mozilla-thunderbird-2.0.0.5-ja.xpi 199401
+SHA256 84e33d7b1f0a09f7e32ee4cbe231ce72831102614f327ee480e7bd0899e99d1f mozilla-thunderbird-2.0.0.5-ja.xpi 199401
+MD5 9f9fe0af5a2669380d31e7d8f22d8e31 mozilla-thunderbird-2.0.0.5-lt.xpi 189452
+RMD160 80536f69feb41f0194a4c5a63f61da1d4389801d mozilla-thunderbird-2.0.0.5-lt.xpi 189452
+SHA256 6f5f446c42ebd308d55e7476dbf115f16aa5bddf322de985b2d28a80a00583b0 mozilla-thunderbird-2.0.0.5-lt.xpi 189452
+MD5 20076561e2f05367ee20385564cae0ec mozilla-thunderbird-2.0.0.5-mk.xpi 196597
+RMD160 a93aa6ad4d0da48e8a94ee382cb21c0a63ef9123 mozilla-thunderbird-2.0.0.5-mk.xpi 196597
+SHA256 e64ac30255367356ba2ab7b7e97a870412f7dfed93f0f3564ab5a7a0e6320ad3 mozilla-thunderbird-2.0.0.5-mk.xpi 196597
+MD5 fde36ce719bd04397ae12c9b0d69a1af mozilla-thunderbird-2.0.0.5-nb-NO.xpi 183234
+RMD160 bfae6472a8fc90a29a2cb75dd6c1ba58e0884ffb mozilla-thunderbird-2.0.0.5-nb-NO.xpi 183234
+SHA256 9920dc3a501b46d38126c827d61769ef21a3a164dc860b79baa2b87c64f44e82 mozilla-thunderbird-2.0.0.5-nb-NO.xpi 183234
+MD5 57815ebe091c1082a57fa67aa127beab mozilla-thunderbird-2.0.0.5-nl.xpi 184156
+RMD160 61476d997b8a3c2e54d650550cb2b09f36919c8b mozilla-thunderbird-2.0.0.5-nl.xpi 184156
+SHA256 3a8f13d9f1e3ce0457d5dc7bc41b4115dfacdaf8bc0b7cabe6be5c7c596e31d1 mozilla-thunderbird-2.0.0.5-nl.xpi 184156
+MD5 51c52c5724f10f1e7a0e744076a4cbb8 mozilla-thunderbird-2.0.0.5-nn-NO.xpi 184110
+RMD160 b33bd73d95f6a60597b97425e358b7c0125e3ef0 mozilla-thunderbird-2.0.0.5-nn-NO.xpi 184110
+SHA256 3de07c17a6031eac9edd7585e854d2e3461bb96976d2a31d5488c452e83d6a2f mozilla-thunderbird-2.0.0.5-nn-NO.xpi 184110
+MD5 bed68d92e9e9f6d07d58245b17c90ec2 mozilla-thunderbird-2.0.0.5-pa-IN.xpi 205012
+RMD160 fb57cf1962d3e925d1f2e12543dca49a31987ad8 mozilla-thunderbird-2.0.0.5-pa-IN.xpi 205012
+SHA256 9e3d0b5bd597780f150a9422698d0bc9e5c8751c6dd3957ad8711bb599d48e4e mozilla-thunderbird-2.0.0.5-pa-IN.xpi 205012
+MD5 d1cfc7c350f2e40911aab7637c7c8bb9 mozilla-thunderbird-2.0.0.5-pl.xpi 177385
+RMD160 91493049967723c0ff955809dd576725798ace9a mozilla-thunderbird-2.0.0.5-pl.xpi 177385
+SHA256 e4351dc2b429c23bf36df6cba4f4702a3991d9cb2201de1eecaa64df2840c8cb mozilla-thunderbird-2.0.0.5-pl.xpi 177385
+MD5 a9d786a4c7948b3f49763dd69c08e317 mozilla-thunderbird-2.0.0.5-pt-BR.xpi 183066
+RMD160 1d6c3d19579e2c0590492ed029f1e9bd30164af5 mozilla-thunderbird-2.0.0.5-pt-BR.xpi 183066
+SHA256 a1187da6bedecb58566feff12e1310bde5225d02077bda5f2611d1ea1d7008ef mozilla-thunderbird-2.0.0.5-pt-BR.xpi 183066
+MD5 128d705548565e06252cfee7e7ca438c mozilla-thunderbird-2.0.0.5-pt-PT.xpi 183918
+RMD160 2337e0f98c4f6c0fa62aec735acb95b885ab9aec mozilla-thunderbird-2.0.0.5-pt-PT.xpi 183918
+SHA256 d280c315af4e2a163cb45fee801aba856a09393791fd752884774c5a3a130227 mozilla-thunderbird-2.0.0.5-pt-PT.xpi 183918
+MD5 71711a9b744778256ccae7c80e96d69c mozilla-thunderbird-2.0.0.5-ru.xpi 173903
+RMD160 76eb237f9ce486f69abd784faa69de09344e1f05 mozilla-thunderbird-2.0.0.5-ru.xpi 173903
+SHA256 b25384a4c1637ce5500f49cb0c2f911ce6fba2adf3ed45e2cc8135a8899d7aeb mozilla-thunderbird-2.0.0.5-ru.xpi 173903
+MD5 bfc20c2ea1a748883123d1144e17eebb mozilla-thunderbird-2.0.0.5-sk.xpi 191717
+RMD160 1f466d2a682794493c80005683dc33f4f2459e5a mozilla-thunderbird-2.0.0.5-sk.xpi 191717
+SHA256 3bb55d8ce71579355e5bb32eb786bcaf769ec089b43bdb13639302a6febedbe1 mozilla-thunderbird-2.0.0.5-sk.xpi 191717
+MD5 93b38faa19b18abc71e16d32990dad33 mozilla-thunderbird-2.0.0.5-sl.xpi 188015
+RMD160 3348503276da396e92ad103baf7621ad7c7450bd mozilla-thunderbird-2.0.0.5-sl.xpi 188015
+SHA256 d9a17eda13befc72e2fab3b6da142ae650d880b4bf3956d31905ca002ae0b952 mozilla-thunderbird-2.0.0.5-sl.xpi 188015
+MD5 db525e06d5e16bc795cb5237d0da9932 mozilla-thunderbird-2.0.0.5-sv-SE.xpi 191925
+RMD160 3117702bbc4a7a89b23338c3052f0a35e86bd129 mozilla-thunderbird-2.0.0.5-sv-SE.xpi 191925
+SHA256 7b007059ae83f5df63767feaad0e73517c099b2fec32f2e5f9e81788e4e67041 mozilla-thunderbird-2.0.0.5-sv-SE.xpi 191925
+MD5 6e764c93e74cd496ed829e336327b087 mozilla-thunderbird-2.0.0.5-tr.xpi 157691
+RMD160 d936938f4c5d65c59d6e8075507900c046929452 mozilla-thunderbird-2.0.0.5-tr.xpi 157691
+SHA256 b4899fe9c68ce6ab08455c1ad00f956a8aeec9f84c2ec765530965f007bcb014 mozilla-thunderbird-2.0.0.5-tr.xpi 157691
+MD5 17896a1d213e6e3a670242f927cd253b mozilla-thunderbird-2.0.0.5-zh-CN.xpi 147617
+RMD160 0a2e11069961ff42c6942b79f35249a2435e0d6f mozilla-thunderbird-2.0.0.5-zh-CN.xpi 147617
+SHA256 fea86d58ab06631440bec13fb99fa678bc682e98cd50b81dffa612411dc0a92a mozilla-thunderbird-2.0.0.5-zh-CN.xpi 147617
+MD5 873df41d47c29a8ce82962963aff903f mozilla-thunderbird-2.0.0.5-zh-TW.xpi 153695
+RMD160 7bc40651bdeaa26adf4063761e53e0ecb56c0489 mozilla-thunderbird-2.0.0.5-zh-TW.xpi 153695
+SHA256 935c49f40a58471dcf81070c245c80b670f44d438c72fc48b709379e7bc511c4 mozilla-thunderbird-2.0.0.5-zh-TW.xpi 153695
+MD5 9ce0b2381e500e9822ae1e7b8871a147 thunderbird-2.0.0.5-source.tar.bz2 37463362
+RMD160 3d735d8080a374971584b43730400862d0d0f68b thunderbird-2.0.0.5-source.tar.bz2 37463362
+SHA256 dbfd3008dd6998b36ad4bf198429b222463f38ad1a4202bbf2648b8b62a5721e thunderbird-2.0.0.5-source.tar.bz2 37463362
diff --git a/mail-client/mozilla-thunderbird/files/icon/mozilla-thunderbird-unbranded.desktop b/mail-client/mozilla-thunderbird/files/icon/mozilla-thunderbird-unbranded.desktop
index 9e45fdeb0ca8..6d2562540b86 100644
--- a/mail-client/mozilla-thunderbird/files/icon/mozilla-thunderbird-unbranded.desktop
+++ b/mail-client/mozilla-thunderbird/files/icon/mozilla-thunderbird-unbranded.desktop
@@ -5,4 +5,4 @@ Exec=/usr/bin/thunderbird
 Icon=thunderbird-icon-unbranded.png
 Terminal=false
 Type=Application
-Categories=Application;Network;
+Categories=Office;Email;
diff --git a/mail-client/mozilla-thunderbird/files/icon/mozilla-thunderbird.desktop b/mail-client/mozilla-thunderbird/files/icon/mozilla-thunderbird.desktop
index 8e91b69de6f2..34267aac7fe1 100644
--- a/mail-client/mozilla-thunderbird/files/icon/mozilla-thunderbird.desktop
+++ b/mail-client/mozilla-thunderbird/files/icon/mozilla-thunderbird.desktop
@@ -5,4 +5,4 @@ Exec=/usr/bin/thunderbird
 Icon=thunderbird-icon.png
 Terminal=false
 Type=Application
-Categories=Application;Network;
+Categories=Office;Email;
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0.0.5.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0.0.5.ebuild
new file mode 100644
index 000000000000..fda88be61bc3
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0.0.5.ebuild
@@ -0,0 +1,227 @@
+# 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.5.ebuild,v 1.1 2007/07/20 15:57:43 armin76 Exp $
+
+WANT_AUTOCONF="2.1"
+
+inherit flag-o-matic toolchain-funcs eutils mozconfig-2 mozilla-launcher makeedit multilib mozextension autotools
+
+PATCH="${PN}-2.0.0.4-patches-0.1"
+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"
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
+
+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"
+
+MOZ_URI="http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${PV}"
+SRC_URI="${MOZ_URI}/source/thunderbird-${PV}-source.tar.bz2
+	mirror://gentoo/${PATCH}.tar.bz2"
+
+# 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.1 )
+		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 MOZ_CO_PROJECT=mail
+export BUILD_OFFICIAL=1
+export MOZILLA_OFFICIAL=1
+
+pkg_setup(){
+	if ! built_with_use x11-libs/cairo X; then
+		eerror "Cairo is not built with X useflag."
+		eerror "Please add 'X' to your USE flags, and re-emerge cairo."
+		die "Cairo needs X"
+	fi
+
+	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"
+	fi
+
+	use moznopango && warn_mozilla_launcher_stub
+}
+
+src_unpack() {
+	unpack thunderbird-${PV}-source.tar.bz2  ${PATCH}.tar.bz2
+
+	for X in ${A}; do
+		[[ ${X} == *.xpi ]] && xpi_unpack ${X}
+	done
+
+	# Apply our patches
+	cd "${S}" || die "cd failed"
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}"/patch
+
+	eautoreconf
+}
+
+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
+
+	# -fstack-protector breaks us
+	if gcc-version ge 4 1; then
+		gcc-specs-ssp && append-flags -fno-stack-protector
+	else
+		gcc-specs-ssp && append-flags -fno-stack-protector-all
+	fi
+		filter-flags -fstack-protector -fstack-protector-all
+
+	####################################
+	#
+	#  Configure and build
+	#
+	####################################
+
+	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}"
+
+	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}"
+}
+
+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 "cp failed"
+
+	for X in ${A}; do
+		[[ ${X} == *.xpi ]] && xpi_install "${WORKDIR}"/${X%.xpi}
+	done
+
+	# 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
+
+	for i in ${D}"${MOZILLA_FIVE_HOME}"/greprefs/all-gentoo.js \
+		${D}"${MOZILLA_FIVE_HOME}"/defaults/pref/all-gentoo.js; do
+		echo 'pref("intl.locale.matchOS",                true);' >> $i
+	done
+
+	# Install files necessary for applications to build against thunderbird
+	elog "Installing includes and idl files..."
+	cp -LfR "${S}"/dist/include "${D}"/"${MOZILLA_FIVE_HOME}" || die "cp failed"
+	cp -LfR "${S}"/dist/idl "${D}"/"${MOZILLA_FIVE_HOME}" || die "cp failed"
+
+	# Dirty hack to get some applications using this header running
+	dosym "${MOZILLA_FIVE_HOME}"/include/necko/nsIURI.h \
+		"${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 ${PN}."
+
+}
+
+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
+
+	elog
+	elog "The behaviour of the langpacks has changed, now ${PN}"
+	elog "will be displayed in your locale"
+	elog
+}
+
+pkg_postrm() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	update_mozilla_launcher_symlinks
+}