[gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/

["Ian Stakenvicius" <axs@gentoo.org>]

commit:     6ede5d1c1a450cf08b87ef0a596e2cfaec0650a1
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 10 21:38:43 2016 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Wed Feb 10 21:38:43 2016 +0000
URL:        https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=6ede5d1c

initial commit of thunderbird-45.0 beta

 mail-client/thunderbird/Manifest                   |   4 +
 .../thunderbird/thunderbird-45.0_beta1.ebuild      | 377 +++++++++++++++++++++
 2 files changed, 381 insertions(+)

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index c3551b3..ed3ef3d 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -1,7 +1,10 @@
 DIST enigmail-1.8.2.tar.gz 1604159 SHA256 1d2700799bc52aaa8e8c9f7a0f5111281ff9fbdffc093cdff070657d574eb2a6 SHA512 51eece988f466aeb4a343719a86dc7d95ec41dfc3ec7e3d8d2f360528675c605f8f2154f10aeea6ef82ed87c784f1d13bfc978e052a9ede0072b5137f6294b11 WHIRLPOOL e12a703899e0e4c98adc58b5f4bf1f74e24a2cf09c1a706a6edca6aca06140041b293f23e6e5b05c507177b4148533ebc3431fb75592aae07d791a899ba2c45c
 DIST firefox-38.0-patches-05.tar.xz 18412 SHA256 d2a2be8359c15d42fd2355bb54048db88af2288f9f9b69acbd742c29bd10be16 SHA512 0556531fa5685bf04438df22b0e35ffd22c27e31a2d1d264b9401af8f3c79604577fc71f71e2bf338dc5465471152067ce1a30ba2813c612e062e20c4b5b7ea2 WHIRLPOOL cc9aa2174395c8a70a9fc7010fc48d2f4e35c64c73deda38934a42ded5def14f7ccf6c3be8700ab3bea02bdd93bb4b98b40ff44176e4cfccd0b68b70d9deed61
+DIST firefox-45.0-patches-0.1.tar.xz 14232 SHA256 8b4926d538a5652b909ee4c174f0160da082defa988559275e105fb18f08f5d8 SHA512 9bfffce906a84ee984a0b553d30006fbf200b5e17ccb4782ee00f2bb13377d5368d6feedbc3b74b906608602ca95a0b8b2b16632dd1d34a1416b60a7167c0f80 WHIRLPOOL 8d335e6c5a899658fa478af19a77dde45d8199025393a365c18dc41600be111a21445b8add8198527512d1769f7b76e439440102616514bb44354b23b03828bb
 DIST gdata-provider-1.9.tar.xz 80812 SHA256 8e60960999c752c49d6414d14c35c2d0cc474d4a199ec99e531453d4d60bc5a3 SHA512 b1411b0a8614eb5e9fbdc0a41eb5ed38e8d4c90832e2a356fd0412b554af46bde4b766b213d9da3cafd85206da44d333354c9f6b469c95ddb190fa04fe14a54a WHIRLPOOL df7451e55f937c604d92faed82a16bddd6ca87a7c03981324c5409ab5824ac1c631ec767f10eaedc6f7128cd1f9001eca599c848d39e116d9722f26811b01092
+DIST gdata-provider-2.6.tar.xz 83884 SHA256 b872dde3eafccec88c5548833530b88c85eb044e3a222f6f198d924829512f0d SHA512 b1b954babd775e183a36e913013b1d056778b12d50dd089c329aa322cc9820ad563e7e02e5eca7b1ae52c5ebed2cfdc52d11bdb973dc3ebe41cffd0c585d5c7b WHIRLPOOL eb6197ab474e8852eefabf608b0b66d12e6dea3bfe5c94f18225211d286293dc2e52ad85c7e94a8688946de33c174c72d001b5f591b47a616b07d6c475a8457a
 DIST lightning-4.0.5.tar.xz 2312932 SHA256 8386208ecb915172a48d77fc758f5040933c13619c0f9d820903ce37ba610184 SHA512 9f1fbec0520d24158af78ffe8a790502fd2843facd17bac2e278006d7b1998067b5803e1fa2e3172511d298cebb4e0b7047edb7b0aa18a8dc4712d0f1e2e08d3 WHIRLPOOL 8f6074f6038fda3a4946ea8fe788194cb2eda0c7e4a6c68a7c349781b8acb7602a70baf66bd5148ebd712e197cf4974268b5f40cedec520280c355e4f03de701
+DIST lightning-4.7.tar.xz 1929596 SHA256 6368d6438131c1b64a4089b073bd46aa45c1baa1dc9d1e65fb2146b2491ae75e SHA512 537f586da73bc0bac2851fe2930f84fe7406170711290a37cd4076197a3580cd95619e82be3428e7330dde5cb93c89fcd7ed03367b9921a4c6c678c8b6745113 WHIRLPOOL 68b39e241bcc820a3c5febf15f15ab2ac680004154b18df786a77f61611573b71b8726f3054f97ad95aff20969e1d59830c4c13966ed6d88aa6b1d8dc9de7a7b
 DIST thunderbird-38.0-patches-0.1.tar.xz 684 SHA256 cd2a347b72a104e72d38e56bb92df3464e8820485119b4114dbd0bbda131a808 SHA512 52c83af301be959e861dfec55b3c4bc60035387c606976bd29232c4cba077230edcadef242491e699fba10027d0408dd4f33fa320bcf96727afe149166ca02de WHIRLPOOL a378a0fa1b152f17681a5e389662fedfacd45a137b224f038d3c98ab4a024bcf9e753fb2fe018cdb7126fb710ee8baabdf7882540450ead2985070d0d1f12eb0
 DIST thunderbird-38.5.0-ar.xpi 475296 SHA256 871c5198f1a5a2b5fef7f817d583bd91300bfd32522b7a1801b7e32b478a4bb9 SHA512 e164b85d3745b3c3fbd2123575125fc60a19bd4aa55d1e41124d9c8739f423439e602d9ee1af75d5954a9934ffc7a409c13845604e68bd10a731617e58923cfc WHIRLPOOL 9ae7a17bd920e9525d08df1d7984f3770eb20445371a97f5e722e30dddc30dd0f350754ba8ade6eea3e217c4fa6a53324b88a9c68b2a79ac45933ffc22f13616
 DIST thunderbird-38.5.0-ast.xpi 405872 SHA256 b8a3c66806cb11447fffe54830a78f96fcf828722708365558bb74e173a43ad4 SHA512 9a45663736d066c8a8477bd1731c6c585c55c1acbaca1c63e508d4f135cae5eab8bdf9d8941ad108907b7ff8def0c72a745aa4c7fa30645ab7bc7e7881abfd68 WHIRLPOOL e004d3203a34f32288c742b44131d7fa6ce9713112d8a2088dd19b038992b6152288e4d866eef1e2c1ba5f5ee45b578153539b0b4f7ecbfc2d8d4edc6567b37f
@@ -60,3 +63,4 @@ DIST thunderbird-38.5.0-vi.xpi 519843 SHA256 43d25bbbf7d16c0d789ae2f98c16835b2ac
 DIST thunderbird-38.5.0-zh-CN.xpi 466412 SHA256 5a655ebd5fbba862542973834b4d6cc2f8a13c065f734bbc490f8d838d71dc6e SHA512 876e597c511721d3d83c74d1ad6cda7f73268ec7d5a91de312a11927986b9384886f42a2ac6ce0fb68fb0d9d7ce8aca081f5a90b116d5b9286ee3cbeaeac1a51 WHIRLPOOL 2d154a00f88ae784f4e51988d384f31bb18b2743f25ff78abb35f16f70ec6034598282467e43f105b41acd42fa11f2266c86645340fb9c537095cb4467ffb76e
 DIST thunderbird-38.5.0-zh-TW.xpi 466661 SHA256 87019d3d21edc402110fe3c18091f855e1946643b4e51392abecdd25ad775ffc SHA512 957bce9dd781e8b8aa17778e12c3335d0a3823bbf9f54a9ed4837ab724e27cc03feb6b7e1d2d85069a9ed2d480c9939c9f68bd3797d45f02c6d65bfabdd2f0ab WHIRLPOOL 4d79a8c4aa496c81af1751bb2830ed9e31886677a3b3aef58154cda37af7827ae355eb0a0de88a80ae765b071eb673e02c33851a65e21d41c8d9d5b25836e71a
 DIST thunderbird-38.5.0.source.tar.bz2 204393357 SHA256 7da187d4d5df17b1457bd93b584f78f5e41d2094f87c14e74ee9d8064de25d0d SHA512 fed8376375c3ad7df8b773ced7944fb07edbd28e82c907dc6451ad538b8944d6f2a1d5632399f255ab1c7f74a40a9170912fefdbb2fdf423d7dc35108d1baa65 WHIRLPOOL 93853218ce7bb585e1515e62ea02bbe51e723d0071f8bfcddd5da9c4ea0a888a5c78fe86afbd46ab049a2e59424dc5f2a04d3157ef720e524ad6e2bf99614e01
+DIST thunderbird-45.0b1.source.tar.xz 200614588 SHA256 9dab049db4d45f2dffacb4e2ce73920a27d0253ecf1e21ee33256ecbf05095bb SHA512 0521bf47ecffd732dd80b7f86b12eb3f45bd084d120b56d03fe343b0f2529c24fd44f04061ddf2b0ab5efc6f2f37c2f0ed260234a42899b4c289584358cf3d5a WHIRLPOOL 8ccd5c7c5b98e731e372df5ddb7c349a11f6a117932eb76bd3957e38fa05f65f63d7020720afa7e864fec761ff0c5a9c3dfd51a2ea7aa725bb30460a9f23b0f9

diff --git a/mail-client/thunderbird/thunderbird-45.0_beta1.ebuild b/mail-client/thunderbird/thunderbird-45.0_beta1.ebuild
new file mode 100644
index 0000000..854ab20
--- /dev/null
+++ b/mail-client/thunderbird/thunderbird-45.0_beta1.ebuild
@@ -0,0 +1,377 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WANT_AUTOCONF="2.1"
+MOZ_ESR=""
+MOZ_LIGHTNING_VER="4.7"
+MOZ_LIGHTNING_GDATA_VER="2.6"
+
+# 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 cy da de el en en-GB en-US es-AR
+es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb 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.8.2"
+
+# Patches
+PATCH="thunderbird-38.0-patches-0.1"
+PATCHFF="firefox-45.0-patches-0.1"
+
+MOZ_HTTP_URI="http://ftp.mozilla.org/pub/${PN}/releases"
+
+MOZCONFIG_OPTIONAL_GTK3=1
+MOZCONFIG_OPTIONAL_JIT="enabled"
+inherit flag-o-matic toolchain-funcs mozconfig-v6.44 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 crypt hardened ldap lightning +minimal mozdom selinux"
+RESTRICT="!bindist? ( bindist )"
+
+# URI for upstream lightning package (when it is available)
+#${MOZ_HTTP_URI/${PN}/calendar/lightning}/${MOZ_LIGHTNING_VER}/linux/lightning.xpi -> lightning-${MOZ_LIGHTNING_VER}.xpi
+PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/{${PATCH},${PATCHFF}}.tar.xz )
+SRC_URI="${SRC_URI}
+	${MOZ_HTTP_URI}/${MOZ_PV}/source/${MOZ_P}.source.tar.xz
+	https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz
+	lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.tar.xz )
+	crypt? ( http://www.enigmail.net/download/source/enigmail-${EMVER}.tar.gz )
+	${PATCH_URIS[@]}"
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+CDEPEND="
+	>=dev-libs/nss-3.21
+	>=dev-libs/nspr-4.11
+	!x11-plugins/enigmail
+	crypt?  ( || (
+		( >=app-crypt/gnupg-2.0
+			|| (
+				app-crypt/pinentry[gtk]
+				app-crypt/pinentry[qt4]
+			)
+		)
+		=app-crypt/gnupg-1.4*
+	) )"
+
+DEPEND="${CDEPEND}
+	amd64? ( ${ASM_DEPEND}
+		virtual/opengl )
+	x86? ( ${ASM_DEPEND}
+		virtual/opengl )"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-thunderbird )
+"
+
+S="${WORKDIR}/${MOZ_P}"
+
+BUILD_OBJ_DIR="${S}/tbird"
+
+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
+}
+
+pkg_pretend() {
+	# Ensure we have enough disk space to compile
+	CHECKREQS_DISK_BUILD="4G"
+	check-reqs_pkg_setup
+
+	if use jit && [[ -n ${PROFILE_IS_HARDENED} ]]; then
+		ewarn "You are emerging this package on a hardened profile with USE=jit enabled."
+		ewarn "This is horribly insecure as it disables all PAGEEXEC restrictions."
+		ewarn "Please ensure you know what you are doing.  If you don't, please consider"
+		ewarn "emerging the package with USE=-jit"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+
+	# this version of lightning is a .tar.xz, no xpi needed
+	#xpi_unpack lightning-${MOZ_LIGHTNING_VER}.xpi
+
+	# this version of gdata-provider is a .tar.xz , no xpi needed
+	#use lightning && xpi_unpack gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.xpi
+}
+
+src_prepare() {
+	# Apply our Thunderbird patchset
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	EPATCH_EXCLUDE="2001_ldap_respect_cflags.patch" \
+	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
+
+#	EPATCH_EXCLUDE="8010_bug114311-freetype26.patch
+#			8011_bug1194520-freetype261_until_moz43.patch" \
+
+	# Ensure that are plugins dir is enabled as default
+	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
+		"${S}"/mozilla/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
+	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
+		"${S}"/mozilla/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
+
+	# Don't exit with error when some libs are missing which we have in
+	# system.
+	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+		-i "${S}"/mail/installer/Makefile.in || die
+
+	# 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
+
+	# Confirm the version of lightning being grabbed for langpacks is the same
+	# as that used in thunderbird
+	local THIS_MOZ_LIGHTNING_VER=$(python "${S}"/calendar/lightning/build/makeversion.py ${PV})
+	if [[ ${MOZ_LIGHTNING_VER} != ${THIS_MOZ_LIGHTNING_VER} ]]; then
+		eqawarn "The version of lightning used for localization differs from the version"
+		eqawarn "in thunderbird.  Please update MOZ_LIGHTNING_VER in the ebuild from ${MOZ_LIGHTNING_VER}"
+		eqawarn "to ${THIS_MOZ_LIGHTNING_VER}"
+	fi
+
+	eautoreconf
+	# Ensure we run eautoreconf in mozilla to regenerate configure
+	cd "${S}"/mozilla || die
+	eautoconf
+	cd "${S}"/mozilla/js/src || die
+	eautoconf
+}
+
+src_configure() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	MEXTENSIONS="default"
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	# We want rpath support to prevent unneeded hacks on different libc variants
+	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}"
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Add full relro support for hardened
+	use hardened && append-ldflags "-Wl,-z,relro,-z,now"
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+	mozconfig_annotate '' --disable-mailnews
+	mozconfig_annotate '' --enable-calendar
+
+	# Other tb-specific settings
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+	mozconfig_annotate '' --with-user-appdir=.thunderbird
+
+	mozconfig_use_enable ldap
+
+	mozlinguas_mozconfig
+
+	# Bug #72667
+	if use mozdom; then
+		MEXTENSIONS="${MEXTENSIONS},inspector"
+	fi
+
+	# Use an objdir to keep things organized.
+	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${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
+	fi
+
+	if use crypt; then
+		pushd "${WORKDIR}"/enigmail &>/dev/null ||die
+		econf
+		popd &>/dev/null ||die
+	fi
+}
+
+src_compile() {
+	mkdir -p "${BUILD_OBJ_DIR}" && cd "${BUILD_OBJ_DIR}" || die
+
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
+	emake -f "${S}"/client.mk
+
+	# Only build enigmail extension if crypt enabled.
+	if use crypt ; then
+		einfo "Building enigmail"
+		pushd "${WORKDIR}"/enigmail &>/dev/null || die
+		emake -j1
+		emake -j1 xpi
+		popd &>/dev/null || die
+	fi
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	DICTPATH="\"${EPREFIX}/usr/share/myspell\""
+
+	declare emid
+	cd "${BUILD_OBJ_DIR}" || die
+
+	# Copy our preference before omnijar is created.
+	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js-1 \
+		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
+
+	# Set default path to search for dictionaries.
+	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
+		>> "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
+
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
+	emake DESTDIR="${D}" install
+
+	# 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
+
+	local emid
+	# stage extra locales for lightning and install over existing
+	mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/lightning \
+		"${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
+
+	emid='{e2fda1a4-762b-4020-b5ad-a41df1933103}'
+	mkdir -p "${T}/${emid}" || die
+	cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/lightning/* || die
+	insinto ${MOZILLA_FIVE_HOME}/distribution/extensions
+	doins -r "${T}/${emid}"
+
+	if use lightning; then
+		# move lightning out of distribution/extensions and into extensions for app-global install
+		mv "${ED}"/${MOZILLA_FIVE_HOME}/{distribution,}/extensions/${emid} || die
+
+		# stage extra locales for gdata-provider and install app-global
+		mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider \
+			"${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}
+		emid='{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}'
+		mkdir -p "${T}/${emid}" || die
+		cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider/* || die
+		insinto ${MOZILLA_FIVE_HOME}/extensions
+		doins -r "${T}/${emid}"
+	fi
+
+	if use crypt ; then
+		local enigmail_xpipath="${WORKDIR}/enigmail/build"
+		cd "${T}" || die
+		unzip "${enigmail_xpipath}"/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 "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
+		unzip "${enigmail_xpipath}"/enigmail*.xpi || die
+	fi
+
+	# Required in order for jit to work on hardened, for mozilla-31 and above
+	use jit && pax-mark pm "${ED}"${MOZILLA_FIVE_HOME}/{thunderbird,thunderbird-bin}
+
+	# 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
+
+	if use minimal; then
+		rm -r "${ED}"/usr/include "${ED}"${MOZILLA_FIVE_HOME}/{idl,include,lib,sdk} || \
+			die "Failed to remove sdk and headers"
+	fi
+}
+
+pkg_postinst() {
+	if use crypt; then
+		local peimpl=$(eselect --brief --colour=no pinentry show)
+		case "${peimpl}" in
+		*gtk*|*qt*) ;;
+		*)	ewarn "The pinentry front-end currently selected is not one supported by thunderbird."
+			ewarn "You may be prompted for your password in an inaccessible shell!!"
+			ewarn "Please use 'eselect pinentry' to select either the gtk or qt front-end"
+			;;
+		esac
+	fi
+	elog
+	elog "If you experience problems with plugins please issue the"
+	elog "following command : rm \${HOME}/.thunderbird/*/extensions.sqlite ,"
+	elog "then restart thunderbird"
+	if ! use lightning; then
+		elog
+		elog "If calendar fails to show up in extensions please open config editor"
+		elog "and set extensions.lastAppVersion to 38.0.0 to force a reload. If this"
+		elog "fails to show the calendar extension after restarting with above change"
+		elog "please file a bug report."
+	fi
+}