[gentoo-commits] proj/mozilla:master commit in: media-plugins/gmp-openh264/, www-client/firefox/, eclass/

[gentoo-commits] proj/mozilla:master commit in: media-plugins/gmp-openh264/, www-client/firefox/, eclass/

[Ian Stakenvicius]

commit:     2cf678cfccb9149f9f535aac4ef774584254fe7e
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 22 15:12:10 2014 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Wed Oct 22 15:12:14 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=2cf678cf

Add firefox-34.0_beta2, provide alternative to binary-fetched gmp

Firefox-33 and above introduced the Gecko Media Plugin infrastructure and
its first plugin (Cisco's BSD-licensed openh264 codec) for webrtc h264 support.
By default, and due to software patent issues related to h264, Cisco builds
the plugin themselves (so that they are on the hook rather than end-users) and
firefox updates this non-optional plugin via downloading the binary blob into
each user's profile.  To help resolve bug 525810, firefox-33 and firefox-34_beta2
introduce USE="system-gmps" which will disable the autoupdates of gmp plugins in
the firefox default prefs, and RDEPEND on the newly added media-plugins/gmp-openh264.

The gmp-openh264 package builds the plugin from source and installs it to the
regular nsplugins path, in a directory tree structure required for GMP.  It also
adds an env.d file to set the MOZ_GMP_PATH environment variable appropriately, so that
firefox will load the plugin from here if it cannot be found in the user's profile.

USE="system-gmps" plus media-plugins/gmp-openh264 will:

1 - make the system-installed plugin always be used on newly-created user profiles
or updated old profiles from firefox-32 and earlier.

2 - allow users to obtain the mozilla/cisco binary simply by enabling auto-udates
in about:config or manually checking for and installing updates via the Addon Manager

3 - *not* override a user's in-profile copy of the mozilla/cisco binary if it exists;
this includes if the user has manually fetched it via overriding auto-updates or doing
a manual update in Addon Manager, and also (unfortunately) if the user has already
installed and run firefox-33.0.

This will remain an experiment in mozilla-overlay for a while, as maintenance
of an openh264 may not prove to be viable -- at this point, it looks like we will need to
roll our own snapshots of two github upstream projects in order to provide release
tarballs, and it is difficult to say how many releases there will need to be going forward.

---
 eclass/mozconfig-v5.34.eclass                      | 220 +++++++++++++++++++++
 media-plugins/gmp-openh264/Manifest                |   1 +
 .../gmp-openh264/gmp-openh264-1.1_p20141021.ebuild |  53 +++++
 www-client/firefox/Manifest                        |   2 +
 www-client/firefox/firefox-33.0.ebuild             |  13 +-
 ...refox-33.0.ebuild => firefox-34.0_beta2.ebuild} |  25 ++-
 6 files changed, 302 insertions(+), 12 deletions(-)

