dropped USE=jit from firefox-36.0 as disabling jit is not supported according to upstream, also added configure flags to enable the jit simulators for arm and mips; works around bug 541534

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B6559ED

3 files changed, 23 insertions, 29 deletions

diff --git a/www-client/firefox/ChangeLog b/www-client/firefox/ChangeLog
index 1c6710fad527..43ce9bdff92f 100644
--- a/www-client/firefox/ChangeLog
+++ b/www-client/firefox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/firefox
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.389 2015/02/27 13:25:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.390 2015/03/01 01:44:10 axs Exp $
+
+  01 Mar 2015; Ian Stakenvicius (_AxS_) <axs@gentoo.org> firefox-36.0.ebuild:
+  dropped USE=jit from firefox-36.0 as disabling jit is not supported according
+  to upstream, also added configure flags to enable the jit simulators for arm
+  and mips; works around bug 541534
 
   27 Feb 2015; Agostino Sarubbo <ago@gentoo.org> firefox-31.5.0.ebuild:
   Stable for amd64, wrt bug #541316
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index e8e95558c4d3..118fcfab098c 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -429,24 +429,14 @@ EBUILD firefox-24.3.0.ebuild 12084 SHA256 28335ad221d0b32d6185535afc758808ce3dd6
 EBUILD firefox-31.3.0.ebuild 11641 SHA256 48d4190c7f02d00098ea51b284ddb8c7f88382f67b6d60466565145f868d11d0 SHA512 146892ca7859aa02d41792f89ee30f67fecb05701c85063ce6054d7c0fadd6e478792eba4858c017c509e87cc91667d9ead10a6335319b7b1dace899423250cb WHIRLPOOL ee424efc7c30369ac4fcaa2191f79055c9346045e581a23267badc0a903a29aa6c1d5ad8344322d9713eb999edd9ea2504af17b8c018f4985ef52f59e872414f
 EBUILD firefox-31.4.0.ebuild 11620 SHA256 8d3f2abfcd9be8b6a2bb9265264f886a086361b856ad766356bf667f1ba4745e SHA512 766fcb9eef71f0b838696e1eeab1c63199bd3f292941408e4ec1dddcf29feaae0576738aca7b0d5b6f031449bd07391bac0305c577beeae4f34f091ee13e0611 WHIRLPOOL 997a9f8fa2bcb9ec7231e9c56d2d1f6970fa3ce2d30372a27d2652f58bf11300853e35eaef12aae8bb7652574f165b650a378cede073225139d7482ddbb07ea6
 EBUILD firefox-31.5.0.ebuild 11625 SHA256 a120687f97df20bce41f3967b2daadeb8e818ceb07cf948fb2566c876a55a8ee SHA512 3ee57701bf3c9932cc5b789334619c91b65b12094b7b3c775e84fc56b6092344ea438cd343c624b42fe6f0fa75453e440cc6fe6f1f214fe0e221334038deb8d6 WHIRLPOOL 84de49d96031dfb8dbddc9a33dbf271580196ab0b2bfd4be89df5ca1d0dcef7f2fc1f534a3ef8a29d8f10d05ec5bd386cfb42a09945bdef2c9fd9f084d642ca2
-EBUILD firefox-36.0.ebuild 12016 SHA256 bf5a69cd4e2806277b9f9a051f556a63f564ff2b5acd8f05e5c79d521296315d SHA512 277a550f5e7ddd278d301df6e5e84e45d3e293d61900887b1804cea67f61b356a3e98c97546f7b3f9821f02378429872df2656c945dd3f1d89757ea86d087406 WHIRLPOOL 0b36509aab7f3e59ff418e42e5a97f4e4ba95557a2fa3d3a65fd8810debac9327f84524e2a2491de38d800c6a12ceedc0d86c1a713d0f5ccd5fa6253650ef2de
-MISC ChangeLog 64110 SHA256 7bc808d5658d31f5367089bedc5356cde9407fbd830110bdd2dd0d3b886dc440 SHA512 60f0156f3299d529071e083d46ab6a7d305b762e9b98019a9a0140c76e8508effe160e01e72ad93aa4b7ecac011d5f68d21c3d0210b4155e623efaf3ee841b7f WHIRLPOOL fd747e5a8c5690aa312ceb41353887d8f6203e2c3b5a19a9ce187dad081deee3397be4ababf8cc9944d9cebaa74f37b2afaafa59c1ff7d7ad96d83f61bb6ff0f
+EBUILD firefox-36.0.ebuild 11893 SHA256 204e6223690200d15023c1a0dd664da471d2383a96bcf656a2f673d184f188b4 SHA512 de9f80f5f21569bc4df48421b2a86a48e6dcf8a5175118183977e0eba5d9bd25af428419f707dc91b2e5d3d65d06f501b2ed73412bc4a399a4bcf443501f9d1a WHIRLPOOL 65dab988fc24f20bd1762fe0e7baa4647f5f6107e44c2578fae1f906e5a26b368d51d3b32c400cfb2673b5cdb25903f118596daf03228c563ce21f3009018e6a
+MISC ChangeLog 64384 SHA256 bd5000b3000d12959982fb9d7c893851e303d065725a859619055564ee83a4c8 SHA512 dbbe39e9309d6b0bb6689836fe8f31734f42b91adb51acb5e428a27ad5c2e4caf871ce6687a8d672ddc3cdf2dc386d4888d512a4643106ba5ce3a0a9967fab3b WHIRLPOOL c17feb3ea6f4941bcb83d7cf95ec0385822f4e3f9b42eb03224e8de67818d1118449e6d1f68e9859abdf3e05a4de8680fce6553972bdb32e6446de987cc10f5b
 MISC ChangeLog-2009 109736 SHA256 6a3f47a190cb2146174953971b193f7d75f408ea2cd1ad7d029fb848dd66f3c8 SHA512 db43c51ba072bd47d8bdf313481156b2e6238c9905147033dc7d7ce5a634ca01b7cfdd399c7b03a4f4af8c44eabf353c7b7e22642220975f1bd33d5a109cce10 WHIRLPOOL 7bdbc95d44e2a564cada83e831ee80b849d468138a6d5e75f23fd4e165408e07af4891bc6989af8e1f792f8d963613de20d013e5a610ee58855c0aad0de475fe
 MISC metadata.xml 1332 SHA256 6472dd21d6d153e44d858e6dbc7f998278f6be6dc65b9ef3a2ef86ee2c5b8533 SHA512 10a3e92528ca24810917b4580d22ae0b979d7704e5faf40c85204dc2bd76e60c21178f13cddb33145688a674812660ebde1c7e51daf9cd170dc54ee99eb8776d WHIRLPOOL 672be0b9d4372ddebd2f4721696daacac92a91ea21d2331c741e97117875eca92d07452377babd20e09908ec80c9b6196ba805584653c202ff2a44d7233fb58d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU8HBIAAoJELp701BxlEWfbR0P/2qmbmNErh7yI6/viLBNAaHZ
