commit:     6b71cbe870674854ee483b9a3c4a6ab62a174bc2
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 18 08:06:48 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Apr 18 08:10:37 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b71cbe8

mozconfig-*.eclass: Remove old unused eclasses

Acked-by: Lars Wendler <polynomial-c <AT> gentoo.org>
Closes: https://bugs.gentoo.org/642704

 eclass/mozconfig-v6.49.eclass | 413 -----------------------------------------
 eclass/mozconfig-v6.51.eclass | 419 ------------------------------------------
 eclass/mozconfig-v6.53.eclass | 393 ---------------------------------------
 eclass/mozconfig-v6.55.eclass | 386 --------------------------------------
 eclass/mozconfig-v6.56.eclass | 397 ---------------------------------------
 eclass/mozconfig-v6.57.eclass | 399 ----------------------------------------
 6 files changed, 2407 deletions(-)

diff --git a/eclass/mozconfig-v6.49.eclass b/eclass/mozconfig-v6.49.eclass
deleted file mode 100644
index 4ca5b079b8f..00000000000
--- a/eclass/mozconfig-v6.49.eclass
+++ /dev/null
@@ -1,413 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-#
-# @ECLASS: mozconfig-v6.49.eclass
-# @MAINTAINER:
-# mozilla team <mozi...@gentoo.org>
-# @BLURB: the new mozilla common configuration eclass for FF33 and newer, v6
-# @DESCRIPTION:
-# This eclass is used in mozilla ebuilds (firefox, thunderbird, seamonkey)
-# to provide a single common place for the common mozilla engine compoments.
-#
-# The eclass provides all common dependencies as well as common use flags.
-#
-# Some use flags which may be optional in particular mozilla packages can be
-# supported through setting eclass variables.
-#
-# This eclass inherits mozconfig helper functions as defined in mozcoreconf-v3,
-# and so ebuilds inheriting this eclass do not need to inherit that.
-
-case ${EAPI} in
-       0|1|2|3|4)
-               die "EAPI=${EAPI} not supported"
-               ;;
-       5)
-               inherit multilib
-               ;;
-esac
-
-inherit flag-o-matic toolchain-funcs mozcoreconf-v4
-
-# @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
-# ebuilds for firefox, and potentially seamonkey.
-#
-# Leave the variable UNSET if necko-wifi support should not be available.
-# Set the variable to "enabled" if the use flag should be enabled by default.
-# 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
-# optional necko-wifi support via IUSE="jit".  Currently this would include
-# ebuilds for firefox, and potentially seamonkey.
-#
-# Leave the variable UNSET if optional jit support should not be available.
-# Set the variable to "enabled" if the use flag should be enabled by default.
-# 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="gtk3".  Currently this would include
-# ebuilds for firefox, but thunderbird and seamonkey could follow in the 
future.
-#
-# Leave the variable UNSET if gtk3 support should not be available.
-# Set the variable to "enabled" if the use flag should be enabled by default.
-# Set the variable to any value if the use flag should exist but not be 
default-enabled.
-
-# @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".
-#
-# Note that this option conflicts directly with MOZCONFIG_OPTIONAL_GTK3, both
-# variables cannot be set at the same time and this variable will be ignored if
-# MOZCONFIG_OPTIONAL_GTK3 is set.
-#
-# Leave the variable UNSET if gtk2-only support should not be available.
-# Set the variable to "enabled" if the use flag should be enabled by default.
-# 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
-# ebuilds for firefox, but thunderbird and seamonkey could follow in the 
future.
-#
-# Leave the variable UNSET if qt5 support should not be available.
-# Set the variable to "enabled" if the use flag should be enabled by default.
-# 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
-       system-harfbuzz system-icu system-jpeg system-libevent system-sqlite 
system-libvpx"
-
-# some notes on deps:
-# gtk:2 minimum is technically 2.10 but gio support (enabled by default) needs 
2.14
-# media-libs/mesa needs to be 10.2 or above due to a bug with flash+vdpau
-
-RDEPEND=">=app-text/hunspell-1.2:=
-       dev-libs/atk
-       dev-libs/expat
-       >=x11-libs/cairo-1.10[X]
-       >=x11-libs/gtk+-2.18:2
-       x11-libs/gdk-pixbuf
-       >=x11-libs/pango-1.22.0
-       >=media-libs/libpng-1.6.21:0=[apng]
-       >=media-libs/mesa-10.2:*
-       media-libs/fontconfig
-       >=media-libs/freetype-2.4.10
-       kernel_linux? ( media-libs/alsa-lib )
-       pulseaudio? ( media-sound/pulseaudio )
-       virtual/freedesktop-icon-theme
-       dbus? ( >=sys-apps/dbus-0.60
-               >=dev-libs/dbus-glib-0.72 )
-       startup-notification? ( >=x11-libs/startup-notification-0.8 )
-       >=dev-libs/glib-2.26:2
-       >=sys-libs/zlib-1.2.3
-       >=virtual/libffi-3.0.10
-       virtual/ffmpeg
-       x11-libs/libX11
-       x11-libs/libXcomposite
-       x11-libs/libXdamage
-       x11-libs/libXext
-       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-icu? ( >=dev-libs/icu-56.1:= )
-       system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-       system-libevent? ( >=dev-libs/libevent-2.0:0= )
-       system-sqlite? ( >=dev-db/sqlite-3.13.0:3[secure-delete,debug=] )
-       system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] )
-       system-harfbuzz? ( >=media-libs/harfbuzz-1.2.6:0=[graphite,icu] 
>=media-gfx/graphite2-1.3.8 )
-"
-
-if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then
-       MOZCONFIG_OPTIONAL_GTK2ONLY=
-       if [[ ${MOZCONFIG_OPTIONAL_GTK3} = "enabled" ]]; then
-               IUSE+=" +gtk3"
-       else
-               IUSE+=" gtk3"
-       fi
-       RDEPEND+="
-       gtk3? ( >=x11-libs/gtk+-3.4.0:3 )"
-elif [[ -n ${MOZCONFIG_OPTIONAL_GTK2ONLY} ]]; then
-       if [[ ${MOZCONFIG_OPTIONAL_GTK2ONLY} = "enabled" ]]; then
-               IUSE+=" +gtk2"
-       else
-               IUSE+=" gtk2"
-       fi
-       RDEPEND+="
-       !gtk2? ( >=x11-libs/gtk+-3.4.0:3 )"
-fi
-if [[ -n ${MOZCONFIG_OPTIONAL_QT5} ]]; then
-       inherit qmake-utils
-       if [[ ${MOZCONFIG_OPTIONAL_QT5} = "enabled" ]]; then
-               IUSE+=" +qt5"
-       else
-               IUSE+=" qt5"
-       fi
-       RDEPEND+="
-       qt5? (
-               dev-qt/qtcore:5
-               dev-qt/qtgui:5
-               dev-qt/qtnetwork:5
-               dev-qt/qtprintsupport:5
-               dev-qt/qtwidgets:5
-               dev-qt/qtxml:5
-               dev-qt/qtdeclarative:5
-       )"
-fi
-if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]]; then
-       if [[ ${MOZCONFIG_OPTIONAL_WIFI} = "enabled" ]]; then
-               IUSE+=" +wifi"
-       else
-               IUSE+=" wifi"
-       fi
-       RDEPEND+="
-       wifi? (
-               kernel_linux? ( >=sys-apps/dbus-0.60
-                       >=dev-libs/dbus-glib-0.72
-                       net-misc/networkmanager )
-       )"
-fi
-if [[ -n ${MOZCONFIG_OPTIONAL_JIT} ]]; then
-       if [[ ${MOZCONFIG_OPTIONAL_JIT} = "enabled" ]]; then
-               IUSE+=" +jit"
-       else
-               IUSE+=" jit"
-       fi
-fi
-
-DEPEND="app-arch/zip
-       app-arch/unzip
-       >=sys-devel/binutils-2.16.1
-       sys-apps/findutils
-       ${RDEPEND}"
-
-RDEPEND+="
-       selinux? ( sec-policy/selinux-mozilla )"
-
-# force system-icu if system-harfbuzz is selected, to avoid potential ABI 
issues
-REQUIRED_USE="
-       system-harfbuzz? ( system-icu )"
-
-# only one of gtk3 or qt5 should be permitted to be selected, since only one 
will be used.
-[[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]] && [[ -n ${MOZCONFIG_OPTIONAL_QT5} ]] && \
-       REQUIRED_USE+=" ?? ( gtk3 qt5 )"
-
-# only one of gtk2 or qt5 should be permitted to be selected, since only one 
will be used.
-[[ -n ${MOZCONFIG_OPTIONAL_GTK2ONLY} ]] && [[ -n ${MOZCONFIG_OPTIONAL_QT5} ]] 
&& \
-       REQUIRED_USE+=" ?? ( gtk2 qt5 )"
-
-# @FUNCTION: mozconfig_config
-# @DESCRIPTION:
-# Set common configure options for mozilla packages.
-# Call this within src_configure() phase, after mozconfig_init
-#
-# Example:
-#
-# inherit mozconfig-v6.46
-#
-# src_configure() {
-#      mozconfig_init
-#      mozconfig_config
-#      # ... misc ebuild-unique settings via calls to
-#      # ... mozconfig_{annotate,use_with,use_enable}
-#      mozconfig_final
-# }
-
-mozconfig_config() {
-       # Migrated from mozcoreconf-2
-       mozconfig_annotate 'system_libs' \
-               --with-system-zlib \
-               --with-system-bz2
-
-       if has bindist ${IUSE}; then
-               mozconfig_use_enable !bindist official-branding
-               if [[ ${PN} == firefox ]] && use bindist ; then
-                       mozconfig_annotate '' 
--with-branding=browser/branding/aurora
-               fi
-       fi
-
-       mozconfig_use_enable debug
-       mozconfig_use_enable debug tests
-
-       if ! use debug ; then
-               mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
-       else
-               mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols
-       fi
-
-       mozconfig_use_enable startup-notification
-
-       if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]] ; then
-               # wifi pulls in dbus so manage both here
-               mozconfig_use_enable wifi necko-wifi
-               if use kernel_linux && use wifi && ! use dbus; then
-                       echo "Enabling dbus support due to wifi request"
-                       mozconfig_annotate 'dbus required by necko-wifi on 
linux' --enable-dbus
-               else
-                       mozconfig_use_enable dbus
-               fi
-       else
-               mozconfig_use_enable dbus
-               mozconfig_annotate 'disabled' --disable-necko-wifi
-       fi
-
-       if [[ -n ${MOZCONFIG_OPTIONAL_JIT} ]]; then
-               mozconfig_use_enable jit ion
-       fi
-
-       # These are enabled by default in all mozilla applications
-       mozconfig_annotate '' --with-system-nspr 
--with-nspr-prefix="${SYSROOT}${EPREFIX}"/usr
-       mozconfig_annotate '' --with-system-nss 
--with-nss-prefix="${SYSROOT}${EPREFIX}"/usr
-       mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX}"/usr/include 
--x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir)
-       if use system-libevent; then
-               mozconfig_annotate '' 
--with-system-libevent="${SYSROOT}${EPREFIX}"/usr
-       fi
-       mozconfig_annotate '' --prefix="${EPREFIX}"/usr
-       mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
-       mozconfig_annotate 'Gentoo default' --enable-system-hunspell
-       mozconfig_annotate '' --disable-gnomeui
-       mozconfig_annotate '' --enable-gio
-       mozconfig_annotate '' --disable-crashreporter
-       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 '' --disable-gconf
-       mozconfig_annotate '' --with-intl-api
-
-       # default toolkit is cairo-gtk2, optional use flags can change this
-       local toolkit="cairo-gtk2"
-       local toolkit_comment=""
-       if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then
-               if use gtk3; then
-                       toolkit="cairo-gtk3"
-                       toolkit_comment="gtk3 use flag"
-               fi
-       fi
-       if [[ -n ${MOZCONFIG_OPTIONAL_GTK2ONLY} ]]; then
-               if ! use gtk2 ; then
-                       toolkit="cairo-gtk3"
-               else
-                       toolkit_comment="gtk2 use flag"
-               fi
-       fi
-       if [[ -n ${MOZCONFIG_OPTIONAL_QT5} ]]; then
-               if use qt5; then
-                       toolkit="cairo-qt"
-                       toolkit_comment="qt5 use flag"
-                       # need to specify these vars because the qt5 versions 
are not found otherwise,
-                       # and setting --with-qtdir overrides the pkg-config 
include dirs
-                       local i
-                       for i in qmake moc rcc; do
-                               echo "export 
HOST_${i^^}=\"$(qt5_get_bindir)/${i}\"" \
-                                       >> "${S}"/.mozconfig || die
-                       done
-                       echo 'unset QTDIR' >> "${S}"/.mozconfig || die
-                       mozconfig_annotate '+qt5' --disable-gio
-               fi
-       fi
-       mozconfig_annotate "${toolkit_comment}" 
--enable-default-toolkit=${toolkit}
-
-       # Use jemalloc unless libc is not glibc >= 2.4
-       # at this time the minimum glibc in the tree is 2.9 so we should be 
safe.
-       if use elibc_glibc && use jemalloc; then
-               # We must force-enable jemalloc 4 via .mozconfig
-               echo "export MOZ_JEMALLOC4=1" >> "${S}"/.mozconfig || die
-               mozconfig_annotate '' --enable-replace-malloc
-       fi
-
-       # Instead of the standard --build= and --host=, mozilla uses --host 
instead
-       # of --build, and --target intstead of --host.
-       # Note, mozilla also has --build but it does not do what you think it 
does.
-       # Set both --target and --host as mozilla uses python to guess values 
otherwise
-       mozconfig_annotate '' --target="${CHOST}"
-       mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
-
-       mozconfig_use_enable pulseaudio
-
-       mozconfig_use_enable system-cairo
-       mozconfig_use_enable system-sqlite
-       mozconfig_use_with system-jpeg
-       mozconfig_use_with system-icu
-       mozconfig_use_with system-libvpx
-       mozconfig_use_with system-harfbuzz
-       mozconfig_use_with system-harfbuzz system-graphite2
-
-       # Modifications to better support ARM, bug 553364
-       if use neon ; then
-               mozconfig_annotate '' --with-fpu=neon
-               mozconfig_annotate '' --with-thumb=yes
-               mozconfig_annotate '' --with-thumb-interwork=no
-       fi
-       if [[ ${CHOST} == armv* ]] ; then
-               mozconfig_annotate '' --with-float-abi=hard
-               mozconfig_annotate '' --enable-skia
-
-               if ! use system-libvpx ; then
-                       sed -i -e "s|softfp|hard|" \
-                               "${S}"/media/libvpx/moz.build
-               fi
-       fi
-}
-
-# @FUNCTION: mozconfig_install_prefs
-# @DESCRIPTION:
-# Set preferences into the prefs.js file specified as a parameter to
-# the function.  This sets both some common prefs to all mozilla
-# packages, and any prefs that may relate to the use flags administered
-# by mozconfig_config().
-#
-# Call this within src_install() phase, after copying the template
-# prefs file (if any) from ${FILESDIR}
-#
-# Example:
-#
-# inherit mozconfig-v6.46
-#
-# src_install() {
-#      cp "${FILESDIR}"/gentoo-default-prefs.js \
-#      "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js"  
\
-#      || die
-#
-#      mozconfig_install_prefs \
-#      "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js"
-#
-#      ...
-# }
-
-mozconfig_install_prefs() {
-       local prefs_file="${1}"
-
-       einfo "Adding prefs from mozconfig to ${prefs_file}"
-
-       # set dictionary path, to use system hunspell
-       echo "pref(\"spellchecker.dictionary_path\", 
\"${EPREFIX}/usr/share/myspell\");" \
-               >>"${prefs_file}" || die
-
-       # force the graphite pref if system-harfbuzz is enabled, since the pref 
cant disable it
-       if use system-harfbuzz ; then
-               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
-}

