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

["Jory Pratt" <anarchy@gentoo.org>]

commit:     0be5580848501f4ed9b60908c45159aa8af63b01
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 22 01:26:29 2013 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Mon Apr 22 01:26:29 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=0be55808

Move to new hunspell patch in esr builds

---
 mail-client/thunderbird/Manifest                   |    8 +-
 ...-17.0.5.ebuild => thunderbird-17.0.5-r1.ebuild} |    8 +-
 .../thunderbird/thunderbird-19.0_beta1.ebuild      |  342 --------------------
 www-client/firefox/Manifest                        |    6 +-
 ...efox-17.0.5.ebuild => firefox-17.0.5-r1.ebuild} |    7 +-
 www-client/firefox/firefox-20.0.1-r1.ebuild        |    4 +-
 6 files changed, 20 insertions(+), 355 deletions(-)

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 5a37c88..6bd58ac 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -1,10 +1,8 @@
 AUX icon/thunderbird-unbranded.desktop 280 SHA256 3693d0b91739c01f838d53955f8c3fd9906347a9dde2338d94d7f2a169cd4a46 SHA512 2e478cc3fb9a58bf9b388ecf971510e35569de5222c86ed37783a2476fdeef1f4c30f0f0e3470ce7cd4271fe347115a01a8ee1f1b072e534017538b052660e9e WHIRLPOOL 98f72b08c4f8e88f949283b9f32ac5a978d7c2e718d00632236e2c0e53d5fb9155d91d99f4ab5f61b03225a70f669bfcc48c38c33b968e5a0482ee4de1822d49
 AUX icon/thunderbird.desktop 270 SHA256 e8756ac8a421ac18f28b3620b2a021199f3bc4a3a9c566479a9b6697a5305dea SHA512 0241d04d95eb8defe6c3e875bb3de8821c0f101e98d53779551c3e6ef379d36483ca8f37e50394da8e53e45535597df1c3a6fed91f5efc5fdb9bf5da75e0e586 WHIRLPOOL 46e643eb58698cc9d9d9488e65e222f2ab6061ef91a025d29b67b29cbb9a5f5994e58460b0ad6b40162a80b7f71122148830affdcc29aa79f149c3fc4f74143d
 AUX thunderbird-gentoo-default-prefs-1.js-1 426 SHA256 b5aba51045c700ae4d465e079f3e776600d4950806212f7c2fe1841fa25cf9d6 SHA512 b40e7b4789b7f43c382589f7d0eaa6043072bce86ab79fb3dda4800e9ab6a43af11f43b0cb3b6ab1c71d887aa1cf9356ac858f0a81dad013cef5b8a4b2107983 WHIRLPOOL cc3535e9a710d55c5386db51d7bd6ca24f6b36685a54e42d049a806fe99fd0b08afe7998d1478036bfa306129616778b8ac1386e14649646fc0a7ae4d37b830d
-DIST enigmail-1.5.0.tar.gz 1216071 SHA256 51f55573448586718c8d7e664329d519b02c4b28af4910bcb550961ace9a9e71 SHA512 274de265c3c042089050d155b0a3409d8e87f13044b9eb7eba1d07a162b2b300b9df223d60e851e1822a722ef4bde1389c0289bf9e2b083cca250798a5ef4935 WHIRLPOOL 10809566050268d43f4c1b528d5c0b34c4f838a4fbc4c2d0ca89389c463449a0a356f54e33e72832095bd6b53649d9a12868de7a237b60a37e041c9050b7d09b
 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-19.0-patches-0.3.tar.xz 8864 SHA256 d67313a6bdd7ff9640c3d353983c978d2caba77819ddc431a7b0885199569148 SHA512 6f0fbf1ccc43b0e9297e109e42105915ed66163a68912d714afbf4ca53897dfdac22a7267534dc42b3ffd105dadb9926f3d2bc5c3b57aa098a34095a092b4457 WHIRLPOOL 73d41b22260c2b44222c0a541567382d3d45f66f21cfa6448c7ed0c93f6b398e084d3509a74ebfda1d7d48c844e93e9bffe1132f4e2d268dd2025b181c020078
