commit:     75eca0ef8ac42f11a733ef9c1fb8b4dc96cd28a9
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 25 14:32:00 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Sep 25 14:32:48 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75eca0ef

Remove unused private eclasses

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 eclass/mozconfig-v6.52.eclass | 391 ------------------------------------------
 eclass/mozcoreconf-v4.eclass  | 261 ----------------------------
 2 files changed, 652 deletions(-)

diff --git a/eclass/mozconfig-v6.52.eclass b/eclass/mozconfig-v6.52.eclass
deleted file mode 100644
index 42e6fb030cd..00000000000
--- a/eclass/mozconfig-v6.52.eclass
+++ /dev/null
@@ -1,391 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-#
-# @ECLASS: mozconfig-v6.52.eclass
-# @MAINTAINER:
-# mozilla team <[email protected]>
-# @SUPPORTED_EAPIS: 5 6 7
-# @BLURB: the new mozilla common configuration eclass for FF33 and newer, v6
-# @DESCRIPTION:
-# This eclass is used in mozilla ebuilds (firefox, thunderbird, seamonkey)
-# 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.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.25: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
-       media-video/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=[threads] )
-       system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] )
-       system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] )
-       system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= 
>=media-gfx/graphite2-1.3.8 )
-"
-
-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 )"
-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-gtk2, optional use flags can change this
-       local toolkit="cairo-gtk2"
-       local toolkit_comment=""
-       if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then
-               if use force-gtk3; then
-                       toolkit="cairo-gtk3"
-                       toolkit_comment="force-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
-       # 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/mozcoreconf-v4.eclass b/eclass/mozcoreconf-v4.eclass
deleted file mode 100644
index ba9a65349fd..00000000000
--- a/eclass/mozcoreconf-v4.eclass
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-#
-# @ECLASS: mozcoreconf-v4.eclass
-# @MAINTAINER:
-# Mozilla team <[email protected]>
-# @BLURB: core options and configuration functions for mozilla
-# @DESCRIPTION:
-#
-# inherit mozconfig-v6.* or above for mozilla configuration support
-
-# @ECLASS-VARIABLE: MOZILLA_FIVE_HOME
-# @DESCRIPTION:
-# This is an eclass-generated variable that defines the rpath that the mozilla
-# product will be installed in.  Read-only
-
-if [[ ! ${_MOZCORECONF} ]]; then
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='ncurses,sqlite,ssl,threads'
-
-inherit multilib toolchain-funcs flag-o-matic python-any-r1 versionator
-
-IUSE="${IUSE} custom-cflags custom-optimization"
-
-DEPEND="virtual/pkgconfig
-       ${PYTHON_DEPS}"
-
-# @FUNCTION: mozconfig_annotate
-# @DESCRIPTION:
-# add an annotated line to .mozconfig
-#
-# Example:
-# mozconfig_annotate "building on ultrasparc" --enable-js-ultrasparc
-# => ac_add_options --enable-js-ultrasparc # building on ultrasparc
-mozconfig_annotate() {
-       declare reason=$1 x ; shift
-       [[ $# -gt 0 ]] || die "mozconfig_annotate missing flags for ${reason}\!"
-       for x in ${*}; do
-               echo "ac_add_options ${x} # ${reason}" >>.mozconfig
-       done
-}
-
-# @FUNCTION: mozconfig_use_enable
-# @DESCRIPTION:
-# add a line to .mozconfig based on a USE-flag
-#
-# Example:
-# mozconfig_use_enable truetype freetype2
-# => ac_add_options --enable-freetype2 # +truetype
-mozconfig_use_enable() {
-       declare flag=$(use_enable "$@")
-       mozconfig_annotate "$(use $1 && echo +$1 || echo -$1)" "${flag}"
-}
-
-# @FUNCTION: mozconfig_use_with
-# @DESCRIPTION:
-# add a line to .mozconfig based on a USE-flag
-#
-# Example:
-# mozconfig_use_with kerberos gss-api /usr/$(get_libdir)
-# => ac_add_options --with-gss-api=/usr/lib # +kerberos
-mozconfig_use_with() {
-       declare flag=$(use_with "$@")
-       mozconfig_annotate "$(use $1 && echo +$1 || echo -$1)" "${flag}"
-}
-
-# @FUNCTION: mozconfig_use_extension
-# @DESCRIPTION:
-# enable or disable an extension based on a USE-flag
-#
-# Example:
-# mozconfig_use_extension gnome gnomevfs
-# => ac_add_options --enable-extensions=gnomevfs
-mozconfig_use_extension() {
-       declare minus=$(use $1 || echo -)
-       mozconfig_annotate "${minus:-+}$1" --enable-extensions=${minus}${2}
-}
-
-moz_pkgsetup() {
-       # Ensure we use C locale when building
-       export LANG="C"
-       export LC_ALL="C"
-       export LC_MESSAGES="C"
-       export LC_CTYPE="C"
-
-       # Ensure we use correct toolchain
-       export HOST_CC="$(tc-getBUILD_CC)"
-       export HOST_CXX="$(tc-getBUILD_CXX)"
-       tc-export CC CXX LD PKG_CONFIG
-
-       # Ensure that we have a sane build enviroment
-       export MOZILLA_CLIENT=1
-       export BUILD_OPT=1
-       export NO_STATIC_LIB=1
-       export USE_PTHREADS=1
-       export ALDFLAGS=${LDFLAGS}
-       # ensure MOZCONFIG is not defined
-       unset MOZCONFIG
-
-       # set MOZILLA_FIVE_HOME
-       export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-       # nested configure scripts in mozilla products generate unrecognized 
options
-       # false positives when toplevel configure passes downwards.
-       export QA_CONFIGURE_OPTIONS=".*"
-
-       if [[ $(gcc-major-version) -eq 3 ]]; then
-               ewarn "Unsupported compiler detected, DO NOT file bugs for"
-               ewarn "outdated compilers. Bugs opened with gcc-3 will be 
closed"
-               ewarn "invalid."
-       fi
-
-       python-any-r1_pkg_setup
-}
-
-# @FUNCTION: mozconfig_init
-# @DESCRIPTION:
-# Initialize mozilla configuration and populate with core settings.
-# This should be called in src_configure before any other mozconfig_* 
functions.
-mozconfig_init() {
-       declare enable_optimize pango_version myext x
-       declare XUL=$([[ ${PN} == xulrunner ]] && echo true || echo false)
-       declare FF=$([[ ${PN} == firefox ]] && echo true || echo false)
-       declare SM=$([[ ${PN} == seamonkey ]] && echo true || echo false)
-       declare TB=$([[ ${PN} == thunderbird ]] && echo true || echo false)
-
-       ####################################
-       #
-       # Setup the initial .mozconfig
-       # See http://www.mozilla.org/build/configure-build.html
-       #
-       ####################################
-
-       case ${PN} in
-               *xulrunner)
-                       cp xulrunner/config/mozconfig .mozconfig \
-                               || die "cp xulrunner/config/mozconfig failed" ;;
-               *firefox)
-                       cp browser/config/mozconfig .mozconfig \
-                               || die "cp browser/config/mozconfig failed" ;;
-               seamonkey)
-                       # Must create the initial mozconfig to enable 
application
-                       : >.mozconfig || die "initial mozconfig creation failed"
-                       mozconfig_annotate "" --enable-application=suite ;;
-               *thunderbird)
-                       # Must create the initial mozconfig to enable 
application
-                       : >.mozconfig || die "initial mozconfig creation failed"
-                       mozconfig_annotate "" --enable-application=mail ;;
-       esac
-
-       ####################################
-       #
-       # CFLAGS setup and ARCH support
-       #
-       ####################################
-
-       # Set optimization level
-       if [[ ${ARCH} == hppa ]]; then
-               mozconfig_annotate "more than -O0 causes a segfault on hppa" 
--enable-optimize=-O0
-       elif [[ ${ARCH} == x86 ]]; then
-               mozconfig_annotate "less then -O2 causes a segfault on x86" 
--enable-optimize=-O2
-       elif use custom-optimization || [[ ${ARCH} =~ (alpha|ia64) ]]; then
-               # Set optimization level based on CFLAGS
-               if is-flag -O0; then
-                       mozconfig_annotate "from CFLAGS" --enable-optimize=-O0
-               elif [[ ${ARCH} == ppc ]] && has_version 
'>=sys-libs/glibc-2.8'; then
-                       mozconfig_annotate "more than -O1 segfaults on ppc with 
glibc-2.8" --enable-optimize=-O1
-               elif is-flag -O4; then
-                       mozconfig_annotate "from CFLAGS" --enable-optimize=-O4
-               elif is-flag -O3; then
-                       mozconfig_annotate "from CFLAGS" --enable-optimize=-O3
-               elif is-flag -O1; then
-                       mozconfig_annotate "from CFLAGS" --enable-optimize=-O1
-               elif is-flag -Os; then
-                       mozconfig_annotate "from CFLAGS" --enable-optimize=-Os
-               else
-                       mozconfig_annotate "Gentoo's default optimization" 
--enable-optimize=-O2
-               fi
-       else
-               # Enable Mozilla's default
-               mozconfig_annotate "mozilla default" --enable-optimize
-       fi
-
-       # Strip optimization so it does not end up in compile string
-       filter-flags '-O*'
-
-       # Strip over-aggressive CFLAGS
-       use custom-cflags || strip-flags
-
-       # Additional ARCH support
-       case "${ARCH}" in
-       alpha)
-               # Historically we have needed to add -fPIC manually for 64-bit.
-               # Additionally, alpha should *always* build with -mieee for 
correct math
-               # operation
-               append-flags -fPIC -mieee
-               ;;
-
-       ia64)
-               # Historically we have needed to add this manually for 64-bit
-               append-flags -fPIC
-               ;;
-
-       ppc64)
-               append-flags -fPIC -mminimal-toc
-               ;;
-       esac
-
-       # We need to append flags for gcc-6 support
-       if [[ $(gcc-major-version) -ge 6 ]]; then
-               append-cxxflags -fno-delete-null-pointer-checks 
-fno-lifetime-dse -fno-schedule-insns2
-       fi
-
-       # Use the MOZILLA_FIVE_HOME for the rpath
-       append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
-       # Set MOZILLA_FIVE_HOME in mozconfig
-       mozconfig_annotate '' 
--with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-
-       ####################################
-       #
-       # mozconfig setup
-       #
-       ####################################
-
-       mozconfig_annotate disable_update_strip \
-               --disable-updater \
-               --disable-strip \
-               --disable-install-strip
-
-       # jemalloc won't build with older glibc
-       ! has_version ">=sys-libs/glibc-2.4" && mozconfig_annotate "we have old 
glibc" --disable-jemalloc
-}
-
-# @FUNCTION: mozconfig_final
-# @DESCRIPTION:
-# Display a table describing all configuration options paired
-# with reasons, then clean up extensions list.
-# This should be called in src_configure at the end of all other mozconfig_* 
functions.
-mozconfig_final() {
-       declare ac opt hash reason
-       echo
-       echo "=========================================================="
-       echo "Building ${PF} with the following configuration"
-       grep ^ac_add_options .mozconfig | while read ac opt hash reason; do
-               [[ -z ${hash} || ${hash} == \# ]] \
-                       || die "error reading mozconfig: ${ac} ${opt} ${hash} 
${reason}"
-               printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org 
default}"
-       done
-       echo "=========================================================="
-       echo
-
-       # Resolve multiple --enable-extensions down to one
-       declare exts=$(sed -n 's/^ac_add_options --enable-extensions=\([^ 
]*\).*/\1/p' \
-               .mozconfig | xargs)
-       sed -i '/^ac_add_options --enable-extensions/d' .mozconfig
-       echo "ac_add_options --enable-extensions=${exts// /,}" >> .mozconfig
-}
-
-_MOZCORECONF=1
-fi

Reply via email to