From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-534494-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id A58A81381F3
	for <garchives@archives.gentoo.org>; Thu, 13 Dec 2012 18:40:56 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 21E7AE05FE;
	Thu, 13 Dec 2012 18:40:47 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 88C70E05FE
	for <gentoo-commits@lists.gentoo.org>; Thu, 13 Dec 2012 18:40:46 +0000 (UTC)
Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163])
	(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 5FE9C33DB58
	for <gentoo-commits@lists.gentoo.org>; Thu, 13 Dec 2012 18:40:45 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by hornbill.gentoo.org (Postfix) with ESMTP id 0813DE543C
	for <gentoo-commits@lists.gentoo.org>; Thu, 13 Dec 2012 18:40:44 +0000 (UTC)
From: "Jory Pratt" <anarchy@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Jory Pratt" <anarchy@gentoo.org>
Message-ID: <1355424018.fbca35f19f0a8d69e55482b8e8ee66b8610f3e15.anarchy@gentoo>
Subject: [gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/
X-VCS-Repository: proj/mozilla
X-VCS-Files: mail-client/thunderbird/Manifest mail-client/thunderbird/thunderbird-18.0_beta1.ebuild
X-VCS-Directories: mail-client/thunderbird/
X-VCS-Committer: anarchy
X-VCS-Committer-Name: Jory Pratt
X-VCS-Revision: fbca35f19f0a8d69e55482b8e8ee66b8610f3e15
X-VCS-Branch: master
Date: Thu, 13 Dec 2012 18:40:44 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 04ff8fd8-4d13-4926-8ee1-7973484e2c75
X-Archives-Hash: e50d3cfd0510eb674cf508aa145ddf29

commit:     fbca35f19f0a8d69e55482b8e8ee66b8610f3e15
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 13 18:40:18 2012 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Thu Dec 13 18:40:18 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=fbca35f1

Thunderbird-18.0_beta1 initial workup

---
 mail-client/thunderbird/Manifest                   |    3 +
 .../thunderbird/thunderbird-18.0_beta1.ebuild      |  338 ++++++++++++++++++++
 2 files changed, 341 insertions(+), 0 deletions(-)

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 52183c9..cc66751 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -3,6 +3,7 @@ AUX icon/thunderbird.desktop 270 SHA256 e8756ac8a421ac18f28b3620b2a021199f3bc4a3
 AUX thunderbird-gentoo-default-prefs-1.js-1 426 SHA256 b5aba51045c700ae4d465e079f3e776600d4950806212f7c2fe1841fa25cf9d6 SHA512 b40e7b4789b7f43c382589f7d0eaa6043072bce86ab79fb3dda4800e9ab6a43af11f43b0cb3b6ab1c71d887aa1cf9356ac858f0a81dad013cef5b8a4b2107983 WHIRLPOOL cc3535e9a710d55c5386db51d7bd6ca24f6b36685a54e42d049a806fe99fd0b08afe7998d1478036bfa306129616778b8ac1386e14649646fc0a7ae4d37b830d
 DIST enigmail-1.4.6.tar.gz 1262280 SHA256 f3771d1faa26676818bab5e2c50dce85013b9de30b82de526159eaa7ca34f036 SHA512 4e4e6c1a8529b1125671be5c10b72c206864ab719a721b184d082c53cfad294925bdfe24bbc50b67ec6f2cf1f7b61a843ab381eef328488ec52e29c190858092 WHIRLPOOL 1c9dc7b47ca1c7e9ea6cab0112ff5efa8725477e5d3c18ef4b8fc4b51c19c79e5e0786ba85b17dc01ba1f63b619cb1a2f545a6773a46e1bea273f98c4473c04c
 DIST firefox-17.0-patches-0.3.tar.xz 50988 SHA256 9baf32d80fb3353bccb1e79d2dc6f4c5f41847e04b5d18435cb37aeb99f16826 SHA512 8b0fb92caf93f5384b172c5d261f469b52a4b3398e6caafeab823901aae6601b4c16582ae00c71e5f6a56ce266720ce2080950aed9426180211a0d6bdea8666b WHIRLPOOL 1482c0e92caa72bcb645bdf0d0f2ff82bff4a1dd1aea4eb855579f39aec507d630f2a438d7fd417d15a15b2368518fe3abfbfd948d50f31aca33a1b316590edc
+DIST firefox-18.0-patches-0.4.tar.xz 51676 SHA256 353dd5a9d583d468c6998facb474b03de50cfe281b532990094c2a2128689488 SHA512 e32118edfdfcd07edd35e9f6aea8788b0328d573e96270b43541b07f62ff873c74125ce210e7f3ceb588220fd728acbfa7582074f266e234e7ff2b7e598a9849 WHIRLPOOL 19a8b95fd0eccaf2b867c3c66bcb944368436d3d98c1b87a68cb3f8079c7b5acb7c50454cb75a91ebaf70da5945149afb93c799f4f532330d437b775eb06a8a6
 DIST thunderbird-17.0-ar.xpi 445976 SHA256 3cbb52aa92794274c01df21f297bca44c194cbf3aa61df29f2070688eb17023f SHA512 ca52227441233b43cd1b4e8f191ba42eeb9fc30856d80f183ed2dfa3c9e96eef0cec608b653ccd7fa024d2b49ea109bb28fde57095ea48009d9787d5e37e211a WHIRLPOOL 731506d4030f91c6126af60a520ed9fd6b23f05b88a102c86357529b2baa4c351966b32ca9de21e3c981304e193ac2e34090ee10f593aeff1c0b89ba40960393
 DIST thunderbird-17.0-ast.xpi 388038 SHA256 526fe6fe0beea31c9d5ec6d6f35035a85b955db43a83a3c1b16e2b550db4d1eb SHA512 abda7334449badd5be52f61b395b08e688be55752e2696b1f2f3f6483f9c870a3eb5d7cadcf2a73a0a2128abc58ff94624ceb7e820225fc0a40a0d52dab0e609 WHIRLPOOL b099a94b9fde3b401813bef9e396e7626a52c8ce0357d86a7ff8c4deab41c0dd4f8aa331c7482ef6f6ec30883790bea9358bfc22e3d6d0bad7bcd1e661b233dd
 DIST thunderbird-17.0-be.xpi 426694 SHA256 1275c0c2719cc38bd8b982c3880aed39a22167844f47260fef0682f2e97e3827 SHA512 a75d294fbef13133a3dd7641785c0dcec4cd4c5ff6775d7aacce61917c5499c7b88fe02fb1961f5375a34dbc54b469fee93a1ee121b0e5f0da622bfeb9177a42 WHIRLPOOL 94a3ec350d5ea4ae41320e257d154909e80ae08fc92de31a117a57ea8cb21b1283582fccfa8ea0f0ded6ad3ac1f86efaf59b9b8b638d8e4c99ebf98f2de1c758
@@ -59,4 +60,6 @@ DIST thunderbird-17.0-vi.xpi 478454 SHA256 0073327cfe4a44d4238f109e43936b9bbb6c6
 DIST thunderbird-17.0-zh-CN.xpi 436082 SHA256 0f10c72f398f768f0d861cb6575622ea045d362048ae47fddb46b3b5f761013b SHA512 68d9d763653acc8071edbbfdd59fb5e235bed3833ffa1975907ca1cc2ec234ad045814b92a0db4c1a6f6ef6c3770f9ac7c286b1199bb9398950596f356f66acf WHIRLPOOL e102c90f43f718f1490f5f0fc95378a8d5955ec0ddcd4caae68b55ae8826b4c73fea6690e9a5feec85dede256703d88ed89a36e2c77742cbf4155257c66cce9b
 DIST thunderbird-17.0-zh-TW.xpi 437590 SHA256 555fcd98a7ea2a46db0b6d8193fc1c784a140d31aa0c70a99da7bb2502038ee5 SHA512 a5cce543faa5645cc5d9b289073d7797ab04c970a6dd3c226a3d6f5a9fa53853f466cbc2c24cff4c383eb0e9d23640efc97e3be6085c1fd084b8d4e11d79bfba WHIRLPOOL cba655f07c4b2893398729904862e1372519de310ee9cf4c6ce268c1e6d4efeb348f7941535ed4ccb582f4ebc26662845b4f40f7651085ab384b05ec006ff34e
 DIST thunderbird-17.0.source.tar.bz2 113270266 SHA256 08a102f21511afb696980b7c35b75f385f4260fba5f1c0b1b488ab81a49dbede SHA512 6fee7f5e765d156ab54e667a7fdcfd24c7b054d76c70a6de60e06b5368e228436db628f59af80c64be7e74a083d069c723a18c354fddc15e99a763380e124015 WHIRLPOOL c71e9d5acadc3b5a04060e5a61c06de1573fd08dff762b6348a8ee3248ec59d2ab0ade7d6656b1a0f710d8580dc967e4d7a52e5b6f558415707285e3b7d95c77
+DIST thunderbird-18.0b1.source.tar.bz2 119356332 SHA256 60a31745fc0ee4fc5597de6663a757f55c0bd61494f67607e3b914c73e236c72 SHA512 a5cfd4049b88db6cfa30e3bb8f53637db0992c6ed8f5030958ed268ce93913e8936ca5e7b91f1ebf3c760c72b3ae5156fd72140dac6c5bc21a93ec20d3399c6b WHIRLPOOL 2836c94478bc364a7deb4e341b984c6dc987dc969dcc8b3c1b2e1bb85237e2109ccfb647de05860ac5afaa0076e60b278fe47299ad628d3c97c2f3e15f7cf0e2
 EBUILD thunderbird-17.0-r2.ebuild 10450 SHA256 5b01d4fd8afa076e0e24b602930d2d2c45805234f49334d1c76ab98656ab2093 SHA512 7c198d964f2d3290c7808cfb720f405fda987ac09b67b3e62f47234d25f7d436e3084abbe8580d5d309a75dfd8b8fc9c3dbf64a9ca1aa3e58a7e648c10f4eeee WHIRLPOOL c265a2a6b9cbd2cda4739b5d3e00f2d3945a8d21521bc41d0e624f0130b6181d8a31b5ff1b735e648f793f4c438984612fb68cac6ed8aff923c6deb38e8320ae
+EBUILD thunderbird-18.0_beta1.ebuild 10450 SHA256 a23ba132929938c758988dc3ef81bbe3ceddaafb94f59c3499caf6e36fd0ccb6 SHA512 37ea3f6b83966cda6d24273677fc7f9889df30c3092538240fa48118d2952be3b214d72bc2ddf9f910a390ab26f289618a14dc5cd01de7e5c48f69559ab869d5 WHIRLPOOL cbb754370f713f4785d265e62b9ca57ab68ecaf0ef63eb30fd556aa05d64ec421b659d838ddb9870ac98174e6fcb48c50b1d7ce8559526c6db529c5e58e2e725

diff --git a/mail-client/thunderbird/thunderbird-18.0_beta1.ebuild b/mail-client/thunderbird/thunderbird-18.0_beta1.ebuild
new file mode 100644
index 0000000..7b316ae
--- /dev/null
+++ b/mail-client/thunderbird/thunderbird-18.0_beta1.ebuild
@@ -0,0 +1,338 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-12.0.1-r1.ebuild,v 1.3 2012/05/24 22:06:14 floppym Exp $
+
+EAPI="3"
+WANT_AUTOCONF="2.1"
+MOZ_ESR=""
+
+# 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.4.6"
+# 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/"
+
+inherit flag-o-matic toolchain-funcs mozconfig-3 makeedit multilib autotools pax-utils python 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-18.0-patches-0.4"
+
+SRC_URI="${SRC_URI}
+	${MOZ_FTP_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.13.6
+	>=dev-libs/nspr-4.9.2
+	>=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.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}
+	dev-python/pysqlite
+	!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
+
+	# 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
+	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"
+}