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

[Ian Stakenvicius]

commit:     558747f9bfc4812b25b44c1d5790eb786361350d
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  4 20:18:12 2014 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Fri Sep  5 19:43:20 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=558747f9

Moved more common deps and configuration bits to mozconfig eclass

- sync'ed dependency atoms to firefox-31 cosebase, confirmed no changes to deps in firefox-32 codebase
- moved system-* use flags to the eclass
- moved most of the common mozconfig- calls to the eclass
- set the eclass name to include the major version suffix
- added a seamonkey-2.29_beta2 ebuild which uses mozconfig-v4.31

---
 ...ozconfig-v4.1.eclass => mozconfig-v4.31.eclass} |  71 +++++++++-
 eclass/mozconfig-v4.eclass                         | 113 ----------------
 ...-31.1.0.ebuild => thunderbird-31.1.0-r1.ebuild} |  46 +------
 ...efox-31.1.0.ebuild => firefox-31.1.0-r1.ebuild} |  55 ++------
 ...{firefox-32.0.ebuild => firefox-32.0-r1.ebuild} |  47 +------
 www-client/seamonkey/Manifest                      |  56 ++++----
 ....26_pre1.ebuild => seamonkey-2.29_beta2.ebuild} | 149 +++++++++------------
 7 files changed, 177 insertions(+), 360 deletions(-)

diff --git a/eclass/mozconfig-v4.1.eclass b/eclass/mozconfig-v4.31.eclass
similarity index 64%
rename from eclass/mozconfig-v4.1.eclass
rename to eclass/mozconfig-v4.31.eclass
index 2d8e459..30d6c32 100644
--- a/eclass/mozconfig-v4.1.eclass
+++ b/eclass/mozconfig-v4.31.eclass
@@ -1,10 +1,14 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-v4.eclass,v 1.3 2014/08/01 16:32:16 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-v4.1.eclass,v 1.1 2014/09/03 21:52:44 axs Exp $
 #
 # mozconfig-v4.1.eclass: the new mozilla.eclass
 
-inherit multilib flag-o-matic mozcoreconf-2
+inherit multilib flag-o-matic toolchain-funcs mozcoreconf-2
+
+case ${EAPI} in
+	0|1|2|3|4) die "EAPI=${EAPI} not supported"
+esac
 
 # @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_WIFI
 # @DESCRIPTION:
@@ -27,19 +31,43 @@ inherit multilib flag-o-matic mozcoreconf-2
 # Set the variable to any value if the use flag should exist but not be default-enabled.
 
 # use-flags common among all mozilla ebuilds
-IUSE="dbus debug startup-notification"
+IUSE="dbus debug gstreamer pulseaudio startup-notification system-cairo system-icu system-jpeg system-sqlite"
+
+# some notes on deps:
+# gtk:2 minimum is technically 2.10 but gio support (enabled by default) needs 2.14
+# media-libs/mesa needs to be 10.2 or above due to a bug with flash+vdpau
 
 RDEPEND=">=app-text/hunspell-1.2
+	dev-libs/atk
 	dev-libs/expat
 	>=dev-libs/libevent-1.4.7
-	>=x11-libs/cairo-1.12[X]
-	>=x11-libs/gtk+-2.10:2
+	>=x11-libs/cairo-1.10[X]
+	>=x11-libs/gtk+-2.14:2
+	x11-libs/gdk-pixbuf
 	>=x11-libs/pango-1.22.0
+	>=media-libs/libpng-1.6.10:0=[apng]
+	>=media-libs/libvpx-1.3.0
+	>=media-libs/mesa-10.2:*
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
 	kernel_linux? ( media-libs/alsa-lib )
+	pulseaudio? ( media-sound/pulseaudio )
 	virtual/freedesktop-icon-theme
-	dbus? ( >=dev-libs/dbus-glib-0.72 )
+	dbus? ( >=sys-apps/dbus-0.60
+		>=dev-libs/dbus-glib-0.72 )
 	startup-notification? ( >=x11-libs/startup-notification-0.8 )
-	>=dev-libs/glib-2.26:2"
+	>=dev-libs/glib-2.26:2
+	virtual/libffi
+	gstreamer? ( media-plugins/gst-plugins-meta:1.0[ffmpeg] )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXt
+	system-cairo? ( >=x11-libs/cairo-1.12[X] >=x11-libs/pixman-0.19.2 )
+	system-icu? ( >=dev-libs/icu-51.1 )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
+	system-sqlite? ( >=dev-db/sqlite-3.8.4.2:3[secure-delete,debug=] )
+"
 
 if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]]; then
 	if [[ ${MOZCONFIG_OPTIONAL_WIFI} = "enabled" ]]; then
@@ -62,6 +90,8 @@ fi
 
 DEPEND="app-arch/zip
 	app-arch/unzip
+	virtual/pkgconfig
+	>=sys-devel/binutils-2.16.1
 	${RDEPEND}"
 
 # @FUNCTION: mozconfig_config
@@ -128,9 +158,36 @@ mozconfig_config() {
 	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${EPREFIX}"/usr
 	mozconfig_annotate '' --x-includes="${EPREFIX}"/usr/include --x-libraries="${EPREFIX}"/usr/$(get_libdir)
 	mozconfig_annotate '' --with-system-libevent="${EPREFIX}"/usr
+	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
+	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
 	mozconfig_annotate '' --enable-system-hunspell
 	mozconfig_annotate '' --disable-gnomevfs
 	mozconfig_annotate '' --disable-gnomeui
 	mozconfig_annotate '' --enable-gio
 	mozconfig_annotate '' --disable-crashreporter
+	mozconfig_annotate '' --with-system-png
+	mozconfig_annotate '' --enable-system-ffi
+	mozconfig_annotate '' --disable-gold
+	mozconfig_annotate '' --disable-gconf
+
+	# We must force enable jemalloc 3 threw .mozconfig
+	echo "export MOZ_JEMALLOC=1" >> "${S}"/.mozconfig || die
+	mozconfig_annotate '' --enable-jemalloc
+	mozconfig_annotate '' --enable-replace-malloc
+
+	mozconfig_annotate '' --target="${CTARGET:-${CHOST}}"
+	mozconfig_annotate '' --build="${CTARGET:-${CHOST}}"
+
+	if use gstreamer; then
+		mozconfig_annotate '+gstreamer' --enable-gstreamer=1.0
+	else
+		mozconfig_annotate '' --disable-gstreamer
+	fi
+	mozconfig_use_enable pulseaudio
+
+	mozconfig_use_enable system-cairo
+	mozconfig_use_enable system-sqlite
+	mozconfig_use_with system-jpeg
+	mozconfig_use_with system-icu
+	mozconfig_use_enable system-icu intl-api
 }

diff --git a/eclass/mozconfig-v4.eclass b/eclass/mozconfig-v4.eclass
deleted file mode 100644
index 0a0e941..0000000
--- a/eclass/mozconfig-v4.eclass
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-v4.eclass,v 1.3 2014/08/01 16:32:16 axs Exp $
-#
-# mozconfig-v4.eclass: the new mozilla.eclass
-
-inherit multilib flag-o-matic mozcoreconf-2
-
-# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_WIFI
-# @DESCRIPTION:
-# Set this variable before the inherit line, when an ebuild needs to provide
-# optional necko-wifi support via IUSE="wifi".  Currently this would include
-# ebuilds for firefox, and potentially seamonkey.
-#
-# Leave the variable UNSET if necko-wifi support should not be available.
-
-# @FUNCTION: mozconfig_config
-# @DESCRIPTION:
-# Set common configure options for mozilla packages.
-# Call this within src_configure() phase, after mozconfig_init
-#
-# Example:
-#
-# inherit mozconfig-v4
-#
-# src_configure() {
-# 	mozconfig_init
-# 	mozconfig_config
-#	# ... misc ebuild-unique settings via calls to
-#	# ... mozconfig_{annotate,use_with,use_enable}
-#	mozconfig_final
-# }
-
-# use-flags common among all mozilla ebuilds
-IUSE="dbus debug startup-notification"
-
-RDEPEND=">=app-text/hunspell-1.2
-	dev-libs/expat
-	>=dev-libs/libevent-1.4.7
-	>=x11-libs/cairo-1.12[X]
-	>=x11-libs/gtk+-2.10:2
-	>=x11-libs/pango-1.22.0
-	kernel_linux? ( media-libs/alsa-lib )
-	virtual/freedesktop-icon-theme
-	dbus? ( >=dev-libs/dbus-glib-0.72 )
-	startup-notification? ( >=x11-libs/startup-notification-0.8 )
-	>=dev-libs/glib-2.26:2"
-
-if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]]; then
-IUSE+=" wifi"
-RDEPEND+="
-	wifi? ( >=sys-apps/dbus-0.60
-		>=dev-libs/dbus-glib-0.72
-		net-wireless/wireless-tools )"
-fi
-
-DEPEND="app-arch/zip
-	app-arch/unzip
-	${RDEPEND}"
-
-mozconfig_config() {
-
-	mozconfig_annotate '' --enable-default-toolkit=cairo-gtk2
-
-	if has bindist ${IUSE}; then
-		mozconfig_use_enable !bindist official-branding
-		if [[ ${PN} == firefox ]] && use bindist ; then
-			mozconfig_annotate '' --with-branding=browser/branding/aurora
-		fi
-	fi
-
-	mozconfig_use_enable debug
-	mozconfig_use_enable debug tests
-
-	if ! use debug ; then
-		mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
-	fi
-
-	mozconfig_use_enable startup-notification
-
-	if has wifi ${IUSE} ; then
-		# wifi pulls in dbus so manage both here
-		mozconfig_use_enable wifi necko-wifi
-		if use wifi && ! use dbus; then
-			echo "Enabling dbus support due to wifi request"
-			mozconfig_annotate 'dbus required by necko-wifi' --enable-dbus
-		else
-			mozconfig_use_enable dbus
-		fi
-	else
-		mozconfig_use_enable dbus
-		mozconfig_annotate 'disabled' --disable-necko-wifi
-	fi
-
-	mozconfig_annotate 'required' --enable-ogg
-	mozconfig_annotate 'required' --enable-wave
-
-	if has jit ${IUSE}; then
-		mozconfig_use_enable jit ion
-		mozconfig_use_enable jit yarr-jit
-	fi
-
-	# These are enabled by default in all mozilla applications
-	mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --x-includes="${EPREFIX}"/usr/include --x-libraries="${EPREFIX}"/usr/$(get_libdir)
-	mozconfig_annotate '' --with-system-libevent="${EPREFIX}"/usr
-	mozconfig_annotate '' --enable-system-hunspell
-	mozconfig_annotate '' --disable-gnomevfs
-	mozconfig_annotate '' --disable-gnomeui
-	mozconfig_annotate '' --enable-gio
-	mozconfig_annotate '' --disable-crashreporter
-}

