*/*: Bump copyright on files touched this year

[gentoo.git] / eclass / mozconfig-v6.52.eclass

diff --git a/eclass/mozconfig-v6.52.eclass b/eclass/mozconfig-v6.52.eclass
index f66ed060dc5347cb024007996ee363d506268ed6..b8d9bb57c0db96bd9af27c91bd9d37bdb3bb8134 100644 (file)
--- a/eclass/mozconfig-v6.52.eclass
+++ b/eclass/mozconfig-v6.52.eclass
@@ -1,9 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 #
 # @ECLASS: mozconfig-v6.52.eclass
 # @MAINTAINER:
 # mozilla team <mozilla@gentoo.org>
+# @SUPPORTED_EAPIS: 5 6 7
 # @BLURB: the new mozilla common configuration eclass for FF33 and newer, v6
 # @DESCRIPTION:
 # This eclass is used in mozilla ebuilds (firefox, thunderbird, seamonkey)
@@ -26,9 +27,10 @@ case ${EAPI} in
                ;;
 esac
 
-inherit flag-o-matic toolchain-funcs mozcoreconf-v4
+inherit flag-o-matic toolchain-funcs mozcoreconf-v5
 
 # @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_WIFI
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # Set this variable before the inherit line, when an ebuild needs to provide
 # optional necko-wifi support via IUSE="wifi".  Currently this would include
@@ -39,6 +41,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.
 
 # @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_JIT
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # Set this variable before the inherit line, when an ebuild needs to provide
 # deterministic jit support via IUSE="jit".  The upstream default will be used
@@ -49,6 +52,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.
 
 # @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_GTK3
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # Set this variable before the inherit line, when an ebuild can provide
 # optional gtk3 support via IUSE="force-gtk3".  Currently this would include
@@ -61,6 +65,7 @@ inherit flag-o-matic toolchain-funcs mozcoreconf-v4
 # MOZCONFIG_OPTIONAL_GTK2ONLY.
 
 # @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_GTK2ONLY
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # Set this variable before the inherit line, when an ebuild can provide
 # optional gtk2-only support via IUSE="gtk2".
@@ -74,6 +79,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.
 
 # @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_QT5
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # Set this variable before the inherit line, when an ebuild can provide
 # optional qt5 support via IUSE="qt5".  Currently this would include
@@ -120,10 +126,10 @@ RDEPEND=">=app-text/hunspell-1.2:=
        x11-libs/libXfixes
        x11-libs/libXrender
        x11-libs/libXt
-       system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=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-58.1:= )
        system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-       system-libevent? ( >=dev-libs/libevent-2.0:0= )
+       system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
        system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] )
        system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] )
        system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.8 )
@@ -201,7 +207,7 @@ mozconfig_config() {
                fi
        fi
 
-       # Enable position independent executables 
+       # Enable position independent executables
        mozconfig_annotate 'enabled by Gentoo' --enable-pie
        mozconfig_use_enable debug
        mozconfig_use_enable debug tests
@@ -328,10 +334,6 @@ mozconfig_config() {
        fi
        if [[ ${CHOST} == armv* ]] ; then
                mozconfig_annotate '' --with-float-abi=hard
-               if ! use skia ; then
-                       mozconfig_annotate 'Gentoo forces skia for arm' --enable-skia
-               fi
-
                if ! use system-libvpx ; then
                        sed -i -e "s|softfp|hard|" \
                                "${S}"/media/libvpx/moz.build