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

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

commit:     0c0c2713cf45dbdc6f1bd30509a8e769a7a77b9d
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  5 14:33:31 2017 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Mon Jun  5 14:33:31 2017 +0000
URL:        https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=0c0c2713

www-client/firefox: sync with main tree

 ...comp_fail.patch => firefox-53-turn_off_crash_on_seccomp_fail.patch} | 0
 www-client/firefox/firefox-53.0.3.ebuild                               | 2 +-
 www-client/firefox/metadata.xml                                        | 3 ---
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/www-client/firefox/files/firefox-53-turn_of_crash_on_seccomp_fail.patch b/www-client/firefox/files/firefox-53-turn_off_crash_on_seccomp_fail.patch
similarity index 100%
rename from www-client/firefox/files/firefox-53-turn_of_crash_on_seccomp_fail.patch
rename to www-client/firefox/files/firefox-53-turn_off_crash_on_seccomp_fail.patch

diff --git a/www-client/firefox/firefox-53.0.3.ebuild b/www-client/firefox/firefox-53.0.3.ebuild
index e4f93e1..80f3c55 100644
--- a/www-client/firefox/firefox-53.0.3.ebuild
+++ b/www-client/firefox/firefox-53.0.3.ebuild
@@ -125,7 +125,7 @@ src_prepare() {
 	# Apply our patches
 	eapply "${WORKDIR}/firefox"
 	eapply "${FILESDIR}"/musl_drop_hunspell_alloc_hooks.patch
-	eapply "${FILESDIR}"/firefox-53-turn_of_crash_on_seccomp_fail.patch
+	eapply "${FILESDIR}"/${PN}-53-turn_off_crash_on_seccomp_fail.patch
 
 	# Enable gnomebreakpad
 	if use debug ; then

diff --git a/www-client/firefox/metadata.xml b/www-client/firefox/metadata.xml
index fbcda11..a0a9a71 100644
--- a/www-client/firefox/metadata.xml
+++ b/www-client/firefox/metadata.xml
@@ -11,15 +11,12 @@
 	<flag name="custom-optimization">Build with user-specified compiler optimizations
 		(-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)</flag>
 	<flag name="gtk2">Use the cairo-gtk2 rendering engine</flag>
-	<flag name="gtk3">Use the cairo-gtk3 rendering engine</flag>
 	<flag name="gmp-autoupdate">Allow Gecko Media Plugins (binary blobs) to be automatically
 		downloaded and kept up-to-date in user profiles</flag>
 	<flag name="hwaccel">Force-enable hardware-accelerated rendering (Mozilla bug 594876)</flag>
 	<flag name="jemalloc">Enable or disable jemalloc</flag>
-	<flag name="jemalloc3">Enable or disable jemalloc3 (forced-on when supported prior to 38.0)</flag>
 	<flag name="pgo">Add support for profile-guided optimization using gcc-4.5,
 		for faster binaries. This option will double the compile time.</flag>
-	<flag name="skia">Enable the SKIA engine for 2D rendering as an alternative to cairo</flag>
 	<flag name="rust">Enable support for using rust compiler  (experimental)</flag>
 	<flag name="system-cairo">Use the system-wide <pkg>x11-libs/cairo</pkg>
 		instead of bundled.</flag>