diff --git a/eclass/mozconfig-v6.51.eclass b/eclass/mozconfig-v6.51.eclass
deleted file mode 100644
index e2d65ca2573..00000000000
--- a/eclass/mozconfig-v6.51.eclass
+++ /dev/null
@@ -1,419 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-#
-# @ECLASS: mozconfig-v6.51.eclass
-# @MAINTAINER:
-# mozilla team <mozi...@gentoo.org>
-# @BLURB: the new mozilla common configuration eclass for FF33 and newer, v6
-# @DESCRIPTION:
-# This eclass is used in mozilla ebuilds (firefox, thunderbird, seamonkey)
-# to provide a single common place for the common mozilla engine compoments.
-#
-# The eclass provides all common dependencies as well as common use flags.
-#
-# Some use flags which may be optional in particular mozilla packages can be
-# supported through setting eclass variables.
-#
-# This eclass inherits mozconfig helper functions as defined in mozcoreconf-v3,
-# and so ebuilds inheriting this eclass do not need to inherit that.
-
-case ${EAPI} in
-       0|1|2|3|4)
-               die "EAPI=${EAPI} not supported"
-               ;;
-       5)
-               inherit multilib
-               ;;
-esac
-
-inherit flag-o-matic toolchain-funcs mozcoreconf-v4
-
-# @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
-# ebuilds for firefox, and potentially seamonkey.
-#
-# Leave the variable UNSET if necko-wifi support should not be available.
-# Set the variable to "enabled" if the use flag should be enabled by default.
-# 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
-# otherwise, which is generally to enable jit unless support for the platform
-# is missing.
-#
-# Set the variable to "enabled" if the use flag should be enabled by default.
-# 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="gtk3".  Currently this would include
-# ebuilds for firefox, but thunderbird and seamonkey could follow in the 
future.
-#
-# Leave the variable UNSET if gtk3 support should not be available.
-# Set the variable to "enabled" if the use flag should be enabled by default.
-# Set the variable to any value if the use flag should exist but not be 
default-enabled.
-
-# @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".
-#
-# Note that this option conflicts directly with MOZCONFIG_OPTIONAL_GTK3, both
-# variables cannot be set at the same time and this variable will be ignored if
-# MOZCONFIG_OPTIONAL_GTK3 is set.
-#
-# Leave the variable UNSET if gtk2-only support should not be available.
-# Set the variable to "enabled" if the use flag should be enabled by default.
-# 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
-# ebuilds for firefox, but thunderbird and seamonkey could follow in the 
future.
-#
-# Leave the variable UNSET if qt5 support should not be available.
-# Set the variable to "enabled" if the use flag should be enabled by default.
-# 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
-       system-harfbuzz system-icu system-jpeg system-libevent system-sqlite 
system-libvpx"
-
-# some notes on deps:
-# gtk:2 minimum is technically 2.10 but gio support (enabled by default) needs 
2.14
-# media-libs/mesa needs to be 10.2 or above due to a bug with flash+vdpau
-
-RDEPEND=">=app-text/hunspell-1.2:=
-       dev-libs/atk
-       dev-libs/expat
-       >=x11-libs/cairo-1.10[X]
-       x11-libs/gdk-pixbuf
-       >=x11-libs/pango-1.22.0
-       >=media-libs/libpng-1.6.25:0=[apng]
-       >=media-libs/mesa-10.2:*
-       media-libs/fontconfig
-       >=media-libs/freetype-2.4.10
-       kernel_linux? ( media-libs/alsa-lib )
-       pulseaudio? ( media-sound/pulseaudio )
-       virtual/freedesktop-icon-theme
-       dbus? ( >=sys-apps/dbus-0.60
-               >=dev-libs/dbus-glib-0.72 )
-       startup-notification? ( >=x11-libs/startup-notification-0.8 )
-       >=dev-libs/glib-2.26:2
-       >=sys-libs/zlib-1.2.3
-       >=virtual/libffi-3.0.10
-       virtual/ffmpeg
-       x11-libs/libX11
-       x11-libs/libXcomposite
-       x11-libs/libXdamage
-       x11-libs/libXext
-       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-icu? ( >=dev-libs/icu-56.1:= )
-       system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-       system-libevent? ( >=dev-libs/libevent-2.0:0= )
-       system-sqlite? ( >=dev-db/sqlite-3.14.1:3[secure-delete,debug=] )
-       system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] )
-       system-harfbuzz? ( >=media-libs/harfbuzz-1.2.6:0=[graphite,icu] 
>=media-gfx/graphite2-1.3.8 )
-"
-
-if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then
-       MOZCONFIG_OPTIONAL_GTK2ONLY=
-       if [[ ${MOZCONFIG_OPTIONAL_GTK3} = "enabled" ]]; then
-               IUSE+=" +gtk3"
-       else
-               IUSE+=" gtk3"
-       fi
-       RDEPEND+="
-       gtk3? ( >=x11-libs/gtk+-3.4.0:3 )
-       !gtk3? ( >=x11-libs/gtk+-2.18:2 )"
-elif [[ -n ${MOZCONFIG_OPTIONAL_GTK2ONLY} ]]; then
-       if [[ ${MOZCONFIG_OPTIONAL_GTK2ONLY} = "enabled" ]]; then
-               IUSE+=" +gtk2"
-       else
-               IUSE+=" gtk2"
-       fi
-       RDEPEND+="
-       gtk2? ( >=x11-libs/gtk+-2.18:2 )
-       !gtk2? ( >=x11-libs/gtk+-3.4.0:3 )"
-else
-       RDEPEND+="
-               >=x11-libs/gtk+-2.18:2"
-fi
-if [[ -n ${MOZCONFIG_OPTIONAL_QT5} ]]; then
-       inherit qmake-utils
-       if [[ ${MOZCONFIG_OPTIONAL_QT5} = "enabled" ]]; then
-               IUSE+=" +qt5"
-       else
-               IUSE+=" qt5"
-       fi
-       RDEPEND+="
-       qt5? (
-               dev-qt/qtcore:5
-               dev-qt/qtgui:5
-               dev-qt/qtnetwork:5
-               dev-qt/qtprintsupport:5
-               dev-qt/qtwidgets:5
-               dev-qt/qtxml:5
-               dev-qt/qtdeclarative:5
-       )"
-fi
-if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]]; then
-       if [[ ${MOZCONFIG_OPTIONAL_WIFI} = "enabled" ]]; then
-               IUSE+=" +wifi"
-       else
-               IUSE+=" wifi"
-       fi
-       RDEPEND+="
-       wifi? (
-               kernel_linux? ( >=sys-apps/dbus-0.60
-                       >=dev-libs/dbus-glib-0.72
-                       net-misc/networkmanager )
-       )"
-fi
-if [[ -n ${MOZCONFIG_OPTIONAL_JIT} ]]; then
-       if [[ ${MOZCONFIG_OPTIONAL_JIT} = "enabled" ]]; then
-               IUSE+=" +jit"
-       else
-               IUSE+=" jit"
-       fi
-fi
-
-DEPEND="app-arch/zip
-       app-arch/unzip
-       >=sys-devel/binutils-2.16.1
-       sys-apps/findutils
-       ${RDEPEND}"
-
-RDEPEND+="
-       selinux? ( sec-policy/selinux-mozilla )"
-
-# force system-icu if system-harfbuzz is selected, to avoid potential ABI 
issues
-REQUIRED_USE="
-       system-harfbuzz? ( system-icu )"
-
-# only one of gtk3 or qt5 should be permitted to be selected, since only one 
will be used.
-[[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]] && [[ -n ${MOZCONFIG_OPTIONAL_QT5} ]] && \
-       REQUIRED_USE+=" ?? ( gtk3 qt5 )"
-
-# only one of gtk2 or qt5 should be permitted to be selected, since only one 
will be used.
-[[ -n ${MOZCONFIG_OPTIONAL_GTK2ONLY} ]] && [[ -n ${MOZCONFIG_OPTIONAL_QT5} ]] 
&& \
-       REQUIRED_USE+=" ?? ( gtk2 qt5 )"
-
-# @FUNCTION: mozconfig_config
-# @DESCRIPTION:
-# Set common configure options for mozilla packages.
-# Call this within src_configure() phase, after mozconfig_init
-#
-# Example:
-#
-# inherit mozconfig-v6.46
-#
-# src_configure() {
-#      mozconfig_init
-#      mozconfig_config
-#      # ... misc ebuild-unique settings via calls to
-#      # ... mozconfig_{annotate,use_with,use_enable}
-#      mozconfig_final
-# }
-
-mozconfig_config() {
-       # Migrated from mozcoreconf-2
-       mozconfig_annotate 'system_libs' \
-               --with-system-zlib \
-               --with-system-bz2
-
-       if has bindist ${IUSE}; then
-               mozconfig_use_enable !bindist official-branding
-               if [[ ${PN} == firefox ]] && use bindist ; then
-                       mozconfig_annotate '' 
--with-branding=browser/branding/aurora
-               fi
-       fi
-
-       # Enable position independent executables
-       mozconfig_annotate 'enabled by Gentoo' --enable-pie
-       mozconfig_use_enable debug
-       mozconfig_use_enable debug tests
-
-       if ! use debug ; then
-               mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
-       else
-               mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols
-       fi
-
-       mozconfig_use_enable startup-notification
-
-       if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]] ; then
-               # wifi pulls in dbus so manage both here
-               mozconfig_use_enable wifi necko-wifi
-               if use kernel_linux && use wifi && ! use dbus; then
-                       echo "Enabling dbus support due to wifi request"
-                       mozconfig_annotate 'dbus required by necko-wifi on 
linux' --enable-dbus
-               else
-                       mozconfig_use_enable dbus
-               fi
-       else
-               mozconfig_use_enable dbus
-               mozconfig_annotate 'disabled' --disable-necko-wifi
-       fi
-
-       if [[ -n ${MOZCONFIG_OPTIONAL_JIT} ]]; then
-               mozconfig_use_enable jit ion
-       fi
-
-       # These are enabled by default in all mozilla applications
-       mozconfig_annotate '' --with-system-nspr 
--with-nspr-prefix="${SYSROOT}${EPREFIX}"/usr
-       mozconfig_annotate '' --with-system-nss 
--with-nss-prefix="${SYSROOT}${EPREFIX}"/usr
-       mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX}"/usr/include 
--x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir)
-       if use system-libevent; then
-               mozconfig_annotate '' 
--with-system-libevent="${SYSROOT}${EPREFIX}"/usr
-       fi
-       mozconfig_annotate '' --prefix="${EPREFIX}"/usr
-       mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
-       mozconfig_annotate 'Gentoo default' --enable-system-hunspell
-       mozconfig_annotate '' --disable-gnomeui
-       mozconfig_annotate '' --enable-gio
-       mozconfig_annotate '' --disable-crashreporter
-       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 '' --disable-gconf
-       mozconfig_annotate '' --with-intl-api
-
-       # default toolkit is cairo-gtk2, optional use flags can change this
-       local toolkit="cairo-gtk2"
-       local toolkit_comment=""
-       if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then
-               if use gtk3; then
-                       toolkit="cairo-gtk3"
-                       toolkit_comment="gtk3 use flag"
-               fi
-       fi
-       if [[ -n ${MOZCONFIG_OPTIONAL_GTK2ONLY} ]]; then
-               if ! use gtk2 ; then
-                       toolkit="cairo-gtk3"
-               else
-                       toolkit_comment="gtk2 use flag"
-               fi
-       fi
-       if [[ -n ${MOZCONFIG_OPTIONAL_QT5} ]]; then
-               if use qt5; then
-                       toolkit="cairo-qt"
-                       toolkit_comment="qt5 use flag"
-                       # need to specify these vars because the qt5 versions 
are not found otherwise,
-                       # and setting --with-qtdir overrides the pkg-config 
include dirs
-                       local i
-                       for i in qmake moc rcc; do
-                               echo "export 
HOST_${i^^}=\"$(qt5_get_bindir)/${i}\"" \
-                                       >> "${S}"/.mozconfig || die
-                       done
-                       echo 'unset QTDIR' >> "${S}"/.mozconfig || die
-                       mozconfig_annotate '+qt5' --disable-gio
-               fi
-       fi
-       mozconfig_annotate "${toolkit_comment}" 
--enable-default-toolkit=${toolkit}
-
-       # Use jemalloc unless libc is not glibc >= 2.4
-       # at this time the minimum glibc in the tree is 2.9 so we should be 
safe.
-       if use elibc_glibc && use jemalloc; then
-               # We must force-enable jemalloc 4 via .mozconfig
-               echo "export MOZ_JEMALLOC4=1" >> "${S}"/.mozconfig || die
-               mozconfig_annotate '' --enable-replace-malloc
-       fi
-
-       # Instead of the standard --build= and --host=, mozilla uses --host 
instead
-       # of --build, and --target intstead of --host.
-       # Note, mozilla also has --build but it does not do what you think it 
does.
-       # Set both --target and --host as mozilla uses python to guess values 
otherwise
-       mozconfig_annotate '' --target="${CHOST}"
-       mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
-
-       mozconfig_use_enable pulseaudio
-
-       mozconfig_use_enable system-cairo
-       mozconfig_use_enable system-sqlite
-       mozconfig_use_with system-jpeg
-       mozconfig_use_with system-icu
-       mozconfig_use_with system-libvpx
-       mozconfig_use_with system-harfbuzz
-       mozconfig_use_with system-harfbuzz system-graphite2
-
-       # Modifications to better support ARM, bug 553364
-       if use neon ; then
-               mozconfig_annotate '' --with-fpu=neon
-               mozconfig_annotate '' --with-thumb=yes
-               mozconfig_annotate '' --with-thumb-interwork=no
-       fi
-       if [[ ${CHOST} == armv* ]] ; then
-               mozconfig_annotate '' --with-float-abi=hard
-               mozconfig_annotate '' --enable-skia
-
-               if ! use system-libvpx ; then
-                       sed -i -e "s|softfp|hard|" \
-                               "${S}"/media/libvpx/moz.build
-               fi
-       fi
-}
-
-# @FUNCTION: mozconfig_install_prefs
-# @DESCRIPTION:
-# Set preferences into the prefs.js file specified as a parameter to
-# the function.  This sets both some common prefs to all mozilla
-# packages, and any prefs that may relate to the use flags administered
-# by mozconfig_config().
-#
-# Call this within src_install() phase, after copying the template
-# prefs file (if any) from ${FILESDIR}
-#
-# Example:
-#
-# inherit mozconfig-v6.46
-#
-# src_install() {
-#      cp "${FILESDIR}"/gentoo-default-prefs.js \
-#      "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js"  
\
-#      || die
-#
-#      mozconfig_install_prefs \
-#      "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js"
-#
-#      ...
-# }
-
-mozconfig_install_prefs() {
-       local prefs_file="${1}"
-
-       einfo "Adding prefs from mozconfig to ${prefs_file}"
-
-       # set dictionary path, to use system hunspell
-       echo "pref(\"spellchecker.dictionary_path\", 
\"${EPREFIX}/usr/share/myspell\");" \
-               >>"${prefs_file}" || die
-
-       # force the graphite pref if system-harfbuzz is enabled, since the pref 
cant disable it
-       if use system-harfbuzz ; then
-               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
-}