-QPvttw8di2SeQ6+117UdMwrONM06OLKapycoXSJYJZY5ZcNQXSw+38IjLO75cKml
-5f9o8A6pweN3WUr7WOSCp1zH3+d7A7Xhp16Wm3VEhyWtGfRuu0sB7iNd2xAx4eDw
-dXsnewqq8JvNr+ZeSqNOzA3rE7aF/1qz/xQxxVKYZt98Aw/Wl6L5L0ACUdGwz7Qd
-kJhV5HtAsvGsEElsb3s/VmhK9pahBZpBpfFTMLA1CN4FpMGNSiQJVANnTmNABWhK
-yzVSUcMySwm2kK1+pdDruDOFiKbtyQgW7SuttDsNR1nZnXN+cCJp0Q1h8sAKIkPz
-M2CfLbV18Avabnhzu+GwopDMbBx6MI86OjTbzlhYNH3TfahZannq9N1XWzW/wD1Q
-lN0mUk/I1hkO3C8ivWjXBYfFgjOUUFNU3V1t5gFCcs9QbNfEtdp2Wfhtmpy4EJAD
-5OkJnrMLOQzHtqf0e9+xmXCtBTtPQZtrBrhyuHxKogiYR8YA/UrTQBOGZvQbad73
-UwiW9l/mARJR7xvKOMI4w2QAIUyUDwLGs+RyMXWCcrfshXQW0hfXdoKmWXIRKq0F
-bg5slLlaenGQ73Ty4xQOnO8qcqHhT7jZCPVDGHLw4UGYe+4v/00okasLzQhpazq8
-03izIkBXdKAaD9JYCKLw
-=d7u7
+iF4EAREIAAYFAlTybvwACgkQ2ugaI38ACPCxDwD+KNH3m0G+nv88D+rIUVv+1VR3
+cIvWL1dqQd0vvusZzJMA/AutxdUbZnuZE2m49esxaIirY/epL2cJROFG2V9S7WHV
+=g6rW
 -----END PGP SIGNATURE-----
diff --git a/www-client/firefox/firefox-36.0.ebuild b/www-client/firefox/firefox-36.0.ebuild
index f7058f246e01..b616bb66a083 100644
--- a/www-client/firefox/firefox-36.0.ebuild
+++ b/www-client/firefox/firefox-36.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-36.0.ebuild,v 1.3 2015/02/27 08:36:41 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-36.0.ebuild,v 1.4 2015/03/01 01:44:10 axs Exp $
 
 EAPI="5"
 VIRTUALX_REQUIRED="pgo"
@@ -34,7 +34,7 @@ MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/"
 MOZ_HTTP_URI="http://ftp.mozilla.org/pub/${PN}/releases/"
 
 MOZCONFIG_OPTIONAL_WIFI=1
-MOZCONFIG_OPTIONAL_JIT="enabled"
+# No longer optional -- MOZCONFIG_OPTIONAL_JIT="enabled"
 
 inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-v5.36 multilib pax-utils fdo-mime autotools virtualx mozlinguas
 
@@ -131,13 +131,6 @@ 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() {
@@ -229,6 +222,12 @@ src_configure() {
 	# Other ff-specific settings
 	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
 
+	# Force jit
+	mozconfig_annotate '' --enable-ion
+	# Force jit simulators for mips and arm
+	use arm && mozconfig_annotate '' --enable-arm-simulator
+	use mips && mozconfig_annotate '' --enable-mips-simulator
+
 	# Allow for a proper pgo build
 	if use pgo; then
 		echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON) \$(OBJDIR)/_profile/pgo/profileserver.py'" >> "${S}"/.mozconfig
@@ -355,11 +354,11 @@ src_install() {
 	fi
 
 	# Required in order to use plugins and even run firefox on hardened.
-	if use jit; then
+#	if use jit; then
 		pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
-	else
-		pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container
-	fi
+#	else
+#		pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container
+#	fi
 
 	if use minimal; then
 		rm -r "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk} \