+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
@@ -61,6 +59,4 @@ DIST thunderbird-17.0.5esr-vi.xpi 478454 SHA256 b48c5fa9fe9d3c7719e45955730e01fe
 DIST thunderbird-17.0.5esr-zh-CN.xpi 436082 SHA256 0c775bc64658bfd657a1125e776b529a6097c25dd760e8ef74e8e9ac58065d04 SHA512 f827cbd42865ed5395a1121902d835c00395559db32b7328febc301122d365edd0daafc805457ec81667165017fca75c3dd88e7befd0cbcb4b8f998c6aefce5e WHIRLPOOL fee45c4d16c40fd7ab96885de2a07fbacea53906eb0934187a810a4227639f91b469815e393f0bcfb2f1313d089ce23649f524b9ec6cc95472609f7272d7f71e
 DIST thunderbird-17.0.5esr-zh-TW.xpi 437591 SHA256 194b9a773cdf8a078b11928e56807b58a111d849af272116c8323d5c147ceb69 SHA512 acba4f4e5fe86c17c10c333b5a70fce7220d6161141f307d9ecc410185c8de8fc23db2445955e615d6eecfd2af75ca5b43ea0bc8d737bf2a8d8f33938823cb5a WHIRLPOOL e43115377eb2345d6b27789e382f368e76fa733352e4a5d1c8ffc12b460d13775da2a97af8df79f754a9f2ad57631ec85d8775a1e366210dab96f599b6c53b9e
 DIST thunderbird-17.0.5esr.source.tar.bz2 113259410 SHA256 d8a6ff5c35fb030514d24eb7b6e224cb0dc69dce85051a2d03952d5308bc67f6 SHA512 a8419129f97be1d628935da2a10de6af955c0976aa100d7731cf925003c45cdf2711491747c724f23fb37d4d5752dea29d51c3c782a729d4d6f7d331905056ab WHIRLPOOL 0f90e02f43148b31eddf8a22b8b5af29d9e37484a17c8efaefa318657b3a8bfda806a65052c3d5b15f1490dbc6cf426bcc77915c1a88ca1fb4447fc641fa14d8
-DIST thunderbird-19.0b1.source.tar.bz2 121440940 SHA256 e200382789f1af417065a0f523902b660e1b7e03e31e3059adcc98db827df158 SHA512 33a49be10289040c883d20b23bbd4fd26662e1dd6edcbb1d4430a5050b1eda69a3b58b5af6e030f127b155470eef82eb8202c45e53148dd46a987af212faefff WHIRLPOOL e968ee90f31836321b56bcb9f3b69921c7e90a1d68330f1e33256d307abc39434b58995052e8da651ba5d8c407cc4703be9f315a06ae2ab3583702abe834e341
-EBUILD thunderbird-17.0.5.ebuild 10643 SHA256 08b4da03419b74af18805bfe8ad1702b597b223b95a56281faf87fb28d59e28f SHA512 40439ffaeb959678a24e6e14b51a95b11f4507d85a2c7e33cd6bd25800cd62fb7789192d71f2844f896cc637aaeffafed2166504ba79123a34e702afad119aee WHIRLPOOL 90487cd96734fefd290afa92a29d60ba2ef70af4f1929af0c8beff9e26af85660c0b73e13e485715b60e57cbaa249f2eaff44a771b918ba8e8bf1193da39d81c
-EBUILD thunderbird-19.0_beta1.ebuild 10591 SHA256 b1ae0cfe0a21fb45268326fc68e04f40910e1e393795ef7bf1c1dc9ee92acc65 SHA512 d3aeb6d9aeff1ed9a6ae72930dd3967e9cc6d51caf77c48028149b513c33c985bc1a98585ef708d4fd87dc486ad9b63ae3e62ad7d3577f5202e1430c98a67929 WHIRLPOOL 9700bdd6c152ee045a7a49de7386be9ec26663cf03fd02f0e36f64b4a1c052d61f80839f0521c4d840be25768a492bc63d29da38df4fdb919e06e305163f4f2b
+EBUILD thunderbird-17.0.5-r1.ebuild 10876 SHA256 1b1050ff36d679a56a0af735149152c07caad998f4e5c279f38f1c18d23d4ad4 SHA512 3891451c4ac03b92e75b76c0eddbc3a9b1d0ed033e3b55bdef79beabf063c91889319ab52075cd9d522b73bf3278bbc9d28b48086ab7ac5725065c778e29976d WHIRLPOOL 7e5ee1212ebbe47bf4ddbb108642b79117dcbc7753fb1b30c9eaa0720a1257b56d3d315b668ee0c948c4ff8a3dbcb7b5a4bb60f09415841426286d9b24fc27d3