diff --git a/eclass/mozconfig-v6.53.eclass b/eclass/mozconfig-v6.53.eclass
deleted file mode 100644
index a5aa9718624..00000000000
--- a/eclass/mozconfig-v6.53.eclass
+++ /dev/null
@@ -1,393 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-#
-# @ECLASS: mozconfig-v6.53.eclass
-# @MAINTAINER:
-# mozilla team <mozi...@gentoo.org>
-# @BLURB: the new mozilla common configuration eclass for FF33 and newer, v6
-# @DESCRIPTION:
-# This eclass is used in mozilla ebuilds (firefox, thunderbird, seamonkey)
-# to provide a single common place for the common mozilla engine compoments.
-#
-# The eclass provides all common dependencies as well as common use flags.
-#
-# Some use flags which may be optional in particular mozilla packages can be
-# supported through setting eclass variables.
-#
-# This eclass inherits mozconfig helper functions as defined in mozcoreconf-v3,
-# and so ebuilds inheriting this eclass do not need to inherit that.
-
-case ${EAPI} in
-       0|1|2|3|4)
-               die "EAPI=${EAPI} not supported"
-               ;;
-       5)
-               inherit multilib
-               ;;
-esac
-
-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
-# ebuilds for firefox, and potentially seamonkey.
-#
-# Leave the variable UNSET if necko-wifi support should not be available.
-# Set the variable to "enabled" if the use flag should be enabled by default.
-# 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
-# otherwise, which is generally to enable jit unless support for the platform
-# is missing.
-#
-# Set the variable to "enabled" if the use flag should be enabled by default.
-# 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
-# thunderbird and seamonkey in the future, once support is ready for testing.
-#
-# Leave the variable UNSET if gtk3 support should not be optionally available.
-# Set the variable to "enabled" if the use flag should be enabled by default.
-# Set the variable to any value if the use flag should exist but not be 
default-enabled.
-# If gtk+:3 is to be the standard toolkit, do not use this and instead use
-# 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".
-#
-# Note that this option conflicts directly with MOZCONFIG_OPTIONAL_GTK3, both
-# variables cannot be set at the same time and this variable will be ignored if
-# MOZCONFIG_OPTIONAL_GTK3 is set.
-#
-# Leave the variable UNSET if gtk2-only support should not be available.
-# Set the variable to "enabled" if the use flag should be enabled by default.
-# 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
-# ebuilds for firefox, but thunderbird and seamonkey could follow in the 
future.
-#
-# Leave the variable UNSET if qt5 support should not be available.
-# Set the variable to "enabled" if the use flag should be enabled by default.
-# 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 
startup-notification system-cairo
-       system-harfbuzz system-icu system-jpeg system-libevent system-sqlite 
system-libvpx"
-
-# some notes on deps:
-# gtk:2 minimum is technically 2.10 but gio support (enabled by default) needs 
2.14
-# media-libs/mesa needs to be 10.2 or above due to a bug with flash+vdpau
-
-RDEPEND=">=app-text/hunspell-1.5.4:=
-       dev-libs/atk
-       dev-libs/expat
-       >=x11-libs/cairo-1.10[X]
-       >=x11-libs/gtk+-2.18:2
-       x11-libs/gdk-pixbuf
-       >=x11-libs/pango-1.22.0
-       >=media-libs/libpng-1.6.28:0=[apng]
-       >=media-libs/mesa-10.2:*
-       media-libs/fontconfig
-       >=media-libs/freetype-2.4.10
-       kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
-       pulseaudio? ( || ( media-sound/pulseaudio
-               >=media-sound/apulse-0.1.9 ) )
-       virtual/freedesktop-icon-theme
-       dbus? ( >=sys-apps/dbus-0.60
-               >=dev-libs/dbus-glib-0.72 )
-       startup-notification? ( >=x11-libs/startup-notification-0.8 )
-       >=dev-libs/glib-2.26:2
-       >=sys-libs/zlib-1.2.3
-       >=virtual/libffi-3.0.10
-       virtual/ffmpeg
-       x11-libs/libX11
-       x11-libs/libXcomposite
-       x11-libs/libXdamage
-       x11-libs/libXext
-       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-icu? ( >=dev-libs/icu-58.1:= )
-       system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-       system-libevent? ( >=dev-libs/libevent-2.0:0= )
-       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.9-r1 )
-"
-
-if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then
-       MOZCONFIG_OPTIONAL_GTK2ONLY=
-       if [[ ${MOZCONFIG_OPTIONAL_GTK3} = "enabled" ]]; then
-               IUSE+=" +force-gtk3"
-       else
-               IUSE+=" force-gtk3"
-       fi
-       RDEPEND+=" force-gtk3? ( >=x11-libs/gtk+-3.4.0:3 )"
-elif [[ -n ${MOZCONFIG_OPTIONAL_GTK2ONLY} ]]; then
-       if [[ ${MOZCONFIG_OPTIONAL_GTK2ONLY} = "enabled" ]]; then
-               IUSE+=" +gtk2"
-       else
-               IUSE+=" gtk2"
-       fi
-       RDEPEND+=" !gtk2? ( >=x11-libs/gtk+-3.4.0:3 )"
-else
-       # no gtk3 related dep set by optional use flags, force it
-       RDEPEND+="  >=x11-libs/gtk+-3.4.0:3"
-fi
-if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]]; then
-       if [[ ${MOZCONFIG_OPTIONAL_WIFI} = "enabled" ]]; then
-               IUSE+=" +wifi"
-       else
-               IUSE+=" wifi"
-       fi
-       RDEPEND+="
-       wifi? (
-               kernel_linux? ( >=sys-apps/dbus-0.60
-                       >=dev-libs/dbus-glib-0.72
-                       net-misc/networkmanager )
-       )"
-fi
-
-DEPEND="app-arch/zip
-       app-arch/unzip
-       >=sys-devel/binutils-2.16.1
-       sys-apps/findutils
-       pulseaudio? ( media-sound/pulseaudio )
-       ${RDEPEND}"
-
-RDEPEND+="
-       pulseaudio? ( || ( media-sound/pulseaudio
-               >=media-sound/apulse-0.1.9 ) )
-       selinux? ( sec-policy/selinux-mozilla )"
-
-# @FUNCTION: mozconfig_config
-# @DESCRIPTION:
-# Set common configure options for mozilla packages.
-# Call this within src_configure() phase, after mozconfig_init
-#
-# Example:
-#
-# inherit mozconfig-v6.46
-#
-# src_configure() {
-#      mozconfig_init
-#      mozconfig_config
-#      # ... misc ebuild-unique settings via calls to
-#      # ... mozconfig_{annotate,use_with,use_enable}
-#      mozconfig_final
-# }
-
-mozconfig_config() {
-       # Migrated from mozcoreconf-2
-       mozconfig_annotate 'system_libs' \
-               --with-system-zlib \
-               --with-system-bz2
-
-       if has bindist ${IUSE}; then
-               mozconfig_use_enable !bindist official-branding
-               if [[ ${PN} == firefox ]] && use bindist ; then
-                       mozconfig_annotate '' 
--with-branding=browser/branding/aurora
-               fi
-       fi
-
-       # Enable position independent executables
-       mozconfig_annotate 'enabled by Gentoo' --enable-pie
-       mozconfig_use_enable debug
-       mozconfig_use_enable debug tests
-
-       if ! use debug ; then
-               mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
-       else
-               mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols
-       fi
-
-       mozconfig_use_enable startup-notification
-
-       if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]] ; then
-               # wifi pulls in dbus so manage both here
-               mozconfig_use_enable wifi necko-wifi
-               if use kernel_linux && use wifi && ! use dbus; then
-                       echo "Enabling dbus support due to wifi request"
-                       mozconfig_annotate 'dbus required by necko-wifi on 
linux' --enable-dbus
-               else
-                       mozconfig_use_enable dbus
-               fi
-       else
-               mozconfig_use_enable dbus
-               mozconfig_annotate 'disabled' --disable-necko-wifi
-       fi
-
-       if [[ -n ${MOZCONFIG_OPTIONAL_JIT} ]]; then
-               mozconfig_use_enable jit ion
-       fi
-
-       # These are enabled by default in all mozilla applications
-       mozconfig_annotate '' --with-system-nspr 
--with-nspr-prefix="${SYSROOT}${EPREFIX}"/usr
-       mozconfig_annotate '' --with-system-nss 
--with-nss-prefix="${SYSROOT}${EPREFIX}"/usr
-       mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX}"/usr/include 
--x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir)
-       if use system-libevent; then
-               mozconfig_annotate '' 
--with-system-libevent="${SYSROOT}${EPREFIX}"/usr
-       fi
-       mozconfig_annotate '' --prefix="${EPREFIX}"/usr
-       mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
-       mozconfig_annotate 'Gentoo default' --enable-system-hunspell
-       mozconfig_annotate '' --disable-gnomeui
-       mozconfig_annotate '' --enable-gio
-       mozconfig_annotate '' --disable-crashreporter
-       mozconfig_annotate 'Gentoo default' --with-system-png
-       mozconfig_annotate '' --enable-system-ffi
-       mozconfig_annotate 'Gentoo default to honor system linker' 
--disable-gold
-       mozconfig_annotate '' --disable-gconf
-       mozconfig_annotate '' --with-intl-api
-
-       # skia has no support for big-endian platforms
-       if [[ $(tc-endian) == "big" ]]; then
-               mozconfig_annotate 'big endian target' --disable-skia
-       else
-               mozconfig_annotate '' --enable-skia
-       fi
-
-       # default toolkit is cairo-gtk3, optional use flags can change this
-       local toolkit="cairo-gtk3"
-       local toolkit_comment=""
-       if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then
-               if ! use force-gtk3; then
-                       toolkit="cairo-gtk2"
-                       toolkit_comment="force-gtk3 use flag"
-               fi
-       fi
-       if [[ -n ${MOZCONFIG_OPTIONAL_GTK2ONLY} ]]; then
-               if use gtk2 ; then
-                       toolkit="cairo-gtk2"
-               else
-                       toolkit_comment="gtk2 use flag"
-               fi
-       fi
-       if [[ -n ${MOZCONFIG_OPTIONAL_QT5} ]]; then
-               if use qt5; then
-                       toolkit="cairo-qt"
-                       toolkit_comment="qt5 use flag"
-                       # need to specify these vars because the qt5 versions 
are not found otherwise,
-                       # and setting --with-qtdir overrides the pkg-config 
include dirs
-                       local i
-                       for i in qmake moc rcc; do
-                               echo "export 
HOST_${i^^}=\"$(qt5_get_bindir)/${i}\"" \
-                                       >> "${S}"/.mozconfig || die
-                       done
-                       echo 'unset QTDIR' >> "${S}"/.mozconfig || die
-                       mozconfig_annotate '+qt5' --disable-gio
-               fi
-       fi
-       mozconfig_annotate "${toolkit_comment}" 
--enable-default-toolkit=${toolkit}
-
-       # Use jemalloc unless libc is not glibc >= 2.4
-       # at this time the minimum glibc in the tree is 2.9 so we should be 
safe.
-       if use elibc_glibc && use jemalloc; then
-               # We must force-enable jemalloc 4 via .mozconfig
-               echo "export MOZ_JEMALLOC4=1" >> "${S}"/.mozconfig || die
-               mozconfig_annotate '' --enable-replace-malloc
-       fi
-
-       # Instead of the standard --build= and --host=, mozilla uses --host 
instead
-       # of --build, and --target intstead of --host.
-       # Note, mozilla also has --build but it does not do what you think it 
does.
-       # Set both --target and --host as mozilla uses python to guess values 
otherwise
-       mozconfig_annotate '' --target="${CHOST}"
-       mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
-
-       mozconfig_use_enable pulseaudio
-       # force the deprecated alsa sound code if pulseaudio is disabled
-       if use kernel_linux && ! use pulseaudio ; then
-               mozconfig_annotate '-pulseaudio' --enable-alsa
-       fi
-
-       mozconfig_use_enable system-cairo
-       mozconfig_use_enable system-sqlite
-       mozconfig_use_with system-jpeg
-       mozconfig_use_with system-icu
-       mozconfig_use_with system-libvpx
-       mozconfig_use_with system-harfbuzz
-       mozconfig_use_with system-harfbuzz system-graphite2
-
-       # Modifications to better support ARM, bug 553364
-       if use neon ; then
-               mozconfig_annotate '' --with-fpu=neon
-               mozconfig_annotate '' --with-thumb=yes
-               mozconfig_annotate '' --with-thumb-interwork=no
-       fi
-       if [[ ${CHOST} == armv* ]] ; then
-               mozconfig_annotate '' --with-float-abi=hard
-               if ! use system-libvpx ; then
-                       sed -i -e "s|softfp|hard|" \
-                               "${S}"/media/libvpx/moz.build
-               fi
-       fi
-}
-
-# @FUNCTION: mozconfig_install_prefs
-# @DESCRIPTION:
-# Set preferences into the prefs.js file specified as a parameter to
-# the function.  This sets both some common prefs to all mozilla
-# packages, and any prefs that may relate to the use flags administered
-# by mozconfig_config().
-#
-# Call this within src_install() phase, after copying the template
-# prefs file (if any) from ${FILESDIR}
-#
-# Example:
-#
-# inherit mozconfig-v6.46
-#
-# src_install() {
-#      cp "${FILESDIR}"/gentoo-default-prefs.js \
-#      "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js"  
\
-#      || die
-#
-#      mozconfig_install_prefs \
-#      "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js"
-#
-#      ...
-# }
-
-mozconfig_install_prefs() {
-       local prefs_file="${1}"
-
-       einfo "Adding prefs from mozconfig to ${prefs_file}"
-
-       # set dictionary path, to use system hunspell
-       echo "pref(\"spellchecker.dictionary_path\", 
\"${EPREFIX}/usr/share/myspell\");" \
-               >>"${prefs_file}" || die
-
-       # force the graphite pref if system-harfbuzz is enabled, since the pref 
cant disable it
-       if use system-harfbuzz ; then
-               echo 
"sticky_pref(\"gfx.font_rendering.graphite.enabled\",true);" \
-                       >>"${prefs_file}" || die
-       fi
-
-       # force cairo as the canvas renderer on platforms without skia support
-       if [[ $(tc-endian) == "big" ]] ; then
-               echo "sticky_pref(\"gfx.canvas.azure.backends\",\"cairo\");" \
-                       >>"${prefs_file}" || die
-               echo "sticky_pref(\"gfx.content.azure.backends\",\"cairo\");" \
-                       >>"${prefs_file}" || die
-       fi
-}