diff --git a/mail-client/thunderbird/thunderbird-31.1.0.ebuild b/mail-client/thunderbird/thunderbird-31.1.0-r1.ebuild
similarity index 87%
rename from mail-client/thunderbird/thunderbird-31.1.0.ebuild
rename to mail-client/thunderbird/thunderbird-31.1.0-r1.ebuild
index ae53c19..f08def5 100644
--- a/mail-client/thunderbird/thunderbird-31.1.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-31.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-24.6.0.ebuild,v 1.2 2014/06/12 00:28:33 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-31.1.0.ebuild,v 1.1 2014/09/03 22:11:38 axs Exp $
 
 EAPI=5
 WANT_AUTOCONF="2.1"
@@ -30,7 +30,7 @@ MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/"
 MOZ_HTTP_URI="http://ftp.mozilla.org/pub/${PN}/releases/"
 
 MOZCONFIG_OPTIONAL_JIT="enabled"
-inherit flag-o-matic toolchain-funcs mozconfig-v4.1 makeedit multilib autotools pax-utils check-reqs nsplugins mozlinguas
+inherit flag-o-matic toolchain-funcs mozconfig-v4.31 makeedit multilib autotools pax-utils check-reqs nsplugins mozlinguas
 
 DESCRIPTION="Thunderbird Mail Client"
 HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
@@ -38,7 +38,7 @@ 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 gstreamer ldap +lightning +minimal mozdom pulseaudio selinux system-cairo system-icu system-jpeg system-sqlite"
+IUSE="bindist crypt ldap +lightning +minimal mozdom selinux"
 
 PATCH="thunderbird-31.0-patches-0.1"
 PATCHFF="firefox-31.0-patches-0.2"
@@ -62,18 +62,6 @@ ASM_DEPEND=">=dev-lang/yasm-1.1"
 RDEPEND="
 	>=dev-libs/nss-3.16.2
 	>=dev-libs/nspr-4.10.6
-	>=dev-libs/glib-2.26:2
-	>=media-libs/mesa-7.10
-	>=media-libs/libpng-1.6.6[apng]
-	virtual/libffi
-	gstreamer? ( media-plugins/gst-plugins-meta:1.0[ffmpeg] )
-	pulseaudio? ( media-sound/pulseaudio )
-	system-cairo? ( >=x11-libs/cairo-1.12[X] )
-	system-icu? ( >=dev-libs/icu-51.1 )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-sqlite? ( >=dev-db/sqlite-3.8.3.1:3[secure-delete,debug=] )
-	>=media-libs/libvpx-1.0.0
-	kernel_linux? ( media-libs/alsa-lib )
 	selinux? ( sec-policy/selinux-thunderbird )
 	!x11-plugins/enigmail
 	crypt?  ( || (
@@ -87,8 +75,6 @@ RDEPEND="
 	) )"
 
 DEPEND="${RDEPEND}
