[gentoo-commits] repo/gentoo:master commit in: eclass/

[Jory Pratt]

commit:     6774ea3aef72cf1c2cd7a2a3b04261eaa105108d
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 30 00:19:30 2015 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Mon Nov 30 00:21:24 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6774ea3a

eclass mozconfig-v6.42 - add xcb dep on system-cairo

 eclass/mozconfig-v6.42.eclass | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/eclass/mozconfig-v6.42.eclass b/eclass/mozconfig-v6.42.eclass
index 3d67500..7ed7283 100644
--- a/eclass/mozconfig-v6.42.eclass
+++ b/eclass/mozconfig-v6.42.eclass
@@ -99,21 +99,13 @@ RDEPEND=">=app-text/hunspell-1.2
        x11-libs/libXfixes
        x11-libs/libXrender
        x11-libs/libXt
-       system-cairo? ( >=x11-libs/cairo-1.12[X] >=x11-libs/pixman-0.19.2 )
+       system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=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.11.1:3[secure-delete,debug=] )
        system-libvpx? ( >=media-libs/libvpx-1.3.0:0=[postproc] )
 "
 
-# dev-lang/yaml is needed on all available platforms for webm support:
-DEPEND+="
-       amd64? ( dev-lang/yasm )
-       amd64-fbsd? ( dev-lang/yasm )
-       x86? ( dev-lang/yasm )
-       x86-fbsd? ( dev-lang/yasm )
-"
-
 if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then
        if [[ ${MOZCONFIG_OPTIONAL_GTK3} = "enabled" ]]; then
                IUSE+=" +gtk3"
@@ -241,6 +233,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_annotate 'Gentoo default' --disable-skia
        mozconfig_annotate '' --disable-gconf
 
        # Use jemalloc unless libc is not glibc >= 2.4