diff --git a/eclass/mozconfig-v6.55.eclass b/eclass/mozconfig-v6.55.eclass
deleted file mode 100644
index cb513565b91..00000000000
--- a/eclass/mozconfig-v6.55.eclass
+++ /dev/null
@@ -1,386 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-#
-# @ECLASS: mozconfig-v6.55.eclass
-# @MAINTAINER:
-# mozilla team <mozi...@gentoo.org>
-# @BLURB: the new mozilla common configuration eclass for FF33 and newer, v6
-# @DESCRIPTION:
-# This eclass is used in mozilla ebuilds (firefox, thunderbird, seamonkey)
-# to provide a single common place for the common mozilla engine compoments.
-#
-# The eclass provides all common dependencies as well as common use flags.
-#
-# Some use flags which may be optional in particular mozilla packages can be
-# supported through setting eclass variables.
-#
-# This eclass inherits mozconfig helper functions as defined in mozcoreconf-v3,
-# and so ebuilds inheriting this eclass do not need to inherit that.
-
-case ${EAPI} in
-       0|1|2|3|4)
-               die "EAPI=${EAPI} not supported"
-               ;;
-       5)
-               inherit multilib
-               ;;
-esac
-
-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
-# ebuilds for firefox, and potentially seamonkey.
-#
-# Leave the variable UNSET if necko-wifi support should not be available.
-# Set the variable to "enabled" if the use flag should be enabled by default.
-# 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
-# otherwise, which is generally to enable jit unless support for the platform
-# is missing.
-#
-# Set the variable to "enabled" if the use flag should be enabled by default.
-# 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
-# thunderbird and seamonkey in the future, once support is ready for testing.
-#
-# Leave the variable UNSET if gtk3 support should not be optionally available.
-# Set the variable to "enabled" if the use flag should be enabled by default.
-# Set the variable to any value if the use flag should exist but not be 
default-enabled.
-# If gtk+:3 is to be the standard toolkit, do not use this and instead use
-# 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".
-#
-# Note that this option conflicts directly with MOZCONFIG_OPTIONAL_GTK3, both
-# variables cannot be set at the same time and this variable will be ignored if
-# MOZCONFIG_OPTIONAL_GTK3 is set.
-#
-# Leave the variable UNSET if gtk2-only support should not be available.
-# Set the variable to "enabled" if the use flag should be enabled by default.
-# 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
-# ebuilds for firefox, but thunderbird and seamonkey could follow in the 
future.
-#
-# Leave the variable UNSET if qt5 support should not be available.
-# Set the variable to "enabled" if the use flag should be enabled by default.
-# 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 neon pulseaudio selinux startup-notification 
system-cairo
-       system-harfbuzz system-icu system-jpeg system-libevent system-sqlite 
system-libvpx"
-
-# some notes on deps:
-# gtk:2 minimum is technically 2.10 but gio support (enabled by default) needs 
2.14
-# media-libs/mesa needs to be 10.2 or above due to a bug with flash+vdpau
-
-RDEPEND=">=app-text/hunspell-1.5.4:=
-       dev-libs/atk
-       dev-libs/expat
-       >=x11-libs/cairo-1.10[X]
-       >=x11-libs/gtk+-2.18:2
-       x11-libs/gdk-pixbuf
-       >=x11-libs/pango-1.22.0
-       >=media-libs/libpng-1.6.29:0=[apng]
-       >=media-libs/mesa-10.2:*
-       media-libs/fontconfig
-       >=media-libs/freetype-2.4.10
-       kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
-       pulseaudio? ( || ( media-sound/pulseaudio
-               >=media-sound/apulse-0.1.9 ) )
-       virtual/freedesktop-icon-theme
-       dbus? ( >=sys-apps/dbus-0.60
-               >=dev-libs/dbus-glib-0.72 )
-       startup-notification? ( >=x11-libs/startup-notification-0.8 )
-       >=dev-libs/glib-2.26:2
-       >=sys-libs/zlib-1.2.3
-       >=virtual/libffi-3.0.10
-       virtual/ffmpeg
-       x11-libs/libX11
-       x11-libs/libXcomposite
-       x11-libs/libXdamage
-       x11-libs/libXext
-       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-icu? ( >=dev-libs/icu-58.1:= )
-       system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-       system-libevent? ( >=dev-libs/libevent-2.0:0= )
-       system-sqlite? ( >=dev-db/sqlite-3.19.3: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.9-r1 )
-"
-
-if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then
-       MOZCONFIG_OPTIONAL_GTK2ONLY=
-       if [[ ${MOZCONFIG_OPTIONAL_GTK3} = "enabled" ]]; then
-               IUSE+=" +force-gtk3"
-       else
-               IUSE+=" force-gtk3"
-       fi
-       RDEPEND+=" force-gtk3? ( >=x11-libs/gtk+-3.4.0:3 )"
-elif [[ -n ${MOZCONFIG_OPTIONAL_GTK2ONLY} ]]; then
-       if [[ ${MOZCONFIG_OPTIONAL_GTK2ONLY} = "enabled" ]]; then
-               IUSE+=" +gtk2"
-       else
-               IUSE+=" gtk2"
-       fi
-       RDEPEND+=" !gtk2? ( >=x11-libs/gtk+-3.4.0:3 )"
-else
-       # no gtk3 related dep set by optional use flags, force it
-       RDEPEND+="  >=x11-libs/gtk+-3.4.0:3"
-fi
-if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]]; then
-       if [[ ${MOZCONFIG_OPTIONAL_WIFI} = "enabled" ]]; then
-               IUSE+=" +wifi"
-       else
-               IUSE+=" wifi"
-       fi
-       RDEPEND+="
-       wifi? (
-               kernel_linux? ( >=sys-apps/dbus-0.60
-                       >=dev-libs/dbus-glib-0.72
-                       net-misc/networkmanager )
-       )"
-fi
-
-DEPEND="app-arch/zip
-       app-arch/unzip
-       >=sys-devel/binutils-2.16.1
-       sys-apps/findutils
-       pulseaudio? ( media-sound/pulseaudio )
-       ${RDEPEND}"
-
-RDEPEND+="
-       pulseaudio? ( || ( media-sound/pulseaudio
-               >=media-sound/apulse-0.1.9 ) )
-       selinux? ( sec-policy/selinux-mozilla )"
-
-# @FUNCTION: mozconfig_config
-# @DESCRIPTION:
-# Set common configure options for mozilla packages.
-# Call this within src_configure() phase, after mozconfig_init
-#
-# Example:
-#
-# inherit mozconfig-v6.46
-#
-# src_configure() {
-#      mozconfig_init
-#      mozconfig_config
-#      # ... misc ebuild-unique settings via calls to
-#      # ... mozconfig_{annotate,use_with,use_enable}
-#      mozconfig_final
-# }
-
-mozconfig_config() {
-       # Migrated from mozcoreconf-2
-       mozconfig_annotate 'system_libs' \
-               --with-system-zlib \
-               --with-system-bz2
-
-       if has bindist ${IUSE}; then
-               mozconfig_use_enable !bindist official-branding
-               if [[ ${PN} == firefox ]] && use bindist ; then
-                       mozconfig_annotate '' 
--with-branding=browser/branding/aurora
-               fi
-       fi
-
-       # Enable position independent executables
-       mozconfig_annotate 'enabled by Gentoo' --enable-pie
-       mozconfig_use_enable debug
-       mozconfig_use_enable debug tests
-
-       if ! use debug ; then
-               mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
-       else
-               mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols
-       fi
-
-       mozconfig_use_enable startup-notification
-
-       if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]] ; then
-               # wifi pulls in dbus so manage both here
-               mozconfig_use_enable wifi necko-wifi
-               if use kernel_linux && use wifi && ! use dbus; then
-                       echo "Enabling dbus support due to wifi request"
-                       mozconfig_annotate 'dbus required by necko-wifi on 
linux' --enable-dbus
-               else
-                       mozconfig_use_enable dbus
-               fi
-       else
-               mozconfig_use_enable dbus
-               mozconfig_annotate 'disabled' --disable-necko-wifi
-       fi
-
-       if [[ -n ${MOZCONFIG_OPTIONAL_JIT} ]]; then
-               mozconfig_use_enable jit ion
-       fi
-
-       # These are enabled by default in all mozilla applications
-       mozconfig_annotate '' --with-system-nspr 
--with-nspr-prefix="${SYSROOT}${EPREFIX}"/usr
-       mozconfig_annotate '' --with-system-nss 
--with-nss-prefix="${SYSROOT}${EPREFIX}"/usr
-       mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX}"/usr/include 
--x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir)
-       if use system-libevent; then
-               mozconfig_annotate '' 
--with-system-libevent="${SYSROOT}${EPREFIX}"/usr
-       fi
-       mozconfig_annotate '' --prefix="${EPREFIX}"/usr
-       mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
-       mozconfig_annotate 'Gentoo default' --enable-system-hunspell
-       mozconfig_annotate '' --disable-crashreporter
-       mozconfig_annotate 'Gentoo default' --with-system-png
-       mozconfig_annotate '' --enable-system-ffi
-       mozconfig_annotate 'Gentoo default to honor system linker' 
--disable-gold
-       mozconfig_annotate '' --disable-gconf
-       mozconfig_annotate '' --with-intl-api
-
-       # skia has no support for big-endian platforms
-       if [[ $(tc-endian) == "big" ]]; then
-               mozconfig_annotate 'big endian target' --disable-skia
-       else
-               mozconfig_annotate '' --enable-skia
-       fi
-
-       # default toolkit is cairo-gtk3, optional use flags can change this
-       local toolkit="cairo-gtk3"
-       local toolkit_comment=""
-       if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then
-               if ! use force-gtk3; then
-                       toolkit="cairo-gtk2"
-                       toolkit_comment="force-gtk3 use flag"
-               fi
-       fi
-       if [[ -n ${MOZCONFIG_OPTIONAL_GTK2ONLY} ]]; then
-               if use gtk2 ; then
-                       toolkit="cairo-gtk2"
-               else
-                       toolkit_comment="gtk2 use flag"
-               fi
-       fi
-       if [[ -n ${MOZCONFIG_OPTIONAL_QT5} ]]; then
-               if use qt5; then
-                       toolkit="cairo-qt"
-                       toolkit_comment="qt5 use flag"
-                       # need to specify these vars because the qt5 versions 
are not found otherwise,
-                       # and setting --with-qtdir overrides the pkg-config 
include dirs
-                       local i
-                       for i in qmake moc rcc; do
-                               echo "export 
HOST_${i^^}=\"$(qt5_get_bindir)/${i}\"" \
-                                       >> "${S}"/.mozconfig || die
-                       done
-                       echo 'unset QTDIR' >> "${S}"/.mozconfig || die
-                       mozconfig_annotate '+qt5' --disable-gio
-               fi
-       fi
-       mozconfig_annotate "${toolkit_comment}" 
--enable-default-toolkit=${toolkit}
-
-       # Instead of the standard --build= and --host=, mozilla uses --host 
instead
-       # of --build, and --target intstead of --host.
-       # Note, mozilla also has --build but it does not do what you think it 
does.
-       # Set both --target and --host as mozilla uses python to guess values 
otherwise
-       mozconfig_annotate '' --target="${CHOST}"
-       mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
-
-       mozconfig_use_enable pulseaudio
-       # force the deprecated alsa sound code if pulseaudio is disabled
-       if use kernel_linux && ! use pulseaudio ; then
-               mozconfig_annotate '-pulseaudio' --enable-alsa
-       fi
-
-       # For testing purpose only
-       mozconfig_annotate 'Sandbox' --enable-content-sandbox
-
-       mozconfig_use_enable system-cairo
-       mozconfig_use_enable system-sqlite
-       mozconfig_use_with system-jpeg
-       mozconfig_use_with system-icu
-       mozconfig_use_with system-libvpx
-       mozconfig_use_with system-harfbuzz
-       mozconfig_use_with system-harfbuzz system-graphite2
-
-       # Modifications to better support ARM, bug 553364
-       if use neon ; then
-               mozconfig_annotate '' --with-fpu=neon
-               mozconfig_annotate '' --with-thumb=yes
-               mozconfig_annotate '' --with-thumb-interwork=no
-       fi
-       if [[ ${CHOST} == armv* ]] ; then
-               mozconfig_annotate '' --with-float-abi=hard
-               if ! use system-libvpx ; then
-                       sed -i -e "s|softfp|hard|" \
-                               "${S}"/media/libvpx/moz.build
-               fi
-       fi
-}
-
-# @FUNCTION: mozconfig_install_prefs
-# @DESCRIPTION:
-# Set preferences into the prefs.js file specified as a parameter to
-# the function.  This sets both some common prefs to all mozilla
-# packages, and any prefs that may relate to the use flags administered
-# by mozconfig_config().
-#
-# Call this within src_install() phase, after copying the template
-# prefs file (if any) from ${FILESDIR}
-#
-# Example:
-#
-# inherit mozconfig-v6.46
-#
-# src_install() {
-#      cp "${FILESDIR}"/gentoo-default-prefs.js \
-#      "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js"  
\
-#      || die
-#
-#      mozconfig_install_prefs \
-#      "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js"
-#
-#      ...
-# }
-
-mozconfig_install_prefs() {
-       local prefs_file="${1}"
-
-       einfo "Adding prefs from mozconfig to ${prefs_file}"
-
-       # set dictionary path, to use system hunspell
-       echo "pref(\"spellchecker.dictionary_path\", 
\"${EPREFIX}/usr/share/myspell\");" \
-               >>"${prefs_file}" || die
-
-       # force the graphite pref if system-harfbuzz is enabled, since the pref 
cant disable it
-       if use system-harfbuzz ; then
-               echo 
"sticky_pref(\"gfx.font_rendering.graphite.enabled\",true);" \
-                       >>"${prefs_file}" || die
-       fi
-
-       # force cairo as the canvas renderer on platforms without skia support
-       if [[ $(tc-endian) == "big" ]] ; then
-               echo "sticky_pref(\"gfx.canvas.azure.backends\",\"cairo\");" \
-                       >>"${prefs_file}" || die
-               echo "sticky_pref(\"gfx.content.azure.backends\",\"cairo\");" \
-                       >>"${prefs_file}" || die
-       fi
-}