-	>=sys-devel/binutils-2.16.1
-	virtual/pkgconfig
 	amd64? ( ${ASM_DEPEND}
 		virtual/opengl )
 	x86? ( ${ASM_DEPEND}
@@ -206,37 +192,13 @@ src_configure() {
 	# 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 '' --enable-jemalloc
-	mozconfig_annotate '' --enable-replace-malloc
-	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
 	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	mozconfig_annotate '' --disable-gconf
 	mozconfig_annotate '' --disable-mailnews
-	mozconfig_annotate '' --with-system-png
-	mozconfig_annotate '' --enable-system-ffi
 
-	# Other ff-specific settings
+	# Other tb-specific settings
 	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
 	mozconfig_annotate '' --with-user-appdir=.thunderbird
-	mozconfig_annotate '' --target="${CTARGET:-${CHOST}}"
-	mozconfig_annotate '' --build="${CTARGET:-${CHOST}}"
 
-	# Use enable features
-	if use gstreamer ; then
-		mozconfig_annotate '' --enable-gstreamer=1.0
-	else
-		mozconfig_annotate '' --disable-gstreamer
-	fi
-	mozconfig_use_enable pulseaudio
-	mozconfig_use_enable system-cairo
-	mozconfig_use_enable system-sqlite
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-icu
-	mozconfig_use_enable system-icu intl-api
 	mozconfig_use_enable lightning calendar
 	mozconfig_use_enable ldap
 

diff --git a/www-client/firefox/firefox-31.1.0.ebuild b/www-client/firefox/firefox-31.1.0-r1.ebuild
similarity index 86%
rename from www-client/firefox/firefox-31.1.0.ebuild
rename to www-client/firefox/firefox-31.1.0-r1.ebuild
index 61d1c29..798c65d 100644
--- a/www-client/firefox/firefox-31.1.0.ebuild
+++ b/www-client/firefox/firefox-31.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-31.1.0.ebuild,v 1.1 2014/09/03 22:09:11 axs Exp $
 
 EAPI="5"
 VIRTUALX_REQUIRED="pgo"
@@ -34,7 +34,7 @@ MOZ_HTTP_URI="http://ftp.mozilla.org/pub/${PN}/releases/"
 MOZCONFIG_OPTIONAL_WIFI=1
 MOZCONFIG_OPTIONAL_JIT="enabled"
 
-inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-v4.1 multilib pax-utils fdo-mime autotools virtualx mozlinguas
+inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-v4.31 multilib pax-utils fdo-mime autotools virtualx mozlinguas
 
 DESCRIPTION="Firefox Web Browser"
 HOMEPAGE="http://www.mozilla.com/firefox"
@@ -42,7 +42,7 @@ HOMEPAGE="http://www.mozilla.com/firefox"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist gstreamer hardened +minimal pgo pulseaudio selinux system-cairo system-icu system-jpeg system-sqlite test"
+IUSE="bindist hardened +minimal pgo selinux test"
 
 # More URIs appended below...
 SRC_URI="${SRC_URI}
@@ -51,26 +51,12 @@ SRC_URI="${SRC_URI}
 
 ASM_DEPEND=">=dev-lang/yasm-1.1"
 
-# Mesa 7.10 needed for WebGL + bugfixes
 RDEPEND="
 	>=dev-libs/nss-3.16.2
 	>=dev-libs/nspr-4.10.6
-	>=media-libs/mesa-7.10
-	>=media-libs/libpng-1.6.7[apng]
-	virtual/libffi
-	gstreamer? ( media-plugins/gst-plugins-meta:1.0[ffmpeg] )
-	pulseaudio? ( media-sound/pulseaudio )
-	system-cairo? ( >=x11-libs/cairo-1.12[X] )
-	system-icu? ( >=dev-libs/icu-51.1 )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-sqlite? ( >=dev-db/sqlite-3.8.3.1:3[secure-delete,debug=] )
-	>=media-libs/libvpx-1.3.0
-	kernel_linux? ( media-libs/alsa-lib )
 	selinux? ( sec-policy/selinux-mozilla )"
 
 DEPEND="${RDEPEND}
-	>=sys-devel/binutils-2.16.1
-	virtual/pkgconfig
 	pgo? (
 		>=sys-devel/gcc-4.5 )
 	amd64? ( ${ASM_DEPEND}
@@ -137,6 +123,13 @@ pkg_pretend() {
 		CHECKREQS_DISK_BUILD="4G"
 	fi
 	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() {
@@ -212,41 +205,15 @@ src_configure() {
 	# Add full relro support for hardened
 	use hardened && append-ldflags "-Wl,-z,relro,-z,now"
 
-	# We must force enable jemalloc 3 threw .mozconfig
-	echo "export MOZ_JEMALLOC=1" >> "${S}"/.mozconfig || die
-
 	# Setup api key for location services
 	echo -n "${_google_api_key}" > "${S}"/google-api-key
 	mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
 
-	mozconfig_annotate '' --enable-jemalloc
-	mozconfig_annotate '' --enable-replace-malloc
-	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
 	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	mozconfig_annotate '' --disable-gconf
 	mozconfig_annotate '' --disable-mailnews
-	mozconfig_annotate '' --with-system-png
-	mozconfig_annotate '' --enable-system-ffi
-	mozconfig_annotate '' --disable-gold
 
 	# Other ff-specific settings
 	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-	mozconfig_annotate '' --target="${CTARGET:-${CHOST}}"
-	mozconfig_annotate '' --build="${CTARGET:-${CHOST}}"
-
-	# gstreamer now needs the version specified
-	if use gstreamer; then
-		mozconfig_annotate '' --enable-gstreamer=1.0
-	else
-		mozconfig_annotate '' --disable-gstreamer
-	fi
-	mozconfig_use_enable pulseaudio
-	mozconfig_use_enable system-cairo
-	mozconfig_use_enable system-sqlite
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-icu
-	mozconfig_use_enable system-icu intl-api
 
 	# Allow for a proper pgo build
 	if use pgo; then
@@ -368,6 +335,8 @@ src_install() {
 
 	# Required in order to use plugins and even run firefox on hardened.
 	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
+	# Required in order for jit to work on hardened, as of firefox-31
+	use jit && pax-mark p "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin}
 
 	if use minimal; then
 		rm -r "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk} \

diff --git a/www-client/firefox/firefox-32.0.ebuild b/www-client/firefox/firefox-32.0-r1.ebuild
similarity index 87%
rename from www-client/firefox/firefox-32.0.ebuild
rename to www-client/firefox/firefox-32.0-r1.ebuild
index 082c9a7..be208da 100644
--- a/www-client/firefox/firefox-32.0.ebuild
+++ b/www-client/firefox/firefox-32.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-32.0.ebuild,v 1.1 2014/09/03 22:09:11 axs Exp $
 
 EAPI="5"
 VIRTUALX_REQUIRED="pgo"
@@ -34,7 +34,7 @@ MOZ_HTTP_URI="http://ftp.mozilla.org/pub/${PN}/releases/"
 MOZCONFIG_OPTIONAL_WIFI=1
 MOZCONFIG_OPTIONAL_JIT="enabled"
 
-inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-v4.1 multilib pax-utils fdo-mime autotools virtualx mozlinguas
+inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-v4.31 multilib pax-utils fdo-mime autotools virtualx mozlinguas
 
 DESCRIPTION="Firefox Web Browser"
 HOMEPAGE="http://www.mozilla.com/firefox"
@@ -42,7 +42,7 @@ HOMEPAGE="http://www.mozilla.com/firefox"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist gstreamer hardened +minimal pgo pulseaudio selinux system-cairo system-icu system-jpeg system-sqlite test"
+IUSE="bindist hardened +minimal pgo selinux test"
 
 # More URIs appended below...
 SRC_URI="${SRC_URI}
@@ -53,24 +53,11 @@ ASM_DEPEND=">=dev-lang/yasm-1.1"
 
 # Mesa 7.10 needed for WebGL + bugfixes
 RDEPEND="
-	>=dev-libs/nss-3.16.4
+	>=dev-libs/nss-3.16.2
 	>=dev-libs/nspr-4.10.6
-	>=media-libs/mesa-7.10
-	>=media-libs/libpng-1.6.7[apng]
-	virtual/libffi
-	gstreamer? ( media-plugins/gst-plugins-meta:1.0[ffmpeg] )
-	pulseaudio? ( media-sound/pulseaudio )
-	system-cairo? ( >=x11-libs/cairo-1.12[X] )
-	system-icu? ( >=dev-libs/icu-51.1 )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-sqlite? ( >=dev-db/sqlite-3.8.3.1:3[secure-delete,debug=] )
-	>=media-libs/libvpx-1.3.0
-	kernel_linux? ( media-libs/alsa-lib )
 	selinux? ( sec-policy/selinux-mozilla )"
 
 DEPEND="${RDEPEND}
-	>=sys-devel/binutils-2.16.1
-	virtual/pkgconfig
 	pgo? (
 		>=sys-devel/gcc-4.5 )
 	amd64? ( ${ASM_DEPEND}
@@ -220,41 +207,15 @@ src_configure() {
 	# Add full relro support for hardened
 	use hardened && append-ldflags "-Wl,-z,relro,-z,now"
 
-	# We must force enable jemalloc 3 threw .mozconfig
-	echo "export MOZ_JEMALLOC=1" >> "${S}"/.mozconfig || die
-
 	# Setup api key for location services
 	echo -n "${_google_api_key}" > "${S}"/google-api-key
 	mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
 
-	mozconfig_annotate '' --enable-jemalloc
-	mozconfig_annotate '' --enable-replace-malloc
-	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
 	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	mozconfig_annotate '' --disable-gconf
 	mozconfig_annotate '' --disable-mailnews
-	mozconfig_annotate '' --with-system-png
-	mozconfig_annotate '' --enable-system-ffi
-	mozconfig_annotate '' --disable-gold
 
 	# Other ff-specific settings
 	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-	mozconfig_annotate '' --target="${CTARGET:-${CHOST}}"
-	mozconfig_annotate '' --build="${CTARGET:-${CHOST}}"
-
-	# gstreamer now needs the version specified
-	if use gstreamer; then
-		mozconfig_annotate '' --enable-gstreamer=1.0
-	else
-		mozconfig_annotate '' --disable-gstreamer
-	fi
-	mozconfig_use_enable pulseaudio
-	mozconfig_use_enable system-cairo
-	mozconfig_use_enable system-sqlite
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-icu
-	mozconfig_use_enable system-icu intl-api
 
 	# Allow for a proper pgo build
 	if use pgo; then

diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 7b612f7..89ddd01 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -1,29 +1,29 @@
-DIST enigmail-1.6.1_pre20140112.tar.xz 916028 SHA256 2d89a9186c3ccfc9397c933c6f63c0518224fea0096d7a292dba3765de088149 SHA512 e05d9fcb2dd333cdca487d59a31bf045a568762e6a961267209bb4b5c8b6a0fc5ef8096b970302bc7bac9bc7f963d4a2d3c1d68326c4c18c7e93eb63308b0675 WHIRLPOOL 7a5d6366737fe239b00bcc8d805e6904fd5f9bd9724adbc0ab0f7752ec6f1b8d0bc961c250f8d51366265d685a1c66a3efcb86a23ebbde36152588bac97f576f
-DIST firefox-28.0-patches-0.1.tar.xz 4888 SHA256 2b33e263a645f0b8c5656ac3d2ad9ce9571e85642c6d5a24ea9549967181e727 SHA512 ce15b0cda105dc6606787c1b24d8f97a068cf87f970f59a181cb520791326ea2f78d5694234cb9f0baf1e5c057233263608ca65e3ebccb60bc0d3f20a4ee7303 WHIRLPOOL c442b127c29ad1cc1f03419bfbba86a5d93ad0e26561ce72199bc58ecd483463dd40788275a1e0169711a90b4bfc17a8a90b1faf2ae749fce9415eb870b4a286
+DIST enigmail-1.7.tar.gz 1414100 SHA256 cddbf35783194a4e994f9584ad5bee74750e25f690e81727ba9eccc4f814f161 SHA512 b9ca47c66669fbff381509cd880dc3f11b880eec80588c7c2d7d259350cf6313fd0867e3b0468f3d6a90c705a19989c16d93d75d2568caff9266d581acf64cbf WHIRLPOOL ea0f97ebf49b417a4d2435b41801a08c45cd7f2a9f8f0c6f32387417ce6a89fa787bb076564598c5d0033160eb7cef6a3cc8696c4a41e88841b5c7bbdf256a39
+DIST firefox-31.0-patches-0.2.tar.xz 4636 SHA256 fdcd4e68093fb905af06cd89aad7042f8a4e695dea9c184351945fcb5872a062 SHA512 2fee84ac6027a1e1317470112df54fef411596a522bca756f82c525b13ba952015e71f2aa05a807fec04c3bd092e8cbebd0c2349e0dc4950b329a88811b00151 WHIRLPOOL 59dc5f3457dc2a0c0c83a0128063da00d127cee13487b112064368de7d98438b7ffeb1dfe362080eca6a82af4834f3e27c6bd887e51b5d59c728ae124b26114d
 DIST seamonkey-2.23-patches-01.tar.xz 824 SHA256 8779254ea0632c52090a70f7b0943bce0787e37b1a2e683cf49a3238d705af75 SHA512 03420b11e98c728aa001e755585e8ce1f9123160cb69042e4bbfed46a5cbaf1c567938e0c4d18f72d58c55bd780ada467733677f924c6bc6ab9e070c89b9c472 WHIRLPOOL 729e52bd1a2da0d830a1e5602fa980981648ef74123540b316ef97720798021fdb2efaa505cc59b9a629575656cbf469ec160403d395938375c55e570730d056
-DIST seamonkey-2.26_pre1-be.xpi 818751 SHA256 bba364903e2cd080a83b4c7b06317ce547fce0463e46cb1ff5241dcd3b0341f7 SHA512 c80819046b7fe6645738bdb4849a068e8e35698a5c530b63d29195b4ec2876956892711367e570c9464546bf8617ec1103195efabbc8949d32517bafde013622 WHIRLPOOL 50ab8395519f815d1ff214a32726bd1e46327d0cd95290ac7a1ed3897eb0f70f3b019807b4cf88d91905a853e911ced42f93267af26cd5b2546db7b68b18e173
-DIST seamonkey-2.26_pre1-ca.xpi 816735 SHA256 8885d0412bd420b77a831bc28aae685d0962ef840ddb16e380cd07a2f2ef176c SHA512 b6aef44fbf848a8240c28659c2d379d94f6053166424b9c46466e41a9df96a7917f9bc6deccb5d64d2c0362fedacdd3ce7be0704ab3e0c76c4cf45b3e1f30ff9 WHIRLPOOL 21b15cb74521f21489f47652fb660138d2796e0cf6da58c2e7122914a331131653737b9cff9b7503087c712ea71feaee5c35c5b82cfe626346adaebff1e1e094
-DIST seamonkey-2.26_pre1-cs.xpi 814944 SHA256 cc77420a27f8e0757bcbdd6f8df2be361883ae1c5840e63f63a1386e43bc498c SHA512 91dc46661d494762895ec66c76e804a22dad3854f8e1439807636721b0052790b4ef14aca360b0ec742fe5d10eb71c181e9707af62c335328a10d07d79e828da WHIRLPOOL 50ea7fd10ba9c12193e3d11400007e8a68297043979e7f8a5464b63d3e26289cf21345ac6eccc20d14da6884d8a46ca13d33415e48fc0c3b335858d912a75e76
-DIST seamonkey-2.26_pre1-de.xpi 822042 SHA256 960ce22067f7cd19ec30c1249a588c651785a8989f374e14e8d06de8dce35237 SHA512 054b312f5bd83750f6db8a4520a6bcd67d51b263c53e1eca9c8df37812095260d4576cea24437a47cc7f79801a025198e026546f94adeeae96b7b09212d7870e WHIRLPOOL 8f127568b35e62667fe508408b07dd2791b0f851c9150d1bc6e8946d88e682acbee4407051d84f123335215344e2abb48dba412b6f94eeca57b056eb49e95f2e
-DIST seamonkey-2.26_pre1-en-GB.xpi 785904 SHA256 42aa60112205d55fb9f835baf1a051da97942a950a17fbb37f0aac7cf6f5135e SHA512 e8ff828d9c62f1b4bbf192433a9aa86baa17b181a1dba903593199cf14ee22a81cd2119d69d8f8b40fa1c842ac561c5b1534748aac58537eb26393cd0759bf7b WHIRLPOOL 5e054c31ddcce50407f2e9d9fd137f202be40a1c6914fa6b2677cd83231fd7b747a37bad55367ecb5f46d14626d9f06e812bfd44340b4e16e4929985cde1c306
-DIST seamonkey-2.26_pre1-es-AR.xpi 836833 SHA256 70e3502d5578c3d793645c47872c436f92845800f5a74bcea3803b2c5db73dad SHA512 1b676c1bd5b195bf07c54c18af32cd6336881f74d34602f898b465f833afd82435c8ca4ef0c32b27a6fc0e53d8b59e342b7cc3fbebc521e89ca7d711f20dae2b WHIRLPOOL 96eb57fb2ff5df9636dc95c18dbcc3f9905ec6cbb93bc35f1f7fad99b7ff5d097f5d0b722199f4592cff569a8fee1c17212f1538689a25bf37c93f0024731183
-DIST seamonkey-2.26_pre1-es-ES.xpi 814002 SHA256 13bdb45b40c8a9b03f3c93aca5d120ce163a9dc263c68d9fa225826bf429c1a0 SHA512 2f09302a83ff0228d2b4e22ce8400e26cc75489b378151b5fc9a8c26585ead55d47d90f1ae04d53aecb14ad6232914ab1480bb449b0f7c99b45c77769abfe99a WHIRLPOOL 0e15f8d1c06a3c12817542ad3435cac7d5ccf4c732f0d2f7b02d08ef103cdff52a6cc6bc1509a04a567d55ec4152bb00df86c7243aba3649b021dfbc60cda72b
-DIST seamonkey-2.26_pre1-fi.xpi 784387 SHA256 f21cd2e898e11039b2909cad62a71e8f4ee769c68c5681d82300f95c9c70c00a SHA512 994e7c42ae12b8c271349d8bbacad810d9f63b4b2ff90eaef173ce42daa803e4bfa50fdde7d0ca9c4c7ccc91edd27efc0435a26791307b7aa4c222e2335a9d25 WHIRLPOOL 1f7e63f87e421cef681535c4bc7bc79354b2eab4557c07e842e7943ef33288f92a573eb8d3b1c33d6f924efc60094f7ba2eca82834f5a01aa1140ea796455b31
-DIST seamonkey-2.26_pre1-fr.xpi 795188 SHA256 4e892a84852f9d7470c7c7ff4cc6ff8da0cb5bc8e8197d41ca3105ded6d7356d SHA512 92b829f03892fc130258d58dec87410b825b3de28e1242c1ea8ad475a94bf94dbbdeee52b6d2c151f9db0323d4323f877d050fa0740f6e5bf97a3783e2fbe959 WHIRLPOOL 971444fdccb22e95b8fccd4803811664454c308195e8725f5c46b345e13b60af0951e4487b2ea55efff4905306294b2b216885c5b727e8afec94d9e12b9e7362
-DIST seamonkey-2.26_pre1-gl.xpi 794258 SHA256 de1db0aefa37fa6ce4ca2ab6ddbd53d4466e48cb435861270266ca0f56e338e0 SHA512 b13fa4db22457bd6023521d704ff542bcaf2c35383681bef0a102b4deb6011270cdedaeaf8f0eedc8800435e83b536f880aa2102c8618350ddeac166512041ca WHIRLPOOL 76f3decd68dd95cb213242b6276c59cccf749f5f88c72d7167629ca7abb8dc703041a250f65baaac540d225f268904cf662de3e92f311400c16e1b018da61176
-DIST seamonkey-2.26_pre1-hu.xpi 828526 SHA256 a1c8b084b6b64bb0b992e9a05c6fa49c9a5a48b437e86351b8a2ed1f2997f22c SHA512 97565d5a66568626c31fbe7038e107757f539746a3f5e167c24138f5cfb48b17b6db6336370a3583e2f417217fa33e8c70b74de2f73875ba37a1343f2329e191 WHIRLPOOL 03bc3bdbbb74b0e8dcd03f675743a1ee6441f7b87c3927e3485c3475ac82975c185a4451351a235ddc67a5d55a1895596e4d44f6bf619a4e434734599c747264
-DIST seamonkey-2.26_pre1-it.xpi 728566 SHA256 30dde81ae8bf1379caabc0a7e35bee72b8fa9fa052136de333dcbcd7f3ea550a SHA512 3fc510cc971b658953324021256045ad3fa70ffd25eb06a15aec14bc3b9bf55b565b85cd590515ead03a058a81f54e1ae8c9a7bbd2b4c1a9ffea1c5df782ed0a WHIRLPOOL 8de0ff54177d3267602f478afa506be71f225d035b4cd2ed67db78377e45eb015f7fcedb6a27bb5126b4afd98a510095c54d7453ef52bca9dfdc702abd26737a
-DIST seamonkey-2.26_pre1-ja.xpi 867575 SHA256 002743784937853e368c31ca5f80056eb50bd91dfa3f791164e388ab66e1e160 SHA512 084c32fe59c1de8df856308908b3333990341726a13594bf7bab6ad9cb6da0bdf0d569ccf3958143e38a141f1884497ae7fd70c96c940c7c7441602d684d2815 WHIRLPOOL e6304ea6b0850e000757c459dd5d9f032fec7222bd27abc71fe194887894481b642807ce1ca1437d3f5da35dcd91cbf1d609e61c1af8998e9fdffb38fff84066
-DIST seamonkey-2.26_pre1-lt.xpi 832068 SHA256 5beaf750798ffe4979e31e19dd88721df2819eeb4ac6cfb73388c0acecfb80f3 SHA512 bf809df4f42ec305f4b8e6357f70908f72a0ddc33a6075807c203273147d2296e34df4fa60ed9675697df988bb7aa3634335f14ed9eca7dc4534e56e8e1fd25a WHIRLPOOL 909c4f134f34a0f1efe70a8846cefb50c3d1c1c444081b6d4ebebf79ff99e1b3652630ca14db6664dab3a5299f16b75d872fa9c752edc31fa0b76842db928ffb
-DIST seamonkey-2.26_pre1-nb-NO.xpi 805527 SHA256 5559b7554f6683b7ad444af019d7ad75b13795f6669653b3be9c0934d12857a9 SHA512 8110c660430ecd7fe986ef83a2c9dac195b82034c4193bbb4c81e4b3605c87de258ad4770818661aacada28318a0c68ae704d7c41c57e503f443131281497e30 WHIRLPOOL 9bbce4692359f50698d5307caace84e40d56704bf54982665a93dbf1b15ea3b7d0e4fdc09aaa509edb6cc4a71f487284c08c0ef0d2d29843ee56bf3e1620c177
-DIST seamonkey-2.26_pre1-nl.xpi 781831 SHA256 794019b24058071a080b6450991fa79ca71a447df7702e6384785895fce18a34 SHA512 c03f1b0e1758891ee29c6bab2f0f0b01f3e6dff306f575d3af776cf04b006654c76f345391d327e4b0f56485ccfab215475988d42ed3c913b30cc825956735da WHIRLPOOL ca34644b178c2ab54ccaf1428230f087818262dfd95da4fe72cd041d03db82805d62e8a92e6dcf7da5a9f94f9606a94528e30fca31d4a38555b0fa2d557481b5
-DIST seamonkey-2.26_pre1-pl.xpi 855815 SHA256 fff16b9b77830bf983c49e42516091ec987a9616168d8040598799349b135e1f SHA512 9610c6dff661fe183c1e9a87c021fae62afc22bc53e3b158c818da7c660be88dbfce1dd7fc34d4f7fa6572322031769770538c7f47b9e504083e37b696dd2c46 WHIRLPOOL af1ed58c5500a28d86dcee5936b4a5a1ca85dc175f0d58cc9a7f1270b7a05ff092f0d240f8de8ff2b6a35b79e2ea3e76f8655529b2e0b8bc110d3d6295b649cc
-DIST seamonkey-2.26_pre1-pt-PT.xpi 817865 SHA256 35ecbc2df9c90227ce0e46d854237272d019ad4a5c54e459cdf82a601a9d52dd SHA512 9ff8519ff7258dd8b4cd56734c022b3454202400f11f2eff3f0f9bdfcad6bddd83f46843e368c6eb62ef8283a9dd9e7d48e2fa1ec183b848e0df20330ecdfb95 WHIRLPOOL 543bcca92877dc419c2fd8b73f0a7d646f6d9cc9091c58dc5916f47c7b3f7b44f479664a5c9e2643faed51f98543d92fad5bec46a725299c0c700463b1a988c0
-DIST seamonkey-2.26_pre1-ru.xpi 885692 SHA256 9c4c665da191538e1e836ecad5b4556f5a9ed4a4db94c4779db537dd2cef1c94 SHA512 3d3ddd334e4dbc289e920960c775003242c8cc0592e25795493a217b59819c19a43a6d3a357059b5987ccfdce2c7cf759d527b571ec4501b15e0af4ebb828561 WHIRLPOOL 2449d632ce0effda7510eb4b4243bc2a357677a826148ce84ac530180a546c3a4f51ea4cf0e80640882b580fdf3d3a12b7f47a9dcfd492e0e7b94be8bda6995d
-DIST seamonkey-2.26_pre1-sk.xpi 841872 SHA256 dca3c93b1b2131e58483a537961df44a044b80f5cc97fb2628b384f26e973212 SHA512 43d4174e3f1ceaf55e71d9ee593795074ad38b0cfac82f46438ff985d2c7a6ba609abaa4e46c36b390e92c4740e07f7d20b4e4df1ba448e4bd6a389bad2aefee WHIRLPOOL 91b4be48c460e32a9c2f929b2f3940437cde375e007b7200c463ce2a2f7bbc4df22eabe032d42512d2edb2451c092d28d55446b85a47df3827690397ef6da92b
-DIST seamonkey-2.26_pre1-sv-SE.xpi 809829 SHA256 e55f7d962db49d461b3b2cc2cc93da46da64139164b8d83f2e67df35bbfa2979 SHA512 fb6409fcd96fd04ac5010f8da40b5d6a62b5a034cfda777cc08cdb61a3b5940a6f7fd5f66b7abf5e0f1209d413fbd441251cc1ff1b73c86a8b7967ed19177bc7 WHIRLPOOL f4e429a9c6793aef2249bf8001d8e9492da4810337eb6998b8663684c062ff217b92953e765ac9225ba43c9a66a9cefb3800c23a4d429f3dc67f481eddc59901
-DIST seamonkey-2.26_pre1-tr.xpi 791385 SHA256 d4923efdc2d4e3a294b864c1fbb9fe0a9a9d0d3636cb4ebed2e2263fbabbe5fa SHA512 a3a393cab04f505b5aa4b3ec111114c05a17956f915510a7aeff396037d03627bed6fa522c3ee1d7ac7760486ff291cf49bb9172a0e8ef86e7acd0a7c70e69f8 WHIRLPOOL d8920793dbcc7ec352b68f004cc28a3c84f8063e6a62db1c9f773f05a2f66c2b717e4587af460ae375a6616707349d2fbf5f37eb372f12d8e311db1b27e10635
-DIST seamonkey-2.26_pre1-uk.xpi 853567 SHA256 ebdc37f591c32ddfe8783257c3944b6a44be15a2b10be4298326c187caddda81 SHA512 2430eba49aa8c3478c2a9a2888168b0e6b31132d4e4a81ee6cc2d61fd59373f91e2d9b2f20b0373c6566cd96bf7abcc5b8320b920cec8ba208d84dedadd2a3e3 WHIRLPOOL accc7e864c65228a681e805d50849e5e169f0b7dd39aa1a194afb28e9ad487cc4910a2d5d89d6b99074d5097eabd92b941a92f422b6901811341fbd4a35834a7
-DIST seamonkey-2.26_pre1-zh-CN.xpi 818845 SHA256 57ab3c518f60627b9cbbe57f5a25b22dace427ec9597d395953104732a5cf0fe SHA512 7703e06578c1820a45b57eda2e117d7e7ae8b8afdb3fe98980d5aec02d39f9e0b38e55546bd684b8fcce25b6ea5a4f43c0b5817fd6de93a6dc78d0f9c9ffbb35 WHIRLPOOL 314b41da8837753ebfd201d1c26f68b793c460069d370cf84105116f4c70f6d1076c6315a2bce2a24944ae34a41723138d437f936f082de16f82026caa77601b
-DIST seamonkey-2.26_pre1-zh-TW.xpi 843200 SHA256 2512be926be2859e16e058977e9dc31d29a3c8b92eefe5a6b3a6f304325cb7fe SHA512 456991409df15d7f8a71f9918cf493ffcc44a9d25477b3412d37e02e306e537621c0ac6222268b419f9450308fcb03949278c5c7e64a82e67a6690ce66cbf6e7 WHIRLPOOL 6885dc1813e350cecac3e32d9b0fc6402578ba6aa12879bb8531ca0afa2d1a7f682ccd6f9769f6cfd17473fd710ca452995b107a81804cbcd1da581ab8ee2a76
-DIST seamonkey-2.26_pre1.source.tar.bz2 165548355 SHA256 985262d39f38fc20d307e810c371c9f581f7c55a66cfabd6b5561c236116b874 SHA512 568fc2da523bdf584ca08cb45abf301fea7456dddc2822542154f496862a1a63d8e62bbc37ae189bd2d36698ff28b85b56fb55ca4811d1e5e86c72114b7a7f29 WHIRLPOOL b42f7221585ff6099d486b628ee39fb182f0587abe4333c7c941701d93dd94da2270bd6fe2422739197f1160edd3a59c951c6083174a13537b84417b8f50716e
+DIST seamonkey-2.29_beta2-be.xpi 837342 SHA256 a7a0218e7679e87a010cd5ebe28f011a440714163dc84aacd045060f599f91cd SHA512 58edf36af8814c20d3bafcbe7b5c4d37a4be5c77a8b61b8a2a2e03287202784b49f3849f762179d36cdd86f8221632b423271c65495826a010854d1d7a55880b WHIRLPOOL 7c80406b2d49424efe065fb22e6b92a6e8fedf68d82cca42ac021d8d8004427b5128d9493d70ea42ab7012dacfcd5b4f9fad2b9cb6f23752628ff2de06a8eeb0
+DIST seamonkey-2.29_beta2-ca.xpi 830892 SHA256 38d950fe1b8a6f7907396d3358bc0d13b67c4cf37fd26fd8610dc8e53fc5f44e SHA512 8c8111ad84576d662065f3abd7098b2cde45c748fa0791e21253e8d94cdd14830fd5a183d4ba93aab430704167daa8457af436aebe5bac830faadf3287c7883c WHIRLPOOL f2b6fb72eb931e42e2fd5cb763f74219b12eb06ab02cea0ad88135214394719ef5e7cc43bd8f694f4c9bbee95607adfbbfa8d5b5eede31394a2d84b5be700fdf
+DIST seamonkey-2.29_beta2-cs.xpi 832267 SHA256 cd395172d193e3166f9fcf608b36b3f5109b643cf951506fcb3b150913057fc7 SHA512 ee5c0bcb6bf106f7b7cce60b560955a72567727daa5321612b687424df95d3848ccede72665afd3d75784c47cff044394b8efba5a60fddbbd7f755f28191b02b WHIRLPOOL 9c64dcc29499c1254e3b49f3626112aa284c5ff596bcdadc15d3fc27f1f17ee3e1ef4fbc1557ef28e59bf0a3e3d12948d87b28efa2298005c0b7f7726d9ffe54
+DIST seamonkey-2.29_beta2-de.xpi 837071 SHA256 f768d8a96828e268b4abd35484e0b29392c968c08cb5d280c9a013efbf457ba3 SHA512 6eecff53dfa552ab8f066c257cdec465f8436377089c44ead2e5a7b39e29848747d87497c1d290383dbe878793902aa497e32b4a9849438e0466a9f7c555483e WHIRLPOOL dae4798811bf63564ec676ad93aaff59c25d900f15f5dac53d33320aab3e3e9a7404f29be73e9c4a9867ee1792e0cd04f7771ab4d8d698e3630cf5a258820981
+DIST seamonkey-2.29_beta2-en-GB.xpi 800824 SHA256 89e63e1f7dba136625cabf25c17d746a9472dd33461ebefe58ac83e82306c17f SHA512 1db0bf32474f6be4882b5094a7e607de266a2adee3d4a9b0f5d11c91b0e3cd2c9edff7a4d40a43ee060b91829e38156acb805cc987a9605efc991d31bf605f16 WHIRLPOOL dd0a755384e3c9b7e2533655cc60bea654d5a7bbfa74358e1ae72a50dc0e964a2f9bf53e34c90f71caa65fd53b451522fb4ead540fa5b84365712eed752a4f29
+DIST seamonkey-2.29_beta2-es-AR.xpi 851548 SHA256 569ef13755f4ceec51a9050213b5c8366a0b6c4d1300afb9176cd40f4f425e5b SHA512 3fafb59f5079f0a15d8ed2bd908221abd3a43d0d99a0217a9d19301e6215afc9c13d8e84a25f02b4c8d60976b129d487ba2e9b6f970c463954cd2927f23fa05e WHIRLPOOL 120417780f719fc1072c378628d87bbfb25a59c815d4603c1a7a32264dadc8001fde7970ba7ed6bf567d504b9546f439fe1e93461ba6b7dfcad1fdb3b009ef7d
+DIST seamonkey-2.29_beta2-es-ES.xpi 827396 SHA256 6821842732b3c36203d64129f961c77bd12299b04305202edf83ff9488f90b44 SHA512 5e8fa7aebf354726b78d16b7a16225306af2cd47d7f92725b6238ed2af31f989bb4d213a6091a3cfebd6d1ff7f0e7f2318d9ca3a45408cdcd049254d80ed3fa2 WHIRLPOOL b72af5d7c9e2180ac5edb4be4f44675b510bfcdb00c8dd022c098b79080ae93b2aab881d548826fc71102d8ad3b5679a6c649c3d1916ab92628096548080a5a0
+DIST seamonkey-2.29_beta2-fi.xpi 798956 SHA256 c2b966791c253b5885a6201f5fce09e5fd34d8b36819dd55f91536eefdc99574 SHA512 cd6bfce1cc11b34072650635822e277f5d07c85d65e31ec3a504384372e77b59d20e0e8ecef6da99cf673c2a226e458d4f8c0c74b372e27b8478fc17662e5867 WHIRLPOOL 1ff4e6b784f398c7f4ab0ef6ee5d136b1fee84ae537afdb39624ae60e22b7f2b77a4e44e7e58a39aac121184dc3c7a0623e8d4614504eefdf957e0acc652cc6d
+DIST seamonkey-2.29_beta2-fr.xpi 809847 SHA256 c828a96d304f20377cb9a43259a8a6252194b6a383ed263a0b711173b11c121e SHA512 443deedb80129ab0ff6f7e5d771929ff5f82ddc952f11ec41a0b7182b5b725a8d85d07f0c3479fcecf72e69189a118f597024d0eacb908da760490c5575360fc WHIRLPOOL aa7094410ac3c2c83eec324cea7998a94b72a540ef698518ef527b070c14828c513bef49e8d89bb885ceb5cba48cc392a6748e610ea65a790a6559b987ecf1d2
+DIST seamonkey-2.29_beta2-gl.xpi 811260 SHA256 3d64965a28019b8d218a42f2200ec38f434437de10513715049e7314fd7db4ce SHA512 a8d1302d2fc9fb049da10b3dc76d66bc8644fb892f65d56d32fcbfc066297fcff957cc7182deae1c436d670f7181adaa5f796661e08ff34ff87d60b81d0fc557 WHIRLPOOL 8152b6bb38863f2b6b733bf27af91c708f6851e14c6d9d9c6a7e7b088436ba2fba8dd31bcc7eaf58afd199ab6361ecb622f8fcc8629d86852abf0310807eac46
+DIST seamonkey-2.29_beta2-hu.xpi 845863 SHA256 558cbc471330b468a2d4c65f15055a4546e6e54ac4ee489413771e651ef2f3e9 SHA512 794c61d36ed9e13c7cea9b1a450a0352281345c1865e8f0c7373ad91966eba9af66f11d6739c1babfae101a06d187657ee534eef5d05171a7bdacd879f244d49 WHIRLPOOL 4bc858ec49577e88b3872acf19d401ddef60491034bf2d62399b9119d3afbbcc493445ceaec846b59d30161dee8137cceec3aede4eb15cd33d605eb3afdcb80c
+DIST seamonkey-2.29_beta2-it.xpi 747522 SHA256 1a835f9b712c2e6c5d455f38c7193be6aa8abe8d7ba4dd79ed88039dfd57a253 SHA512 cc3d6dc031680fa5561ed2125273e9df10a0f21e317a0cbdff9f44ee4f19f5a8cace673c512034c7113056a197a0585420176e626961c06c83ef66d3f3fcb7e8 WHIRLPOOL 7d557e68f71dcc7f207a4822630313aeb549c7fce54427e2964cf67d3d59bf8248b020d522b894fd5f85690b8626e4bf3915cb5779e7ab1866d419e3322e1984
+DIST seamonkey-2.29_beta2-ja.xpi 882629 SHA256 9fd323ddf3bcafa2853887da3acfcf134951582ad19a3c8e7b0c4f84f0a2794a SHA512 acf09cacba21251a45876f1542bfdc138c6ad0e26ba61a2b410b099315a5ef0d981907f84abd534cc6c907969ab340603622ba13869810392425beaab7dfeb3f WHIRLPOOL 711b263a98e8b816163fbe411c7e4c3ba7d31e293cd3604b05bece2dc752e2aec381c514a1228b03922abd6a2658b2bbb0ffe8a529fffe413152280aee4984d0
+DIST seamonkey-2.29_beta2-lt.xpi 847471 SHA256 1efa10862d001f74637440efdfc9a927511de3c24cc80b1efe5beb17c0839544 SHA512 61c7310f239346afee5e80ab788c144d3b399238dc46c4cbe69545a3fbe33b1295e2fbb4ec2fbe4ef588b6aea00f02e5c750d6bd35e68db30ba66a5b8708f9b7 WHIRLPOOL 70ff16950e1a52dcd952863db8d30ac0274d09a6865a78410155784929be983978d57cd0f0217a376c22c2ef6b49b224037e52d053af6b531f69e53ef6878e54
+DIST seamonkey-2.29_beta2-nb-NO.xpi 820413 SHA256 d1a5a5183dae9f5173246decab4d61abbc9dbb95385f91061c8a00bf973d015a SHA512 f266ffdbbfda425f9a883a672c5aed134b192e4be021b16fc5ca71e670bbbf2404b2792fcf43a5ee350ce7856315b59fae480171c3cc4196e401063028b04e38 WHIRLPOOL 1bfef6fee1406bd2e6987fb4457841388865de9fd52a3c67e7bd54b7c2a528065d7ee091087c1bad489192d4c897972891f87a21a67ea8d8495771c933b8b02d
+DIST seamonkey-2.29_beta2-nl.xpi 795956 SHA256 23250119fb571f6bac17eaa2ce0c8a773e125218a1fe0a5739a2c07f054a227e SHA512 2898ad6c0ce3293fafc56897d4d54bfe0bed868d0acfd23cc40d7a4c90ba7182f759aee3c99ce4a8d9f093362d8c07aa8d71220d78d7825aea707362403fe6a6 WHIRLPOOL 278bcc3125a76a4ef2094386f1cb8b55c2d7879833e2685ea23670866e547600a9e694116ca90d077c7e9b493533f145e4130814a9eaf5a5318fffad5d717490
+DIST seamonkey-2.29_beta2-pl.xpi 868183 SHA256 49fc711ab4f0e4d25880b9120084962f2f1ce77deeb6038962ddfbf0f818d53f SHA512 e344fb17e7d08a21651181251d651c73419789716dbf0a76665a14e54cf6cbea0ae8c82709866fe771c27558ac7aaa4f239dac76d78ea39ea8850beb9871c16e WHIRLPOOL 019f2490c747696236ab90813ace87de2300fba5b93257d71bfc66ec39b090904189a0353e06a9952c05fd53dc50a85cdb7506994777501426ccb3c59b609525
+DIST seamonkey-2.29_beta2-pt-PT.xpi 835296 SHA256 818d66c01f8b0ce7a2dc312b683ba706c9959a8b7c72a390b47e6645cecd8e5d SHA512 25237c493bfe1d3e23ffbbb177f66819e5cbde41c4cb6b5755acb571db0861247be6478b9af457f5e8525254ce482a81e44a6a7a4d321a759f45e0edf3941f3a WHIRLPOOL e8712489bc25816c293917bf559a7688ea60ce1c615e35a737e9c5acf81eb5d0941c115352955c9bdc17dfb880576347b8514763c705f3991927d9d5e3a44225
+DIST seamonkey-2.29_beta2-ru.xpi 904348 SHA256 39c92e3c03a6c69964b10ca8a815087e8ed2bcf21bb9dbd2b6a7a8ed3e5f209a SHA512 1f75e48cc41063fd54ecde0d885195cca1cb8b4d3b645472353ccb5e2c9547d6d07fc9b01277fa59707707a88b2853b98c8b45836d48b6c93f8b08d37d27dc9c WHIRLPOOL 716ba4f3ad9ad5caf0e723616028ca87513554dfd3202ca46750a98d0fe9c3e583e4924677dceabba4a0b80e87f96eae0b38664440955b8e6d770064f3b35f7a
+DIST seamonkey-2.29_beta2-sk.xpi 859264 SHA256 d8c94f5ce1f62d94f80f44e4780037260f718544f576ef1d3be3c27f52826c7e SHA512 af6ee89d339491f6444d9d7ffc287374129f65bad476c3fb54b146c0320349059fd2c472dcf423a203aba382d54fbaac281236516a805503c1073f9f5091fc7b WHIRLPOOL e1442a2c703d8aba6334042c0c53a18723ebd45c036a754dec497d7a19ff2b50b48785c39c80158b0e7b2851ba60d47913f507f89b415bf68933787c2de4ab9e
+DIST seamonkey-2.29_beta2-sv-SE.xpi 824245 SHA256 a79308c4dbefee9e8a82b51e5e9bc3dcb5b72cf7a984b3bd4f2104a9beb50bbe SHA512 390d115530865716bcba8e9753550fe1d243625862429d26c98acb87b21297ff95cdd26460564244804e127970f5b630f8a6d3a6c72f80cd554cbe403c61a4af WHIRLPOOL 0784d4dc73dcf437dee8e6dc68cb113e3791b659d9687772b1626daf80dd7a217d95e18e410fde6c07319d7640d87721d81672501e16dc87886d8af5ac4c8c35
+DIST seamonkey-2.29_beta2-tr.xpi 808130 SHA256 0c03cfeb4b10199b4cd93c39695f699cc8080515f036117d9a7d38f2534d2c29 SHA512 09fcca405a46a607a5348bb147c28511a3f4d0cd3ab22745e31bb568f2ff54be21189f04ad8d26293d2d584c4f32149f3eb2a068f703bbd0bff868da6707dead WHIRLPOOL c2fc99be94a640435c659efb787abc18f3d13f39e3526cc158767070c29d4dbbc14a25cb0330c14a7fffa1918686dd83be81d89aa06b0afb70f4cfa96103167a
+DIST seamonkey-2.29_beta2-uk.xpi 870445 SHA256 bae08a32142b687dc817882931a32528242b1e7bbaaa1b5f36c1aba44376813a SHA512 fc379d7fcc0322d5e57b65be1b8705ac417a1cf4ba45b12aa6a698294cce6ff3fdfd6484060413716c7e49d113c1f99ca268452020e3cda8ec788757b98971e9 WHIRLPOOL 3924423588d48c0e5897d365aa6630d318f534a59ec5ad653701a9cfe0ed487000066139b307c994afbe7d57eda880736fe4cccf5581c7dba04bc32899e03dcb
+DIST seamonkey-2.29_beta2-zh-CN.xpi 833563 SHA256 ae8eb0e7d74153bd217fa3af1706b2ef7ce339b04912bd23f08c5cc82cee5594 SHA512 2299af10b5e14dfcc9349c090bb3ea6ada96ffe69b9961cfb5530c7f48bf77155220f19c81a38fd8484bdfdd12e61b7f2fc2fe5949b35560b5e44c0d20e1b38e WHIRLPOOL f8f339bbc69c66f691445b5eaec86c8ed9b982ab63fe8ef19bcc3d1bb8f80af8d04702d6081a41841233d3b8e629928e50f5fe94150c12ee9eb603fc387836c1
+DIST seamonkey-2.29_beta2-zh-TW.xpi 858130 SHA256 e75e1f0fb533ab9b38cc1aaccfc5ac542befc4024fe460f4f48a96b76edf8d9a SHA512 27f454f88219842b48a1b7020713b633514f4e9be840d28c062a1285389744f0cf496eb0cd893d74ce27402c64303383164894d510e0575d2bcb759fbc1df553 WHIRLPOOL 863bc1de7d4405d3c8b05b0dcf09a4070d1e747808fc8c205379e06fef638fdbfdc96e65ddba5043f97fc5d45775fb3adc0c6c529a036860b80fdf3b87c3da96
+DIST seamonkey-2.29_beta2.source.tar.bz2 173851863 SHA256 ec9412d514b1a3f4349f90f65d7975ceef261afabb05fa0c09fca3c98537acf7 SHA512 662b1cf7966adb67959b97b940cf613373732c288908e7025a4ae4c1bae3f173b40621be9a7a6f7c0dcaafe85195a89a9dba12204531363107f40d2032a7ee72 WHIRLPOOL 1c985fcd1406e7ab1078d44818edfdf3d3418605f68c667b8f12178678def607c4d3e73d318ef7da65045f29aaebec873e52b7e7a5abf4dc23eee3bc0d478017

diff --git a/www-client/seamonkey/seamonkey-2.26_pre1.ebuild b/www-client/seamonkey/seamonkey-2.29_beta2.ebuild
similarity index 71%
rename from www-client/seamonkey/seamonkey-2.26_pre1.ebuild
rename to www-client/seamonkey/seamonkey-2.29_beta2.ebuild
index dcfa8d0..fd2a3b0 100644
--- a/www-client/seamonkey/seamonkey-2.26_pre1.ebuild
+++ b/www-client/seamonkey/seamonkey-2.29_beta2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.25.ebuild,v 1.5 2014/04/11 06:44:03 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.26.1.ebuild,v 1.4 2014/07/05 11:23:47 ago Exp $
 
 EAPI=5
 WANT_AUTOCONF="2.1"
@@ -26,11 +26,13 @@ else
 	MOZ_LANGPACK_SUFFIX=".langpack.xpi"
 fi
 
-inherit check-reqs flag-o-matic toolchain-funcs eutils mozconfig-3 multilib pax-utils fdo-mime autotools mozextension nsplugins mozlinguas
+MOZCONFIG_OPTIONAL_WIFI=1
+MOZCONFIG_OPTIONAL_JIT="enabled"
+inherit check-reqs flag-o-matic toolchain-funcs eutils mozconfig-v4.31 multilib pax-utils fdo-mime autotools mozextension nsplugins mozlinguas
 
-PATCHFF="firefox-28.0-patches-0.1"
+PATCHFF="firefox-31.0-patches-0.2"
 PATCH="${PN}-2.23-patches-01"
-EMVER="1.6.1_pre20140112"
+EMVER="1.7"
 
 DESCRIPTION="Seamonkey Web Browser"
 HOMEPAGE="http://www.seamonkey-project.org"
@@ -38,50 +40,41 @@ HOMEPAGE="http://www.seamonkey-project.org"
 if [[ ${PV} == *_pre* ]] ; then
 	# pre-releases. No need for arch teams to change KEYWORDS here.
 
-	KEYWORDS=""
+	KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
 else
 	# This is where arch teams should change the KEYWORDS.
 
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
 fi
 
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+chatzilla +crypt gstreamer +ipc +jit minimal pulseaudio +roaming selinux system-cairo system-icu system-jpeg system-sqlite test"
+IUSE="+chatzilla +crypt +ipc +mailclient minimal pulseaudio +roaming selinux test"
 
 SRC_URI="${SRC_URI}
 	${MOZ_FTP_URI}/source/${MY_MOZ_P}.source.tar.bz2 -> ${P}.source.tar.bz2
 	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCHFF}.tar.xz
+	http://dev.gentoo.org/~axs/distfiles/${PATCHFF}.tar.xz
 	http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz
-	crypt? ( http://dev.gentoo.org/~polynomial-c/mozilla/enigmail-${EMVER}.tar.xz )"
-	#crypt? ( http://www.enigmail.net/download/source/enigmail-${EMVER}.tar.gz )
+	mailclient? ( crypt? ( http://www.enigmail.net/download/source/enigmail-${EMVER}.tar.gz ) )"
 
 ASM_DEPEND=">=dev-lang/yasm-1.1"
 
-# Mesa 7.10 needed for WebGL + bugfixes
-RDEPEND=">=dev-libs/nss-3.16
-	>=dev-libs/nspr-4.10.4
-	>=dev-libs/glib-2.26:2
-	>=media-libs/mesa-7.10
-	>=media-libs/libpng-1.6.7[apng]
-	>=x11-libs/pango-1.14.0
-	>=x11-libs/gtk+-2.14:2
-	virtual/libffi
-	gstreamer? ( media-plugins/gst-plugins-meta:0.10[ffmpeg] )
-	system-cairo? ( >=x11-libs/cairo-1.12[X] x11-libs/pixman )
-	system-icu? ( >=dev-libs/icu-51.1 )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-sqlite? ( >=dev-db/sqlite-3.8.1:3[secure-delete,debug=] )
-	>=media-libs/libvpx-1.3.0
-	crypt? ( >=app-crypt/gnupg-1.4 )
-	kernel_linux? ( media-libs/alsa-lib )
-	pulseaudio? ( media-sound/pulseaudio )
+RDEPEND=">=dev-libs/nss-3.16.2
+	>=dev-libs/nspr-4.10.6
+	mailclient? ( crypt? ( || (
+				( >=app-crypt/gnupg-2.0
+					|| (
+						app-crypt/pinentry[gtk]
+						app-crypt/pinentry[qt4]
+					)
+				)
+				=app-crypt/gnupg-1.4* ) ) )
 	selinux? ( sec-policy/selinux-mozilla )"
 
 DEPEND="${RDEPEND}
-	!elibc_glibc? ( dev-libs/libexecinfo )
-	>=sys-devel/binutils-2.16.1
-	virtual/pkgconfig
+	!elibc_glibc? ( !elibc_uclibc? ( dev-libs/libexecinfo ) )
+	mailclient? ( crypt? ( dev-lang/perl ) )
 	amd64? ( ${ASM_DEPEND}
 		virtual/opengl )
 	x86? ( ${ASM_DEPEND}
@@ -128,12 +121,10 @@ src_prepare() {
 	EPATCH_FORCE="yes" \
 	epatch "${WORKDIR}/seamonkey"
 
-	epatch "${FILESDIR}/pixman-supplement.patch"
-
 	# browser patches go here
 	pushd "${S}"/mozilla &>/dev/null || die
 	EPATCH_EXCLUDE="2000-firefox_gentoo_install_dirs.patch
-			8000_fix_system_icu.patch" \
+			8000_gcc49_mozbug999496_ff31.patch" \
 	EPATCH_SUFFIX="patch" \
 	EPATCH_FORCE="yes" \
 	epatch "${WORKDIR}/firefox"
@@ -147,13 +138,6 @@ src_prepare() {
 		edos2unix "${file}"
 	done
 
-	if use crypt ; then
-		mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
-		#pushd "${S}"/mailnews/extensions/enigmail &>/dev/null || die
-
-		#popd &>/dev/null || die
-	fi
-
 	# Allow user to apply any additional patches without modifing ebuild
 	epatch_user
 
@@ -182,13 +166,17 @@ src_prepare() {
 	eautoreconf
 	cd "${S}"/mozilla || die
 	eautoconf
-	cd js/src || die
+	cd "${S}"/mozilla/js/src || die
 	eautoconf
 }
 
 src_configure() {
 	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
 	MEXTENSIONS="default"
+	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+	# get your own set of keys.
+	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
 
 	####################################
 	#
@@ -211,37 +199,22 @@ src_configure() {
 		MEXTENSIONS+=",-sroaming"
 	fi
 
-	# We must force enable jemalloc 3 threw .mozconfig
-	echo "export MOZ_JEMALLOC=1" >> ${S}/.mozconfig
+	if ! use mailclient ; then
+		mozconfig_annotate '-mailclient' --disable-composer
+	fi
+
+	# Setup api key for location services
+	echo -n "${_google_api_key}" > "${S}"/google-api-key
+	mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
 
-	mozconfig_annotate '' --enable-jemalloc
-	mozconfig_annotate '' --enable-replace-malloc
-	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
 	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	mozconfig_annotate '' --disable-gconf
 	mozconfig_annotate '' --enable-jsd
 	mozconfig_annotate '' --enable-canvas
-	mozconfig_annotate '' --with-system-png
-	mozconfig_annotate '' --enable-system-ffi
-	mozconfig_annotate '' --disable-gold
 
 	# Other sm-specific settings
 	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-
-	mozconfig_annotate '' --target="${CTARGET:-${CHOST}}"
-	mozconfig_annotate '' --build="${CTARGET:-${CHOST}}"
 	mozconfig_annotate '' --enable-safe-browsing
-
-	mozconfig_use_enable gstreamer
-	mozconfig_use_enable pulseaudio
-	mozconfig_use_enable system-cairo
-	mozconfig_use_enable system-sqlite
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-icu
-	mozconfig_use_enable system-icu intl-api
-	# Feature is know to cause problems on hardened
-	mozconfig_use_enable jit ion
+	mozconfig_use_enable mailclient mailnews
 
 	# Use an objdir to keep things organized.
 	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" \
@@ -250,10 +223,9 @@ src_configure() {
 	# Finalize and report settings
 	mozconfig_final
 
-	if use crypt ; then
-		pushd "${S}"/mailnews/extensions/enigmail &>/dev/null || die
-		# econf fails here and would produce useless Makefiles anyway
-		./configure || die
+	if use crypt && use mailclient ; then
+		pushd "${WORKDIR}"/enigmail &>/dev/null || die
+		econf
 		popd &>/dev/null || die
 	fi
 
@@ -274,13 +246,15 @@ src_compile() {
 
 	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
 	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
-	emake -f "${S}/client.mk"
+	emake V=1 -f "${S}/client.mk"
 
 	# Only build enigmail extension if conditions are met.
-	if use crypt ; then
-		cd "${S}"/mailnews/extensions/enigmail || die
-		emake
-		emake xpi
+	if use crypt && use mailclient ; then
+		einfo "Building enigmail"
+		pushd "${WORKDIR}"/enigmail &>/dev/null || die
+		emake -j1
+		emake -j1 xpi
+		popd &>/dev/null || die
 	fi
 }
 
@@ -304,11 +278,11 @@ src_install() {
 		>> "${BUILD_OBJ_DIR}/mozilla/dist/bin/defaults/pref/all-gentoo.js" \
 		|| die
 
-	if ! use libnotify ; then
-		echo 'pref("browser.download.manager.showAlertOnComplete", false);' \
-			>> "${BUILD_OBJ_DIR}/mozilla/dist/bin/defaults/pref/all-gentoo.js" \
-			|| die
-	fi
+	#if ! use libnotify ; then
+	#	echo 'pref("browser.download.manager.showAlertOnComplete", false);' \
+	#		>> "${BUILD_OBJ_DIR}/mozilla/dist/bin/defaults/pref/all-gentoo.js" \
+	#		|| die
+	#fi
 
 	echo 'pref("extensions.autoDisableScopes", 3);' >> \
 		"${BUILD_OBJ_DIR}/mozilla/dist/bin/defaults/pref/all-gentoo.js" \
@@ -318,8 +292,8 @@ src_install() {
 	emake DESTDIR="${D}" install
 	cp "${FILESDIR}"/icon/${PN}.desktop "${T}" || die
 
-	if use crypt ; then
-		local em_dir="${S}/mailnews/extensions/enigmail/build"
+	if use crypt && use mailclient ; then
+		local em_dir="${WORKDIR}/enigmail/build"
 		pushd "${T}" &>/dev/null || die
 		unzip "${em_dir}"/enigmail*.xpi install.rdf || die
 		emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
@@ -331,10 +305,12 @@ src_install() {
 		popd &>/dev/null || die
 	fi
 
-	sed 's|^\(MimeType=.*\)$|\1text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;|' \
-		-i "${T}"/${PN}.desktop || die
-	sed 's|^\(Categories=.*\)$|\1Email;|' -i "${T}"/${PN}.desktop \
-		|| die
+	if use mailclient ; then
+		sed 's|^\(MimeType=.*\)$|\1text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;|' \
+			-i "${T}"/${PN}.desktop || die
+		sed 's|^\(Categories=.*\)$|\1Email;|' -i "${T}"/${PN}.desktop \
+			|| die
+	fi
 
 	# Install language packs
 	mozlinguas_src_install
@@ -359,6 +335,11 @@ src_install() {
 	share_plugins_dir
 
 	doman "${BUILD_OBJ_DIR}/suite/app/${PN}.1"
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/11${PN}
+	doins "${T}"/11${PN}
 }
 
 pkg_preinst() {