diff --git a/eclass/mozconfig-v5.34.eclass b/eclass/mozconfig-v5.34.eclass
new file mode 100644
index 0000000..d70fc8d
--- /dev/null
+++ b/eclass/mozconfig-v5.34.eclass
@@ -0,0 +1,220 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+#
+# @ECLASS: mozconfig-v5.33.eclass
+# @MAINTAINER:
+# mozilla team <mozilla@gentoo.org>
+# @BLURB: the new mozilla common configuration eclass for FF33 and newer, v5
+# @DESCRIPTION:
+# This eclass is used in mozilla ebuilds (firefox, thunderbird, seamonkey)
+# to provide a single common place for the common mozilla engine compoments.
+#
+# The eclass provides all common dependencies as well as common use flags.
+#
+# Some use flags which may be optional in particular mozilla packages can be
+# supported through setting eclass variables.
+#
+# This eclass inherits mozconfig helper functions as defined in mozcoreconf-v3,
+# and so ebuilds inheriting this eclass do not need to inherit that.
+
+inherit multilib flag-o-matic toolchain-funcs mozcoreconf-v3
+
+case ${EAPI} in
+	0|1|2|3|4) die "EAPI=${EAPI} not supported"
+esac
+
+# @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.
+# Set the variable to "enabled" if the use flag should be enabled by default.
+# Set the variable to any value if the use flag should exist but not be default-enabled.
+
+# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_JIT
+# @DESCRIPTION:
+# Set this variable before the inherit line, when an ebuild needs to provide
+# optional necko-wifi support via IUSE="jit".  Currently this would include
+# ebuilds for firefox, and potentially seamonkey.
+#
+# Leave the variable UNSET if optional jit support should not be available.
+# Set the variable to "enabled" if the use flag should be enabled by default.
+# 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="${IUSE} dbus debug gstreamer pulseaudio startup-notification system-cairo system-icu system-jpeg system-sqlite +system-libvpx"
+
+# 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.10[X]
+	>=x11-libs/gtk+-2.14:2
+	x11-libs/gdk-pixbuf
+	>=x11-libs/pango-1.22.0
+	>=media-libs/libpng-1.6.13:0=[apng]
+	>=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? ( >=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
+	>=sys-libs/zlib-1.2.3
+	virtual/libffi
+	gstreamer? (
+		>=media-libs/gstreamer-1.2.3:1.0
+		>=media-libs/gst-plugins-base-1.2.3:1.0
+		>=media-libs/gst-plugins-good-1.2.3:1.0
+		>=media-plugins/gst-plugins-libav-1.1.0_pre20130128-r1:1.0
+	)
+	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.6:3[secure-delete,debug=] )
+	system-libvpx? ( =media-libs/libvpx-1.3.0* )
+"
+
+if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]]; then
+	if [[ ${MOZCONFIG_OPTIONAL_WIFI} = "enabled" ]]; then
+		IUSE+=" +wifi"
+	else
+		IUSE+=" wifi"
+	fi
+	RDEPEND+="
+	wifi? ( >=sys-apps/dbus-0.60
+		>=dev-libs/dbus-glib-0.72
+		net-wireless/wireless-tools )"
+fi
+if [[ -n ${MOZCONFIG_OPTIONAL_JIT} ]]; then
+	if [[ ${MOZCONFIG_OPTIONAL_JIT} = "enabled" ]]; then
+		IUSE+=" +jit"
+	else
+		IUSE+=" jit"
+	fi
+fi
+
+DEPEND="app-arch/zip
+	app-arch/unzip
+	>=sys-devel/binutils-2.16.1
+	${RDEPEND}"
+
+# @FUNCTION: mozconfig_config
+# @DESCRIPTION:
+# Set common configure options for mozilla packages.
+# Call this within src_configure() phase, after mozconfig_init
+#
+# Example:
+#
+# inherit mozconfig-v5.33
+#
+# src_configure() {
+# 	mozconfig_init
+# 	mozconfig_config
+#	# ... misc ebuild-unique settings via calls to
+#	# ... mozconfig_{annotate,use_with,use_enable}
+#	mozconfig_final
+# }
+
+mozconfig_config() {
+	# Migrated from mozcoreconf-2
+	mozconfig_annotate 'system_libs' \
+		--with-system-zlib \
+		--enable-pango \
+		--enable-svg \
+		--with-system-bz2
+
+	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 [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]] ; 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
+
+	# These are forced-on for webm support
+	mozconfig_annotate 'required' --enable-ogg
+	mozconfig_annotate 'required' --enable-wave
+
+	if [[ -n ${MOZCONFIG_OPTIONAL_JIT} ]]; 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 '' --prefix="${EPREFIX}"/usr
+	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
+	mozconfig_annotate 'Gentoo default' --enable-system-hunspell
+	mozconfig_annotate '' --disable-gnomevfs
+	mozconfig_annotate '' --disable-gnomeui
+	mozconfig_annotate '' --enable-gio
+	mozconfig_annotate '' --disable-crashreporter
+	mozconfig_annotate 'Gentoo default' --with-system-png
+	mozconfig_annotate '' --enable-system-ffi
+	mozconfig_annotate 'Gentoo default to honor system linker' --disable-gold
+	mozconfig_annotate '' --disable-gconf
+
+	# We must force-enable jemalloc 3 via .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
+	mozconfig_use_with system-libvpx
+}

diff --git a/media-plugins/gmp-openh264/Manifest b/media-plugins/gmp-openh264/Manifest
new file mode 100644
index 0000000..cc77874
--- /dev/null
+++ b/media-plugins/gmp-openh264/Manifest
@@ -0,0 +1 @@
+DIST gmp-openh264-1.1_p20141021.tar.xz 11808564 SHA256 88253dc65cc509cde88a602fc0d6f916d641235fcc163025f15467823a8fe363 SHA512 9ec0f3c7898f53917df8bd0b035de214a1dd804d01f17973ed0cde7c42141e5af9ccc710eaf5505ef33d4f0fa096d8f7d5db90f8a8499016b6ad26b86f63d227 WHIRLPOOL cf4a5def4a1577139787065466f4b94d4a721ab693590bf7b95f7a1fd4e8e120f01c48a90891466bdca35651a5cf88b816bb820cdff5433a4f3bf9a2b3236b78

