www-client/firefox : Update metadata.xml, drop gtk3 support from esr

build.

4 files changed, 7 insertions, 9 deletions

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 2a2fd4e90209..d16eb9de6543 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -222,7 +222,6 @@ DIST firefox-51.0-is.xpi 432632 SHA256 a9a4fdb1b2e153773d9bbef9fce05947d2313caaa
 DIST firefox-51.0-it.xpi 334920 SHA256 8da1fec9e5f5db030c17590c875aff0a100afd77db1aad7067fa3d931ed03b68 SHA512 7f0075fbaf4d37613259922c1f6c1ca1700a35d596997d8090e54f3e017e0df135aac8683234a8a3c6a5b24a6da888150d0dea2cde8ef28262872f2f1d3ec674 WHIRLPOOL c394788281c3dbedc466713e3bce483013358e82ed43e72cfef05dbbc1ebbf52470c32f6018b23042f7037bcbbad1752208078dbce50c7d5f11ff999b0ffb07a
 DIST firefox-51.0-ja.xpi 481874 SHA256 b4ff63d51449460b758948bd8e73bc932d24b2e14501ee076bcae5b70892be3e SHA512 a4018335b549763ce235ff83996615f9962575e9004ac68e3e42a2572b02c40ae7c8337160948a92d5e6a094a17f945d14e9bf661ec6e1da6c3bf0f3f1573da6 WHIRLPOOL 873abf1266572a8bd197baa31ef3f561d46636a838549b328d2427b9dde57edc73b965c292d0dbee45a8a63a2e96bbdf3f17bb07047e172e624b1eb913f99a42
 DIST firefox-51.0-ka.xpi 469575 SHA256 b77fd8f7cb41ccbcac8d2647b77a8f9d3c84cd4e6524b3dfb3e14e799be0710b SHA512 e8844daf6b2b74e657e1d2f1d6b1c672bce251ec52c8884f0218ce9fbd661b5a93caf70bf60df477dd8774d8516e636f9b48b6eff17e214c68e2ee33619a2e17 WHIRLPOOL f4d659f349d7635dd74b9c72bf8169c4a78138692236953ddad4c4bc7adbdb14bd291ff592f93f1aa799a624567d4fdd60014ebb8ec71de30e32d87aeae47e20
-DIST firefox-51.0-kab.xpi 438428 SHA256 31272f2315a47ecd84307c4538525770297709e36c152b1583ef27831e9ef091 SHA512 8919a8ce1716b605c8d057b41dc58e827574756a07ad3847c2cc8da9822a85016d20daa1e039f9e85c5cdb5381ae24ad3ef4b26ff2c5798a5cb21e4dd41408ab WHIRLPOOL 85c6065021a20d81e56809f88ec373fde88746ac8950958b77186ca44a15526176f6b69630deb5287f442559b6b54501f851a22f42b9b98eae4b33faf8c9db63
 DIST firefox-51.0-kk.xpi 490747 SHA256 000ed1c4d96b3a8807ece3f502a900bcf3d8ba3889200d6d922e37bba8e135c4 SHA512 ec77d183bf222e0858694152c399f7301c430733b6925efa3e3f17fa22f3bc20156ec2f35bb20f746ce9dfedc429722b2f6e4b754fa4e00c079ef239d723fdb9 WHIRLPOOL c3b9994c66864c28e03c6a23404bfcc153ad54ba60995e9c35b8adcc05ef6d7a30788f188f5dafda1b084faf3bc67b8687dc6cc795577553aceb19e5f8d25f0b
 DIST firefox-51.0-km.xpi 514270 SHA256 bf312dccb93b24038cbdff0941276c2704f54ea4588a80b9d7a337ed894cf5b7 SHA512 079216788a9095ecfbdb968b493069eb8a225b9a33992e25bf7566cb33ec8fa4addbdbef6551002f0720e8e505d0be5e479ec04035de919c0e07409305375bd2 WHIRLPOOL 78ae384289580a66f3a41dc979034c8eb95421677ec45d30555f340b81f79168a1923f773ccfbc6d1fa68ac6d23e30e564a150458f3171f506acd5db8779458a
 DIST firefox-51.0-kn.xpi 514060 SHA256 a8b4024791d910285dc9d763b3d6ec3cdf5289683beacd000fde122d79af3810 SHA512 0b4a79f46cbb0e2bbf327294f0a487f2c033a053e67b22ebbaf12b75d17b4084659877b45ec627f5c42b2623d057797425c510a45d837d773436bdeb49512017 WHIRLPOOL 4fea8c54349ae068a44832112a27ee7c07fd851823e908a790e627c32645cd1f89c3ba536365a03b8d0d7cfe60a28b4d108ba81c9e1cf858cf0ab43860cbaea9