diff --git a/mail-client/thunderbird/thunderbird-17.0.5.ebuild b/mail-client/thunderbird/thunderbird-17.0.5-r1.ebuild
similarity index 97%
rename from mail-client/thunderbird/thunderbird-17.0.5.ebuild
rename to mail-client/thunderbird/thunderbird-17.0.5-r1.ebuild
index d07fd0b..42d4ece 100644
--- a/mail-client/thunderbird/thunderbird-17.0.5.ebuild
+++ b/mail-client/thunderbird/thunderbird-17.0.5-r1.ebuild
@@ -37,7 +37,7 @@ 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.5"
+PATCHFF="firefox-17.0-patches-0.6"
 
 SRC_URI="${SRC_URI}
 	${MOZ_FTP_URI}${MOZ_PV}/source/${MOZ_P}.source.tar.bz2
@@ -253,6 +253,8 @@ src_compile() {
 
 src_install() {
 	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	DICTPATH="\"${EPREFIX}/usr/share/myspell\""
+
 	declare emid
 	local obj_dir="tbird"
 	cd "${S}/${obj_dir}"
@@ -261,6 +263,10 @@ src_install() {
 	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.

diff --git a/mail-client/thunderbird/thunderbird-19.0_beta1.ebuild b/mail-client/thunderbird/thunderbird-19.0_beta1.ebuild
deleted file mode 100644
index baee0a5..0000000
--- a/mail-client/thunderbird/thunderbird-19.0_beta1.ebuild
+++ /dev/null
@@ -1,342 +0,0 @@
-# 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.5.0"
-# 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 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 system-jpeg"
-
-PATCH="thunderbird-17.0-patches-01"
-PATCHFF="firefox-19.0-patches-0.3"
-
-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-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-sqlite? ( || (
-		>=dev-db/sqlite-3.7.16:3[secure-delete,debug=]
-		~dev-db/sqlite-3.7.15.2[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
-	mozconfig_use_with system-jpeg
-	# 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,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"
-}

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 666fa3b..f71ff2a 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -3,7 +3,7 @@ AUX firefox-14.0_beta7-gst-youtube-h264.patch 1437 SHA256 9b871769727e6d16939c55
 AUX firefox-15.0-fix-gstreamer-html5-crash.patch 1094 SHA256 1fa2a1963ef3146ef71a51affc46179fdae5fcd5a4bfdf5acb3da0f035b482f2 SHA512 42b8fc013ee061f9b7c00d347fe2712c2a1110574f578ae815dd4b5287dfa27b5643c74d41f2e2913d147017026d61f8b7a3603b2a40586f30f0e70c41f6af74 WHIRLPOOL dae601e40e1e9cfcb9775313ef5f5b57af40124a64e204261ef6de05b01533df36e28e333356ba2d09ada996e82a882ef492fa0efbd4c7cc06572dde16d83346
 AUX gentoo-default-prefs.js-1 823 SHA256 fed1c9624330ce31b1395ac8852f58abdc91d6d341923a5af886f441936fab56 SHA512 82ba3329df760ead8573598d40e82e4c2c008227acb03793017f4f92508c8b66452e89b30b5a39a3820a1e8b752a23de1f9278b8549ebc871318ef24a300f7dc WHIRLPOOL 1b793f6b812ecc7f880dd3475a38b67170100a5f3408f1e5a1629baafaee5ed605e49896b485000a28d3bede21cf314366930b19c69fa83866925a225f744761
 AUX icon/firefox.desktop 276 SHA256 06565ade11b6e4b448cf10339696c43f31e73cb6824491094bb6e0ab902c7cf5 SHA512 3ab9aa94d3006518fb154c887e9be99fd372a75ac128b8d37debe5d72f26fb7103dd36f75bb6111750e93d520b730a29a8118805fe84be8f3021e4528c0ec47e WHIRLPOOL 9722c40c167bb1a76e7a81e3b1aedbb3cd10a09e00361fe1678883feff33e1d9ce31379f150a757d8b2667715175c2bbc16a714164d02210b4284ee91a25f8f5
-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 firefox-17.0.5esr-af.xpi 281146 SHA256 1c7f0f11ea1efad528253c5d399a31ab3cc87f6faa2a7057a6fcbbde938758d0 SHA512 ed6609965b3bdd626b0fec72fae636c15ae639cd136b74cb517e689dc582809e7ced27a293f7ff8a5657dccfede238a44fbcb70b3ba281944bcf5a55bb3ce73c WHIRLPOOL 5f4d144b5f8449e4025dea7bb7f481d91151b38b510298ed5681bcfaa05e65b350f29ee8d186d7466417998f08e3383b34a3bec70e6d3ec58e391c085f7b0ffa
 DIST firefox-17.0.5esr-ak.xpi 282977 SHA256 721c1702014423530e3ae07d8488873287f99847f9d7ba3f41993c2185a733af SHA512 e7e0026d0ff91b257053eb9d5aeec043ca249f28b755d7a8ffa3a21b74052ed070b7852d857de33707811351c731fee419e431b0af6a24133f9a27b9f05cf5e5 WHIRLPOOL c79e4cfd0f98884ff94bd7c4c3b8553ce3d9378cf549ca45e1dc88bf32b988aa20c39fe798c703868dc1a593c9490b432a1b08fd5afe001105bd4726a65dbd1a
 DIST firefox-17.0.5esr-ar.xpi 311507 SHA256 64eb3ae88ea63f1c338b0e1f4ec4028235b821cddf64f529d2e7cc4a1c94dd67 SHA512 fec6cd51b525b451c0926ff0fa02e2f5ceb011b2bbb7cc0f0617ca5cae27146785c78eb2a4640c73d7a316a42f7b26300ac8be17e1cf0fe66b763f2b9da18fc4 WHIRLPOOL 38a8604b25905bbfd6a0e2ad2e519d0070a7bebe5375113a388b274541289bf1d8c56b6c9e5b7d5c695d32f8c80e97f5e9436bcc184dc7b9aac8110389df8c04
@@ -177,5 +177,5 @@ DIST firefox-20.0.1-zh-CN.xpi 323634 SHA256 3295c15305e26ec31b8bc3b44be338ec3a74
 DIST firefox-20.0.1-zh-TW.xpi 324198 SHA256 c6d6da4e2d86252c099427a7a9ac8188fb195a41d3d4a2dfd2014cb57353675e SHA512 dba1f45aadd28dcdf0a7934736915852b2749cc59c9f41ecd71595151997d8390156cbbec6339d3b5ce7a0bdd13107cb0c175d57c16444fcf32d42cc0dbf72db WHIRLPOOL f0c776267e0f7edc15bf54987edfecd50d61ea942488dd3020751f8e915bd4db60d0ac24f204a2ddfa10f3ebe58ba746c6ad5578181c57c4c3112f427fb8e1ba
 DIST firefox-20.0.1-zu.xpi 315412 SHA256 67cf6d8ba1c3fef4a78f22380c7e7ce0f04822e707d2b3c1f57bb11c00e1f314 SHA512 37b5080322819d3a18fcdd6fff24ccb323a5f0fe5c6e0f67dd9ba8fa6cdde1c9f55e4a5ec97377cff357dda915e077bb0289e5625174b210b063243b5841b342 WHIRLPOOL 0077b9dafbd40455788bfb689eefea88528c96ebd9a326e770c0caeef258c44600fee1a4e278f1fb31d53b10a3218c765d3ade421050fee478b421f4baf61a43
 DIST firefox-20.0.1.source.tar.bz2 100154949 SHA256 03fe28c82d6577e9af8659f2ee44d5f05950353732d47a0ade562855ba564cf4 SHA512 07b280de2f48ae994e74945011da45d4737a9e17b4d4377725f6968598d992e6dd6c6929690815bf4bb554499a3e4fe17bfef652c3d762caa2e8af100a5d0359 WHIRLPOOL c385c1da6b9252983fd9bf3d2cce505032d2cc2a343a0846a0807fe658d37874152a51903b23aa36a04a67ebf6e3a7fdfaccf934256bf478068a43a71f735bc4
-EBUILD firefox-17.0.5.ebuild 11771 SHA256 55badf96f2e515e1c80544c40e61cfee3534cb0745bbe492633442ab5d3e8bb2 SHA512 e941e0379fec82d2358ba8d451f6332e3b6986394122f23a5b36ecfcdb361604fccdae278d36927f314a2d467010a050f3315e78a741f0c80ea9ebf81cbd7e17 WHIRLPOOL 940dbb62e589b40aff7a7d1e815e9720d029c6da53d09ca524deed2eac2d39ab7cb1c5368c4625d8dce2c5487771e83e299369a7248171c47b8b64ae5494e66b
-EBUILD firefox-20.0.1-r1.ebuild 11700 SHA256 401e2b92e7c7f73cc4ca774a2ab66391ed4cebc06cb066357b8b3483cccfca64 SHA512 6e3b59e8bdeab25e89b87ef2a647db5eccff9e79a8024ca4f942e864deb1d13be8f23c0241267b8906f584f7bc1410bcde7037a4b770a60cd653af858d3191f9 WHIRLPOOL 45a3c6bcd481ea66bfd143844edb1b160b6a4c5970f8ba579e0e757b50d7201458c94fb903332a3f030e4426e928130bab762c21f0192ac02b75f68e60f406eb
+EBUILD firefox-17.0.5-r1.ebuild 11995 SHA256 56bda12b3558a84d8b2de4b2cfc9f80f0134d35c3fe45a0e23f9115b625ca29b SHA512 b23b3279032a6031855240cbe251a07bc738f0fd54824d6689b67639c54d464a54084c9fd1c27d96e257bf4cda54e19dfc37011e4780582e6dbede2848225f8e WHIRLPOOL 08b2b681e816b6a7b9d204da97a84280e59359ba6ede6287c9582ef843937a51e3b49d8c1090c55e9c643bfbde214fb9d2c599b6a3f4f97bf48a2626d6d3d917
+EBUILD firefox-20.0.1-r1.ebuild 11714 SHA256 86cfb0941bb092c1f38b8a28ecaa2a463403530e66928fd70482d840cea32f8f SHA512 d8703be903566862f4ab67c1d199ba60bb737f127286aa761faf1457f0d9127ac87d6258256f9bb0539afaba0f185e7710becf49ce588e083c5824c60f15ad1f WHIRLPOOL 2e0276a9a6b95b1aba88230cfcf3353d56b0dfc7c9889bf2e16d41b415ce8198dcde84f29eaf3979fbd467d4aa820c22d774920af188c906689fb1f79809c226

diff --git a/www-client/firefox/firefox-17.0.5.ebuild b/www-client/firefox/firefox-17.0.5-r1.ebuild
similarity index 97%
rename from www-client/firefox/firefox-17.0.5.ebuild
rename to www-client/firefox/firefox-17.0.5-r1.ebuild
index 4e70bfe..b5ad6c6 100644
--- a/www-client/firefox/firefox-17.0.5.ebuild
+++ b/www-client/firefox/firefox-17.0.5-r1.ebuild
@@ -25,7 +25,7 @@ if [[ ${MOZ_ESR} == 1 ]]; then
 fi
 
 # Patch version
-PATCH="${PN}-17.0-patches-0.5"
+PATCH="${PN}-17.0-patches-0.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/"
@@ -281,6 +281,7 @@ src_compile() {
 
 src_install() {
 	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	DICTPATH="\"${EPREFIX}/usr/share/myspell\""
 
 	# MOZ_BUILD_ROOT, and hence OBJ_DIR change depending on arch, compiler, pgo, etc.
 	local obj_dir="$(echo */config.log)"
@@ -297,6 +298,10 @@ src_install() {
 	cp "${FILESDIR}"/gentoo-default-prefs.js-1 \
 		"${S}/${obj_dir}/dist/bin/defaults/preferences/all-gentoo.js" || die
 
+	# Set default path to search for dictionaries.
+	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
+		>> "${S}/${obj_dir}/dist/bin/defaults/pref/all-gentoo.js" || die
+
 	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
 	emake DESTDIR="${D}" install || die "emake install failed"
 

diff --git a/www-client/firefox/firefox-20.0.1-r1.ebuild b/www-client/firefox/firefox-20.0.1-r1.ebuild
index d69e75f..4372902 100644
--- a/www-client/firefox/firefox-20.0.1-r1.ebuild
+++ b/www-client/firefox/firefox-20.0.1-r1.ebuild
@@ -295,11 +295,11 @@ src_install() {
 
 	# Set default path to search for dictionaries.
 	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
-		>> "${S}/${obj_dir}/dist/bin/defaults/pref/all-gentoo.js"
+		>> "${S}/${obj_dir}/dist/bin/defaults/pref/all-gentoo.js" || die
 
 	if ! use libnotify; then
 		echo "pref(\"browser.download.manager.showAlertOnComplete\", false);" \
-			>> "${S}/${obj_dir}/dist/bin/defaults/pref/all-gentoo.js"
+			>> "${S}/${obj_dir}/dist/bin/defaults/pref/all-gentoo.js" || die
 	fi
 
 	echo "pref("extensions.autoDisableScopes", 3);" >> \