diff --git a/media-plugins/gmp-openh264/gmp-openh264-1.1_p20141021.ebuild b/media-plugins/gmp-openh264/gmp-openh264-1.1_p20141021.ebuild
new file mode 100644
index 0000000..ad10f3b
--- /dev/null
+++ b/media-plugins/gmp-openh264/gmp-openh264-1.1_p20141021.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit nsplugins
+
+DESCRIPTION="Gecko Media Plugin for openh264, to be used in mozilla packages"
+HOMEPAGE="http://www.openh264.org/"
+SRC_URI="http://dev.gentoo.org/~axs/distfiles/${P}.tar.xz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+plugin"
+
+RESTRICT="bindist"
+
+RDEPEND=""
+DEPEND=""
+
+DOCS=( LICENSE CONTRIBUTORS README.md )
+
+src_compile() {
+	local mybits="ENABLE64BIT=No"
+	case "${ABI}" in
+                s390x|alpha|*64) mybits="ENABLE64BIT=Yes";;
+	esac
+	emake V=Yes ${mybits} plugin
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)/${PLUGINS_DIR}/gmp-${PN/-/}/${PV}
+	doins libgmpopenh264.so gmpopenh264.info
+	echo "MOZ_GMP_PATH=\"${EROOT}usr/$(get_libdir)/${PLUGINS_DIR}/gmp-${PN/-/}/${PV}\"" >"${T}"/98-moz-${PN}
+	doenvd "${T}"/98-moz-${PN}
+}
+
+pkg_postinst() {
+	elog "USE=system-gmps on the mozilla packages will disable the default"
+	elog "autoupdates preference for this and other gmp plugins, but it may be"
+	elog "overridden in a user's profile (ie, about:config)."
+	elog ""
+	elog "Also, if a previous mozilla version has already installed gmp-gmpopenh264"
+	elog "into a user's profile, that version will take precedence over this package"
+	elog "and will need to be removed before the files installed by this package
+	elog "will be used."
+	elog ""
+	ewarn "You may need to modify each user's .mozilla profile"
+	ewarn "by hand, disabling autoupdates in about:config and deleting any"
+	ewarn "existing plugin in the profile dir, in order for this package"
+	ewarn "to have any effect."
+}

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 1d0593b..a55d4f9 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -82,3 +82,5 @@ DIST firefox-33.0-zh-CN.xpi 429857 SHA256 0fe62fe5f372b01f40a9d20617688eda3923cc
 DIST firefox-33.0-zh-TW.xpi 422430 SHA256 88e13c51ab2cde95ca274c458c73af74fe2b4a0eeb5efde3e223a55f73940a6e SHA512 b9e3ec1c80aee9a2225a05bec44d9d690876258991cc6f9a7b703fda3c40f215a68f3bfeb58a144e6dbfbd7c1168abb47bf543b1e7628a89f895ffc7f5368d89 WHIRLPOOL 79dfaa6059780c544aafe526a7747feaec672fa6ca2cd1152fa0efe71588cc2e068b682c892a25a7e72476bec3f43e08588fb4b10ca71626865f11b69367372d
 DIST firefox-33.0-zu.xpi 443460 SHA256 6deb6b853ec1923ab325332d2eb5e96e6a0cea443d447203dff0cff5352c15bf SHA512 39cf08663bf7ea3668bbddba84aa4c27fa365e6a43132c02ce78c6a63327bbc212ea179fcdd562c1962b4d167b17186c5d56dafe3267dcc4f32ee22c671b1e1f WHIRLPOOL 56a5729de1f5daf0d5c177e40e8e58def910558c6837c40b3fb22cdb11dec347894fd23c1bd2aa4fe3f42937dadba87bf932bcff7c053300abb408b0f852fcd8
 DIST firefox-33.0.source.tar.bz2 155177527 SHA256 1018c2fae8c54c8a45f5a3ce348a2617a3f8039a789b09b7cfa5a27be069b229 SHA512 856585bedb0c0cc2a5c8591a5a3d373dca66fd8c15dd2c04b09e17e9a2da2bf978e4bff872a814b42e1963c3a6def05ccc0b68d9a8f4e7c9152dca878cf17e51 WHIRLPOOL be267b29bc9d21b6f0d35d1e42410afe9a0d6bed9174f5de5bfd80898fd1a73fc4e762a7e606c94c99562c6ac2b99eb33022509a85f5a762685cf26496a2744b