diff --git a/eclass/mozconfig-v6.56.eclass b/eclass/mozconfig-v6.56.eclass
deleted file mode 100644
index 6d6063ab191..00000000000
--- a/eclass/mozconfig-v6.56.eclass
+++ /dev/null
@@ -1,397 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-#
-# @ECLASS: mozconfig-v6.56.eclass
-# @MAINTAINER:
-# mozilla team <mozi...@gentoo.org>
-# @BLURB: the new mozilla common configuration eclass for FF33 and newer, v6
-# @DESCRIPTION:
-# This eclass is used in mozilla ebuilds (firefox, thunderbird, seamonkey)
-# to provide a single common place for the common mozilla engine compoments.
-#
-# The eclass provides all common dependencies as well as common use flags.
-#
-# Some use flags which may be optional in particular mozilla packages can be
-# supported through setting eclass variables.
-#
-# This eclass inherits mozconfig helper functions as defined in mozcoreconf-v3,
-# and so ebuilds inheriting this eclass do not need to inherit that.
-
-case ${EAPI} in
-       0|1|2|3|4)
-               die "EAPI=${EAPI} not supported"
-               ;;
-       5)
-               inherit multilib
-               ;;
-esac
-
-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
-# ebuilds for firefox, and potentially seamonkey.
-#
-# Leave the variable UNSET if necko-wifi support should not be available.
-# Set the variable to "enabled" if the use flag should be enabled by default.
-# 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
-# otherwise, which is generally to enable jit unless support for the platform
-# is missing.
-#
-# Set the variable to "enabled" if the use flag should be enabled by default.
-# 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
-# thunderbird and seamonkey in the future, once support is ready for testing.
-#
-# Leave the variable UNSET if gtk3 support should not be optionally available.
-# Set the variable to "enabled" if the use flag should be enabled by default.
-# Set the variable to any value if the use flag should exist but not be 
default-enabled.
-# If gtk+:3 is to be the standard toolkit, do not use this and instead use
-# 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".
-#
-# Note that this option conflicts directly with MOZCONFIG_OPTIONAL_GTK3, both
-# variables cannot be set at the same time and this variable will be ignored if
-# MOZCONFIG_OPTIONAL_GTK3 is set.
-#
-# Leave the variable UNSET if gtk2-only support should not be available.
-# Set the variable to "enabled" if the use flag should be enabled by default.
-# 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
-# ebuilds for firefox, but thunderbird and seamonkey could follow in the 
future.
-#
-# Leave the variable UNSET if qt5 support should not be available.
-# Set the variable to "enabled" if the use flag should be enabled by default.
-# 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 neon pulseaudio selinux startup-notification 
system-harfbuzz
- system-icu system-jpeg system-libevent system-sqlite system-libvpx"
-
-# some notes on deps:
-# gtk:2 minimum is technically 2.10 but gio support (enabled by default) needs 
2.14
-# media-libs/mesa needs to be 10.2 or above due to a bug with flash+vdpau
-
-RDEPEND=">=app-text/hunspell-1.5.4:=
-       dev-libs/atk
-       dev-libs/expat
-       >=x11-libs/cairo-1.10[X]
-       >=x11-libs/gtk+-2.18:2
-       x11-libs/gdk-pixbuf
-       >=x11-libs/pango-1.22.0
-       >=media-libs/libpng-1.6.31:0=[apng]
-       >=media-libs/mesa-10.2:*
-       media-libs/fontconfig
-       >=media-libs/freetype-2.4.10
-       kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
-       pulseaudio? ( || ( media-sound/pulseaudio
-               >=media-sound/apulse-0.1.9 ) )
-       virtual/freedesktop-icon-theme
-       dbus? ( >=sys-apps/dbus-0.60
-               >=dev-libs/dbus-glib-0.72 )
-       startup-notification? ( >=x11-libs/startup-notification-0.8 )
-       >=x11-libs/pixman-0.19.2
-       >=dev-libs/glib-2.26:2
-       >=sys-libs/zlib-1.2.3
-       >=virtual/libffi-3.0.10
-       virtual/ffmpeg
-       x11-libs/libX11
-       x11-libs/libXcomposite
-       x11-libs/libXdamage
-       x11-libs/libXext
-       x11-libs/libXfixes
-       x11-libs/libXrender
-       x11-libs/libXt
-       system-icu? ( >=dev-libs/icu-59.1:= )
-       system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-       system-libevent? ( >=dev-libs/libevent-2.0:0= )
-       system-sqlite? ( >=dev-db/sqlite-3.19.3: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.9-r1 )
-"
-
-if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then
-       MOZCONFIG_OPTIONAL_GTK2ONLY=
-       if [[ ${MOZCONFIG_OPTIONAL_GTK3} = "enabled" ]]; then
-               IUSE+=" +force-gtk3"
-       else
-               IUSE+=" force-gtk3"
-       fi
-       RDEPEND+=" force-gtk3? ( >=x11-libs/gtk+-3.4.0:3 )"
-elif [[ -n ${MOZCONFIG_OPTIONAL_GTK2ONLY} ]]; then
-       if [[ ${MOZCONFIG_OPTIONAL_GTK2ONLY} = "enabled" ]]; then
-               IUSE+=" +gtk2"
-       else
-               IUSE+=" gtk2"
-       fi
-       RDEPEND+=" !gtk2? ( >=x11-libs/gtk+-3.4.0:3 )"
-else
-       # no gtk3 related dep set by optional use flags, force it
-       RDEPEND+="  >=x11-libs/gtk+-3.4.0:3"
-fi
-if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]]; then
-       if [[ ${MOZCONFIG_OPTIONAL_WIFI} = "enabled" ]]; then
-               IUSE+=" +wifi"
-       else
-               IUSE+=" wifi"
-       fi
-       RDEPEND+="
-       wifi? (
-               kernel_linux? ( >=sys-apps/dbus-0.60
-                       >=dev-libs/dbus-glib-0.72
-                       net-misc/networkmanager )
-       )"
-fi
-
-DEPEND="app-arch/zip
-       app-arch/unzip
-       >=sys-devel/binutils-2.16.1
-       sys-apps/findutils
-       pulseaudio? ( media-sound/pulseaudio )
-       ${RDEPEND}"
-
-RDEPEND+="
-       pulseaudio? ( || ( media-sound/pulseaudio
-               >=media-sound/apulse-0.1.9 ) )
-       selinux? ( sec-policy/selinux-mozilla )"
-
-# @FUNCTION: mozconfig_config
-# @DESCRIPTION:
-# Set common configure options for mozilla packages.
-# Call this within src_configure() phase, after mozconfig_init
-#
-# Example:
-#
-# inherit mozconfig-v6.46
-#
-# src_configure() {
-#      mozconfig_init
-#      mozconfig_config
-#      # ... misc ebuild-unique settings via calls to
-#      # ... mozconfig_{annotate,use_with,use_enable}
-#      mozconfig_final
-# }
-
-mozconfig_config() {
-       # Migrated from mozcoreconf-2
-       mozconfig_annotate 'system_libs' \
-               --with-system-zlib \
-               --with-system-bz2
-
-       # Disable for testing purposes only
-       mozconfig_annotate 'Upstream bug 1341234' --disable-stylo
-
-       # Must pass release in order to properly select linker via gold useflag
-       mozconfig_annotate 'Enable by Gentoo' --enable-release
-
-       # Must pass --enable-gold if using ld.gold
-       if tc-ld-is-gold ; then
-               mozconfig_annotate 'tc-ld-is-gold=true' --enable-gold
-       else
-               mozconfig_annotate 'tc-ld-is-gold=false' --disable-gold
-       fi
-
-       if has bindist ${IUSE}; then
-               mozconfig_use_enable !bindist official-branding
-               if [[ ${PN} == firefox ]] && use bindist ; then
-                       mozconfig_annotate '' 
--with-branding=browser/branding/aurora
-               fi
-       fi
-
-       # Enable position independent executables
-       mozconfig_annotate 'enabled by Gentoo' --enable-pie
-       mozconfig_use_enable debug
-       mozconfig_use_enable debug tests
-
-       if ! use debug ; then
-               mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
-       else
-               mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols
-       fi
-
-       mozconfig_use_enable startup-notification
-
-       if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]] ; then
-               # wifi pulls in dbus so manage both here
-               mozconfig_use_enable wifi necko-wifi
-               if use kernel_linux && use wifi && ! use dbus; then
-                       echo "Enabling dbus support due to wifi request"
-                       mozconfig_annotate 'dbus required by necko-wifi on 
linux' --enable-dbus
-               else
-                       mozconfig_use_enable dbus
-               fi
-       else
-               mozconfig_use_enable dbus
-               mozconfig_annotate 'disabled' --disable-necko-wifi
-       fi
-
-       if [[ -n ${MOZCONFIG_OPTIONAL_JIT} ]]; then
-               mozconfig_use_enable jit ion
-       fi
-
-       # These are enabled by default in all mozilla applications
-       mozconfig_annotate '' --with-system-nspr 
--with-nspr-prefix="${SYSROOT}${EPREFIX}"/usr
-       mozconfig_annotate '' --with-system-nss 
--with-nss-prefix="${SYSROOT}${EPREFIX}"/usr
-       mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX}"/usr/include 
--x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir)
-       if use system-libevent; then
-               mozconfig_annotate '' 
--with-system-libevent="${SYSROOT}${EPREFIX}"/usr
-       fi
-       mozconfig_annotate '' --prefix="${EPREFIX}"/usr
-       mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
-       mozconfig_annotate 'Gentoo default' --enable-system-hunspell
-       mozconfig_annotate '' --disable-crashreporter
-       mozconfig_annotate 'Gentoo default' --with-system-png
-       mozconfig_annotate '' --enable-system-ffi
-       mozconfig_annotate '' --disable-gconf
-       mozconfig_annotate '' --with-intl-api
-
-       # skia has no support for big-endian platforms
-       if [[ $(tc-endian) == "big" ]]; then
-               mozconfig_annotate 'big endian target' --disable-skia
-       else
-               mozconfig_annotate '' --enable-skia
-       fi
-
-       # default toolkit is cairo-gtk3, optional use flags can change this
-       local toolkit="cairo-gtk3"
-       local toolkit_comment=""
-       if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then
-               if ! use force-gtk3; then
-                       toolkit="cairo-gtk2"
-                       toolkit_comment="force-gtk3 use flag"
-               fi
-       fi
-       if [[ -n ${MOZCONFIG_OPTIONAL_GTK2ONLY} ]]; then
-               if use gtk2 ; then
-                       toolkit="cairo-gtk2"
-               else
-                       toolkit_comment="gtk2 use flag"
-               fi
-       fi
-       if [[ -n ${MOZCONFIG_OPTIONAL_QT5} ]]; then
-               if use qt5; then
-                       toolkit="cairo-qt"
-                       toolkit_comment="qt5 use flag"
-                       # need to specify these vars because the qt5 versions 
are not found otherwise,
-                       # and setting --with-qtdir overrides the pkg-config 
include dirs
-                       local i
-                       for i in qmake moc rcc; do
-                               echo "export 
HOST_${i^^}=\"$(qt5_get_bindir)/${i}\"" \
-                                       >> "${S}"/.mozconfig || die
-                       done
-                       echo 'unset QTDIR' >> "${S}"/.mozconfig || die
-                       mozconfig_annotate '+qt5' --disable-gio
-               fi
-       fi
-       mozconfig_annotate "${toolkit_comment}" 
--enable-default-toolkit=${toolkit}
-
-       # Instead of the standard --build= and --host=, mozilla uses --host 
instead
-       # of --build, and --target intstead of --host.
-       # Note, mozilla also has --build but it does not do what you think it 
does.
-       # Set both --target and --host as mozilla uses python to guess values 
otherwise
-       mozconfig_annotate '' --target="${CHOST}"
-       mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
-
-       mozconfig_use_enable pulseaudio
-       # force the deprecated alsa sound code if pulseaudio is disabled
-       if use kernel_linux && ! use pulseaudio ; then
-               mozconfig_annotate '-pulseaudio' --enable-alsa
-       fi
-
-       # For testing purpose only
-       mozconfig_annotate 'Sandbox' --enable-content-sandbox
-
-       mozconfig_use_enable system-sqlite
-       mozconfig_use_with system-jpeg
-       mozconfig_use_with system-icu
-       mozconfig_use_with system-libvpx
-       mozconfig_use_with system-harfbuzz
-       mozconfig_use_with system-harfbuzz system-graphite2
-
-       # Modifications to better support ARM, bug 553364
-       if use neon ; then
-               mozconfig_annotate '' --with-fpu=neon
-               mozconfig_annotate '' --with-thumb=yes
-               mozconfig_annotate '' --with-thumb-interwork=no
-       fi
-       if [[ ${CHOST} == armv* ]] ; then
-               mozconfig_annotate '' --with-float-abi=hard
-               if ! use system-libvpx ; then
-                       sed -i -e "s|softfp|hard|" \
-                               "${S}"/media/libvpx/moz.build
-               fi
-       fi
-}
-
-# @FUNCTION: mozconfig_install_prefs
-# @DESCRIPTION:
-# Set preferences into the prefs.js file specified as a parameter to
-# the function.  This sets both some common prefs to all mozilla
-# packages, and any prefs that may relate to the use flags administered
-# by mozconfig_config().
-#
-# Call this within src_install() phase, after copying the template
-# prefs file (if any) from ${FILESDIR}
-#
-# Example:
-#
-# inherit mozconfig-v6.46
-#
-# src_install() {
-#      cp "${FILESDIR}"/gentoo-default-prefs.js \
-#      "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js"  
\
-#      || die
-#
-#      mozconfig_install_prefs \
-#      "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js"
-#
-#      ...
-# }
-
-mozconfig_install_prefs() {
-       local prefs_file="${1}"
-
-       einfo "Adding prefs from mozconfig to ${prefs_file}"
-
-       # set dictionary path, to use system hunspell
-       echo "pref(\"spellchecker.dictionary_path\", 
\"${EPREFIX}/usr/share/myspell\");" \
-               >>"${prefs_file}" || die
-
-       # force the graphite pref if system-harfbuzz is enabled, since the pref 
cant disable it
-       if use system-harfbuzz ; then
-               echo 
"sticky_pref(\"gfx.font_rendering.graphite.enabled\",true);" \
-                       >>"${prefs_file}" || die
-       fi
-
-       # force cairo as the canvas renderer on platforms without skia support
-       if [[ $(tc-endian) == "big" ]] ; then
-               echo "sticky_pref(\"gfx.canvas.azure.backends\",\"cairo\");" \
-                       >>"${prefs_file}" || die
-               echo "sticky_pref(\"gfx.content.azure.backends\",\"cairo\");" \
-                       >>"${prefs_file}" || die
-       fi
-}

