[gentoo-commits] proj/mozilla:master commit in: eclass/

[Jory Pratt]

commit:     7c0970a092e19fd8c1df802d029d8bf630fc73ec
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  2 03:01:57 2017 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Thu Feb  2 03:01:57 2017 +0000
URL:        https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=7c0970a0

eclass/mozconfig-v6.51 : Remove skia support as being optional and force
it to be default

 eclass/mozconfig-v6.51.eclass | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/eclass/mozconfig-v6.51.eclass b/eclass/mozconfig-v6.51.eclass
index 7bbed9a..1e451f8 100644
--- a/eclass/mozconfig-v6.51.eclass
+++ b/eclass/mozconfig-v6.51.eclass
@@ -83,7 +83,7 @@ inherit flag-o-matic toolchain-funcs mozcoreconf-v4
 # 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 +jemalloc neon pulseaudio selinux +skia 
startup-notification system-cairo
+IUSE="${IUSE} dbus debug +jemalloc neon pulseaudio selinux 
startup-notification system-cairo
        system-harfbuzz system-icu system-jpeg system-libevent system-sqlite 
system-libvpx"
 
 # some notes on deps:
@@ -286,7 +286,7 @@ mozconfig_config() {
        mozconfig_annotate 'Gentoo default' --with-system-png
        mozconfig_annotate '' --enable-system-ffi
        mozconfig_annotate 'Gentoo default to honor system linker' 
--disable-gold
-       mozconfig_use_enable skia
+       mozconfig_annotate '' skia
        mozconfig_annotate '' --disable-gconf
        mozconfig_annotate '' --with-intl-api
 
@@ -404,12 +404,4 @@ mozconfig_install_prefs() {
                echo 
"sticky_pref(\"gfx.font_rendering.graphite.enabled\",true);" \
                        >>"${prefs_file}" || die
        fi
-
-       # force cairo as the canvas renderer if USE=skia is disabled
-       if ! use skia ; then
-               echo "lockPref(\"gfx.canvas.azure.backends\",\"cairo\");" \
-                       >>"${prefs_file}" || die
-               echo "lockPref(\"gfx.content.azure.backends\",\"cairo\");" \
-                       >>"${prefs_file}" || die
-       fi
 }