+DIST firefox-34.0-patches-0.1.tar.xz 4412 SHA256 29cd2fee297ca23b9552c134051d663ad5d7b2f7acdec8e441889cc82553d373 SHA512 dd2099cb8f5c8a411439afc4aa16cfabc8bab56ff090c4e84cbe54143b177ae141c48398b6a71c7506bada50223e01a8b1eec12b5e274353803b50de6c253b8c WHIRLPOOL 71ae7630bb5b0eff082d7a7cc89b3524b886bfe3af5556c27a47643839b166d36945a2f7e0afbd9b36ea8b4c0629daa660aeed23ad548f9a9d079a4252c1c363
+DIST firefox-34.0b2.source.tar.bz2 164311277 SHA256 7087f7b36c2f7aaabcbb11f94a0a7d5e4ea0b17a6ac54f6fe7ba947566d03097 SHA512 2d263ea92c54ad87f390acd6c2bdf3ce5713f22b902efba28e8b5f0a7a97eec2bd4748b49842700d0e13ea4179b95c2c498d5071f4d6f066455af7ed003978f2 WHIRLPOOL 4393eda13fb1f8fa0cfed91424db7682779c5db492fcb1e641885bafd4c2e6f8eb17f38d23fe1900e2ea655cad0f51dc663eb788abd29f37f01f50084db04883

diff --git a/www-client/firefox/firefox-33.0.ebuild b/www-client/firefox/firefox-33.0.ebuild
index c511bbf..9701a8f 100644
--- a/www-client/firefox/firefox-33.0.ebuild
+++ b/www-client/firefox/firefox-33.0.ebuild
@@ -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 hardened +minimal pgo selinux test"
+IUSE="bindist hardened +minimal pgo selinux system-gmps test"
 
 # More URIs appended below...
 SRC_URI="${SRC_URI}
@@ -55,7 +55,8 @@ ASM_DEPEND=">=dev-lang/yasm-1.1"
 RDEPEND="
 	>=dev-libs/nss-3.17.1
 	>=dev-libs/nspr-4.10.6
-	selinux? ( sec-policy/selinux-mozilla )"
+	selinux? ( sec-policy/selinux-mozilla )
+	system-gmps? ( media-plugins/gmp-openh264 )"
 
 DEPEND="${RDEPEND}
 	pgo? (
@@ -300,6 +301,14 @@ src_install() {
 		"${S}/${obj_dir}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
 		|| die
 
+	local plugin
+	use system-gmps && for plugin in \
+	gmp-gmpopenh264 ; do
+		echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
+			"${S}/${obj_dir}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+			|| die
+	done
+
 	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
 	emake DESTDIR="${D}" install
 

diff --git a/www-client/firefox/firefox-33.0.ebuild b/www-client/firefox/firefox-34.0_beta2.ebuild
similarity index 95%
copy from www-client/firefox/firefox-33.0.ebuild
copy to www-client/firefox/firefox-34.0_beta2.ebuild
index c511bbf..3f28ef9 100644
--- a/www-client/firefox/firefox-33.0.ebuild
+++ b/www-client/firefox/firefox-34.0_beta2.ebuild
@@ -25,7 +25,7 @@ if [[ ${MOZ_ESR} == 1 ]]; then
 fi
 
 # Patch version
-PATCH="${PN}-31.0-patches-0.2"
+PATCH="${PN}-34.0-patches-0.1"
 # 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/"
@@ -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-v5.33 multilib pax-utils fdo-mime autotools virtualx mozlinguas
+inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-v5.34 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 hardened +minimal pgo selinux test"
+IUSE="bindist hardened +minimal pgo selinux system-gmps test"
 
 # More URIs appended below...
 SRC_URI="${SRC_URI}
@@ -53,9 +53,10 @@ ASM_DEPEND=">=dev-lang/yasm-1.1"
 
 # Mesa 7.10 needed for WebGL + bugfixes
 RDEPEND="
-	>=dev-libs/nss-3.17.1
-	>=dev-libs/nspr-4.10.6
-	selinux? ( sec-policy/selinux-mozilla )"
+	>=dev-libs/nss-3.17.2
+	>=dev-libs/nspr-4.10.7
+	selinux? ( sec-policy/selinux-mozilla )
+	system-gmps? ( media-plugins/gmp-openh264 )"
 
 DEPEND="${RDEPEND}
 	pgo? (
@@ -144,12 +145,8 @@ src_prepare() {
 	# Apply our patches
 	EPATCH_SUFFIX="patch" \
 	EPATCH_FORCE="yes" \
-	EPATCH_EXCLUDE="8000_gcc49_mozbug999496_ff31.patch" \
 	epatch "${WORKDIR}/firefox"
 
-	epatch "${FILESDIR}"/${P}-jemalloc-configure.patch
-	epatch "${FILESDIR}"/${PN}-32.0-hppa-js-configure.patch # bug 524556
-
 	# Allow user to apply any additional patches without modifing ebuild
 	epatch_user
 
@@ -300,6 +297,14 @@ src_install() {
 		"${S}/${obj_dir}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
 		|| die
 
+	local plugin
+	use system-gmps && for plugin in \
+	gmp-gmpopenh264 ; do
+		echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
+			"${S}/${obj_dir}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+			|| die
+	done
+
 	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
 	emake DESTDIR="${D}" install