diff --git a/www-client/firefox/firefox-45.7.0.ebuild b/www-client/firefox/firefox-45.7.0.ebuild
index acac8f4c4910..6c62d9490f97 100644
--- a/www-client/firefox/firefox-45.7.0.ebuild
+++ b/www-client/firefox/firefox-45.7.0.ebuild
@@ -28,8 +28,8 @@ fi
 PATCH="${PN}-45.0-patches-10"
 MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
 
-MOZCONFIG_OPTIONAL_GTK3=1
-MOZCONFIG_OPTIONAL_QT5=1
+# Kill gtk3 support since gtk+-3.20 breaks it hard prior to 48.0
+#MOZCONFIG_OPTIONAL_GTK3=1
 MOZCONFIG_OPTIONAL_WIFI=1
 MOZCONFIG_OPTIONAL_JIT="enabled"
 
@@ -54,9 +54,7 @@ SRC_URI="${SRC_URI}
 ASM_DEPEND=">=dev-lang/yasm-1.1"
 
 # Mesa 7.10 needed for WebGL + bugfixes
-# gtk3 from 3.20 and above fails hard, limit it
 RDEPEND="
-	gtk3? ( <x11-libs/gtk+-3.20 )
 	>=dev-libs/nss-3.21.1
 	>=dev-libs/nspr-4.12
 	selinux? ( sec-policy/selinux-mozilla )"
@@ -131,8 +129,7 @@ src_unpack() {
 
 src_prepare() {
 	# Apply our patches
-	eapply "${WORKDIR}/firefox" \
-		"${FILESDIR}"/${PN}-45-qt-widget-fix.patch
+	eapply "${WORKDIR}/firefox"
 
 	# Allow user to apply any additional patches without modifing ebuild
 	eapply_user
diff --git a/www-client/firefox/firefox-51.0.ebuild b/www-client/firefox/firefox-51.0.ebuild
index cead05c4db65..03a20ee9a5b5 100644
--- a/www-client/firefox/firefox-51.0.ebuild
+++ b/www-client/firefox/firefox-51.0.ebuild
@@ -10,7 +10,7 @@ MOZ_ESR=""
 # This list can be updated with scripts/get_langs.sh from the mozilla overlay
 MOZ_LANGS=( ach af an ar as ast az bg bn-BD bn-IN br bs ca cak cs cy da de dsb
 el en en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE
-gd gl gn gu-IN he hi-IN hr hsb hu hy-AM id is it ja ka kab kk km kn ko lij lt lv
+gd gl gn gu-IN he hi-IN hr hsb hu hy-AM id is it ja ka kk km kn ko lij lt lv
 mai mk ml mr ms nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq
 sr sv-SE ta te th tr uk uz vi xh zh-CN zh-TW )
 
diff --git a/www-client/firefox/metadata.xml b/www-client/firefox/metadata.xml
index 87f2dce5ad13..73dd758ae52a 100644
--- a/www-client/firefox/metadata.xml
+++ b/www-client/firefox/metadata.xml
@@ -11,15 +11,17 @@
 	<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="gstreamer-0">Use gstreamer:0.10 instead of gstreamer:1 for media support</flag>
-	<flag name="hwaccel">Use hardware-accelerated rendering</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>
 	<flag name="system-harfbuzz">Use the system-wide <pkg>media-libs/harfbuzz</pkg>