diff --git a/eclass/mozconfig-v6.57.eclass b/eclass/mozconfig-v6.57.eclass
deleted file mode 100644
index f05a69c1a2e..00000000000
--- a/eclass/mozconfig-v6.57.eclass
+++ /dev/null
@@ -1,399 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-#
-# @ECLASS: mozconfig-v6.57.eclass
-# @MAINTAINER:
-# mozilla team <mozi...@gentoo.org>
-# @BLURB: the new mozilla common configuration eclass for FF33 and newer, v6
-# @DESCRIPTION:
-# This eclass is used in mozilla ebuilds (firefox, thunderbird, seamonkey)
-# to provide a single common place for the common mozilla engine compoments.
-#
-# The eclass provides all common dependencies as well as common use flags.
-#
-# Some use flags which may be optional in particular mozilla packages can be
-# supported through setting eclass variables.
-#
-# This eclass inherits mozconfig helper functions as defined in mozcoreconf-v3,
-# and so ebuilds inheriting this eclass do not need to inherit that.
-
-case ${EAPI} in
-       0|1|2|3|4)
-               die "EAPI=${EAPI} not supported"
-               ;;
-       5)
-               inherit multilib
-               ;;
-esac
-
-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
-# ebuilds for firefox, and potentially seamonkey.
-#
-# Leave the variable UNSET if necko-wifi support should not be available.
-# Set the variable to "enabled" if the use flag should be enabled by default.
-# 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
-# otherwise, which is generally to enable jit unless support for the platform
-# is missing.
-#
-# Set the variable to "enabled" if the use flag should be enabled by default.
-# 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
-# thunderbird and seamonkey in the future, once support is ready for testing.
-#
-# Leave the variable UNSET if gtk3 support should not be optionally available.
-# Set the variable to "enabled" if the use flag should be enabled by default.
-# Set the variable to any value if the use flag should exist but not be 
default-enabled.
-# If gtk+:3 is to be the standard toolkit, do not use this and instead use
-# 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".
-#
-# Note that this option conflicts directly with MOZCONFIG_OPTIONAL_GTK3, both
-# variables cannot be set at the same time and this variable will be ignored if
-# MOZCONFIG_OPTIONAL_GTK3 is set.
-#
-# Leave the variable UNSET if gtk2-only support should not be available.
-# Set the variable to "enabled" if the use flag should be enabled by default.
-# 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
-# ebuilds for firefox, but thunderbird and seamonkey could follow in the 
future.
-#
-# Leave the variable UNSET if qt5 support should not be available.
-# Set the variable to "enabled" if the use flag should be enabled by default.
-# 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 neon pulseaudio selinux startup-notification 
system-harfbuzz
- system-icu system-jpeg system-libevent system-sqlite system-libvpx"
-
-# some notes on deps:
-# gtk:2 minimum is technically 2.10 but gio support (enabled by default) needs 
2.14
-# media-libs/mesa needs to be 10.2 or above due to a bug with flash+vdpau
-
-RDEPEND=">=app-text/hunspell-1.5.4:=
-       dev-libs/atk
-       dev-libs/expat
-       >=x11-libs/cairo-1.10[X]
-       >=x11-libs/gtk+-2.18:2
-       x11-libs/gdk-pixbuf
-       >=x11-libs/pango-1.22.0
-       >=media-libs/libpng-1.6.31:0=[apng]
-       >=media-libs/mesa-10.2:*
-       media-libs/fontconfig
-       >=media-libs/freetype-2.4.10
-       kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
-       pulseaudio? ( || ( media-sound/pulseaudio
-               >=media-sound/apulse-0.1.9 ) )
-       virtual/freedesktop-icon-theme
-       dbus? ( >=sys-apps/dbus-0.60
-               >=dev-libs/dbus-glib-0.72 )
-       startup-notification? ( >=x11-libs/startup-notification-0.8 )
-       >=x11-libs/pixman-0.19.2
-       >=dev-libs/glib-2.26:2
-       >=sys-libs/zlib-1.2.3
-       >=virtual/libffi-3.0.10
-       virtual/ffmpeg
-       x11-libs/libX11
-       x11-libs/libXcomposite
-       x11-libs/libXdamage
-       x11-libs/libXext
-       x11-libs/libXfixes
-       x11-libs/libXrender
-       x11-libs/libXt
-       system-icu? ( >=dev-libs/icu-59.1:= )
-       system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-       system-libevent? ( >=dev-libs/libevent-2.0:0= )
-       system-sqlite? ( >=dev-db/sqlite-3.20.1: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.9-r1 )
-"
-
-if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then
-       MOZCONFIG_OPTIONAL_GTK2ONLY=
-       if [[ ${MOZCONFIG_OPTIONAL_GTK3} = "enabled" ]]; then
-               IUSE+=" +force-gtk3"
-       else
-               IUSE+=" force-gtk3"
-       fi
-       RDEPEND+=" force-gtk3? ( >=x11-libs/gtk+-3.4.0:3 )"
-elif [[ -n ${MOZCONFIG_OPTIONAL_GTK2ONLY} ]]; then
-       if [[ ${MOZCONFIG_OPTIONAL_GTK2ONLY} = "enabled" ]]; then
-               IUSE+=" +gtk2"
-       else
-               IUSE+=" gtk2"
-       fi
-       RDEPEND+=" !gtk2? ( >=x11-libs/gtk+-3.4.0:3 )"
-else
-       # no gtk3 related dep set by optional use flags, force it
-       RDEPEND+="  >=x11-libs/gtk+-3.4.0:3"
-fi
-if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]]; then
-       if [[ ${MOZCONFIG_OPTIONAL_WIFI} = "enabled" ]]; then
-               IUSE+=" +wifi"
-       else
-               IUSE+=" wifi"
-       fi
-       RDEPEND+="
-       wifi? (
-               kernel_linux? ( >=sys-apps/dbus-0.60
-                       >=dev-libs/dbus-glib-0.72
-                       net-misc/networkmanager )
-       )"
-fi
-
-DEPEND="app-arch/zip
-       app-arch/unzip
-       >=sys-devel/binutils-2.16.1
-       sys-apps/findutils
-       pulseaudio? ( media-sound/pulseaudio )
-       >=virtual/rust-1.19.0
-       dev-util/cargo
-       ${RDEPEND}"
-
-RDEPEND+="
-       pulseaudio? ( || ( media-sound/pulseaudio
-               >=media-sound/apulse-0.1.9 ) )
-       selinux? ( sec-policy/selinux-mozilla )"
-
-# @FUNCTION: mozconfig_config
-# @DESCRIPTION:
-# Set common configure options for mozilla packages.
-# Call this within src_configure() phase, after mozconfig_init
-#
-# Example:
-#
-# inherit mozconfig-v6.46
-#
-# src_configure() {
-#      mozconfig_init
-#      mozconfig_config
-#      # ... misc ebuild-unique settings via calls to
-#      # ... mozconfig_{annotate,use_with,use_enable}
-#      mozconfig_final
-# }
-
-mozconfig_config() {
-       # Migrated from mozcoreconf-2
-       mozconfig_annotate 'system_libs' \
-               --with-system-zlib \
-               --with-system-bz2
-
-       # Stylo is only broken on x86 builds
-       use x86 && mozconfig_annotate 'Upstream bug 1341234' --disable-stylo
-
-       # Must pass release in order to properly select linker
-       mozconfig_annotate 'Enable by Gentoo' --enable-release
-
-       # Must pass --enable-gold if using ld.gold
-       if tc-ld-is-gold ; then
-               mozconfig_annotate 'tc-ld-is-gold=true' --enable-gold
-       else
-               mozconfig_annotate 'tc-ld-is-gold=false' --disable-gold
-       fi
-
-       if has bindist ${IUSE}; then
-               mozconfig_use_enable !bindist official-branding
-               if [[ ${PN} == firefox ]] && use bindist ; then
-                       mozconfig_annotate '' 
--with-branding=browser/branding/aurora
-               fi
-       fi
-
-       # Enable position independent executables
-       mozconfig_annotate 'enabled by Gentoo' --enable-pie
-       mozconfig_use_enable debug
-       mozconfig_use_enable debug tests
-
-       if ! use debug ; then
-               mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
-       else
-               mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols
-       fi
-
-       mozconfig_use_enable startup-notification
-
-       if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]] ; then
-               # wifi pulls in dbus so manage both here
-               mozconfig_use_enable wifi necko-wifi
-               if use kernel_linux && use wifi && ! use dbus; then
-                       echo "Enabling dbus support due to wifi request"
-                       mozconfig_annotate 'dbus required by necko-wifi on 
linux' --enable-dbus
-               else
-                       mozconfig_use_enable dbus
-               fi
-       else
-               mozconfig_use_enable dbus
-               mozconfig_annotate 'disabled' --disable-necko-wifi
-       fi
-
-       if [[ -n ${MOZCONFIG_OPTIONAL_JIT} ]]; then
-               mozconfig_use_enable jit ion
-       fi
-
-       # These are enabled by default in all mozilla applications
-       mozconfig_annotate '' --with-system-nspr 
--with-nspr-prefix="${SYSROOT}${EPREFIX}"/usr
-       mozconfig_annotate '' --with-system-nss 
--with-nss-prefix="${SYSROOT}${EPREFIX}"/usr
-       mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX}"/usr/include 
--x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir)
-       if use system-libevent; then
-               mozconfig_annotate '' 
--with-system-libevent="${SYSROOT}${EPREFIX}"/usr
-       fi
-       mozconfig_annotate '' --prefix="${EPREFIX}"/usr
-       mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
-       mozconfig_annotate 'Gentoo default' --enable-system-hunspell
-       mozconfig_annotate '' --disable-crashreporter
-       mozconfig_annotate 'Gentoo default' --with-system-png
-       mozconfig_annotate '' --enable-system-ffi
-       mozconfig_annotate '' --disable-gconf
-       mozconfig_annotate '' --with-intl-api
-
-       # skia has no support for big-endian platforms
-       if [[ $(tc-endian) == "big" ]]; then
-               mozconfig_annotate 'big endian target' --disable-skia
-       else
-               mozconfig_annotate '' --enable-skia
-       fi
-
-       # default toolkit is cairo-gtk3, optional use flags can change this
-       local toolkit="cairo-gtk3"
-       local toolkit_comment=""
-       if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then
-               if ! use force-gtk3; then
-                       toolkit="cairo-gtk2"
-                       toolkit_comment="force-gtk3 use flag"
-               fi
-       fi
-       if [[ -n ${MOZCONFIG_OPTIONAL_GTK2ONLY} ]]; then
-               if use gtk2 ; then
-                       toolkit="cairo-gtk2"
-               else
-                       toolkit_comment="gtk2 use flag"
-               fi
-       fi
-       if [[ -n ${MOZCONFIG_OPTIONAL_QT5} ]]; then
-               if use qt5; then
-                       toolkit="cairo-qt"
-                       toolkit_comment="qt5 use flag"
-                       # need to specify these vars because the qt5 versions 
are not found otherwise,
-                       # and setting --with-qtdir overrides the pkg-config 
include dirs
-                       local i
-                       for i in qmake moc rcc; do
-                               echo "export 
HOST_${i^^}=\"$(qt5_get_bindir)/${i}\"" \
-                                       >> "${S}"/.mozconfig || die
-                       done
-                       echo 'unset QTDIR' >> "${S}"/.mozconfig || die
-                       mozconfig_annotate '+qt5' --disable-gio
-               fi
-       fi
-       mozconfig_annotate "${toolkit_comment}" 
--enable-default-toolkit=${toolkit}
-
-       # Instead of the standard --build= and --host=, mozilla uses --host 
instead
-       # of --build, and --target intstead of --host.
-       # Note, mozilla also has --build but it does not do what you think it 
does.
-       # Set both --target and --host as mozilla uses python to guess values 
otherwise
-       mozconfig_annotate '' --target="${CHOST}"
-       mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
-
-       mozconfig_use_enable pulseaudio
-       # force the deprecated alsa sound code if pulseaudio is disabled
-       if use kernel_linux && ! use pulseaudio ; then
-               mozconfig_annotate '-pulseaudio' --enable-alsa
-       fi
-
-       # For testing purpose only
-       mozconfig_annotate 'Sandbox' --enable-content-sandbox
-
-       mozconfig_use_enable system-sqlite
-       mozconfig_use_with system-jpeg
-       mozconfig_use_with system-icu
-       mozconfig_use_with system-libvpx
-       mozconfig_use_with system-harfbuzz
-       mozconfig_use_with system-harfbuzz system-graphite2
-
-       # Modifications to better support ARM, bug 553364
-       if use neon ; then
-               mozconfig_annotate '' --with-fpu=neon
-               mozconfig_annotate '' --with-thumb=yes
-               mozconfig_annotate '' --with-thumb-interwork=no
-       fi
-       if [[ ${CHOST} == armv* ]] ; then
-               mozconfig_annotate '' --with-float-abi=hard
-               if ! use system-libvpx ; then
-                       sed -i -e "s|softfp|hard|" \
-                               "${S}"/media/libvpx/moz.build
-               fi
-       fi
-}
-
-# @FUNCTION: mozconfig_install_prefs
-# @DESCRIPTION:
-# Set preferences into the prefs.js file specified as a parameter to
-# the function.  This sets both some common prefs to all mozilla
-# packages, and any prefs that may relate to the use flags administered
-# by mozconfig_config().
-#
-# Call this within src_install() phase, after copying the template
-# prefs file (if any) from ${FILESDIR}
-#
-# Example:
-#
-# inherit mozconfig-v6.46
-#
-# src_install() {
-#      cp "${FILESDIR}"/gentoo-default-prefs.js \
-#      "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js"  
\
-#      || die
-#
-#      mozconfig_install_prefs \
-#      "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js"
-#
-#      ...
-# }
-
-mozconfig_install_prefs() {
-       local prefs_file="${1}"
-
-       einfo "Adding prefs from mozconfig to ${prefs_file}"
-
-       # set dictionary path, to use system hunspell
-       echo "pref(\"spellchecker.dictionary_path\", 
\"${EPREFIX}/usr/share/myspell\");" \
-               >>"${prefs_file}" || die
-
-       # force the graphite pref if system-harfbuzz is enabled, since the pref 
cant disable it
-       if use system-harfbuzz ; then
-               echo 
"sticky_pref(\"gfx.font_rendering.graphite.enabled\",true);" \
-                       >>"${prefs_file}" || die
-       fi
-
-       # force cairo as the canvas renderer on platforms without skia support
-       if [[ $(tc-endian) == "big" ]] ; then
-               echo "sticky_pref(\"gfx.canvas.azure.backends\",\"cairo\");" \
-                       >>"${prefs_file}" || die
-               echo "sticky_pref(\"gfx.content.azure.backends\",\"cairo\");" \
-                       >>"${prefs_file}" || die
-       fi
-}

Reply via email to