commit:     1e52e0f5b9f42f19c83ea5b87d8c6d63f48837b5
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  6 14:42:25 2014 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Thu Nov  6 14:46:09 2014 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=1e52e0f5

Cleaned up old eclasses, added subslot dep to dev-libs/icu

Bug 528424 requests dev-libs/icu has subslot operator to avoid the need
for a preserved-libs rebuild.  Also, no need to have old eclasses hanging
around when they are obsolete.

---
 eclass/mozconfig-3.eclass     | 104 ----------------
 eclass/mozconfig-v4.31.eclass | 193 -----------------------------
 eclass/mozconfig-v5.31.eclass |   2 +-
 eclass/mozconfig-v5.33.eclass |   2 +-
 eclass/mozconfig-v5.34.eclass |   2 +-
 eclass/mozcoreconf-2.eclass   | 274 ------------------------------------------
 6 files changed, 3 insertions(+), 574 deletions(-)

diff --git a/eclass/mozconfig-3.eclass b/eclass/mozconfig-3.eclass
deleted file mode 100644
index b6efbf8..0000000
--- a/eclass/mozconfig-3.eclass
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-#
-# mozconfig.eclass: the new mozilla.eclass
-
-inherit multilib flag-o-matic mozcoreconf-2
-
-# use-flags common among all mozilla ebuilds
-IUSE="+alsa +dbus debug libnotify startup-notification system-sqlite wifi"
-
-# XXX: GConf is used for setting the default browser
-#      revisit to make it optional with GNOME 3
-# pango[X] is needed for pangoxft.h
-# freedesktop-icon-theme is needed for bug 341697
-RDEPEND="app-arch/zip
-       app-arch/unzip
-       >=app-text/hunspell-1.2
-       dev-libs/expat
-       >=dev-libs/libevent-1.4.7
-       >=x11-libs/cairo-1.8[X]
-       >=x11-libs/gtk+-2.8.6:2
-       >=x11-libs/pango-1.10.1
-       virtual/jpeg:0
-       alsa? ( media-libs/alsa-lib )
-       virtual/freedesktop-icon-theme
-       dbus? ( >=dev-libs/dbus-glib-0.72 )
-       libnotify? ( >=x11-libs/libnotify-0.4 )
-       startup-notification? ( >=x11-libs/startup-notification-0.8 )
-       wifi? ( net-wireless/wireless-tools )"
-DEPEND="${RDEPEND}"
-
-mozconfig_config() {
-       mozconfig_annotate '' --enable-default-toolkit=cairo-gtk2
-
-       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
-
-       if ! $(mozversion_is_new_enough) ; then
-               mozconfig_use_enable alsa ogg
-               mozconfig_use_enable alsa wave
-               mozconfig_use_enable libnotify
-               mozconfig_use_enable debug debugger-info-modules
-               if has +ipc ${IUSE}; then
-                       mozconfig_use_enable ipc
-               fi
-               if [[ ${PN} != thunderbird ]] ; then
-                       mozconfig_annotate 'places' --enable-storage 
--enable-places --enable-places_bookmarks
-                       mozconfig_annotate '' --enable-oji --enable-mathml
-                       mozconfig_annotate 'broken' --disable-mochitest
-               fi
-               if use system-sqlite; then
-                       mozconfig_annotate '' 
--with-sqlite-prefix="${EPREFIX}"/usr
-               fi
-               if use amd64 || use x86 || use arm || use sparc; then
-                       mozconfig_annotate '' --enable-tracejit
-               fi
-       fi
-
-       mozconfig_use_enable dbus
-       mozconfig_use_enable debug
-       mozconfig_use_enable debug tests
-       if ! use debug ; then
-               mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
-       fi
-       mozconfig_use_enable startup-notification
-       mozconfig_use_enable system-sqlite
-       mozconfig_use_enable wifi necko-wifi
-
-       if $(mozversion_is_new_enough) ; then
-               mozconfig_annotate 'required' --enable-ogg
-               mozconfig_annotate 'required' --enable-wave
-               mozconfig_annotate 'required' --with-system-libvpx
-       elif has +webm ${IUSE} && use webm; then
-               if ! use alsa; then
-                       echo "Enabling alsa support due to webm request"
-                       mozconfig_annotate '+webm -alsa' --enable-ogg
-                       mozconfig_annotate '+webm -alsa' --enable-wave
-                       mozconfig_annotate '+webm' --enable-webm
-                       mozconfig_annotate '+webm' --with-system-libvpx
-               else
-                       mozconfig_use_enable webm
-                       mozconfig_annotate '+webm' --with-system-libvpx
-               fi
-       else
-               mozconfig_annotate '' --disable-webm
-               mozconfig_annotate '' --disable-system-libvpx
-       fi
-
-       # These are enabled by default in all mozilla applications
-       mozconfig_annotate '' --with-system-nspr 
--with-nspr-prefix="${EPREFIX}"/usr
-       mozconfig_annotate '' --with-system-nss 
--with-nss-prefix="${EPREFIX}"/usr
-       mozconfig_annotate '' --x-includes="${EPREFIX}"/usr/include 
--x-libraries="${EPREFIX}"/usr/$(get_libdir)
-       mozconfig_annotate '' --with-system-libevent="${EPREFIX}"/usr
-       mozconfig_annotate '' --enable-system-hunspell
-       mozconfig_annotate '' --disable-gnomevfs
-       mozconfig_annotate '' --disable-gnomeui
-       mozconfig_annotate '' --enable-gio
-       mozconfig_annotate '' --disable-crashreporter
-}

diff --git a/eclass/mozconfig-v4.31.eclass b/eclass/mozconfig-v4.31.eclass
deleted file mode 100644
index 30d6c32..0000000
--- a/eclass/mozconfig-v4.31.eclass
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-v4.1.eclass,v 1.1 
2014/09/03 21:52:44 axs Exp $
-#
-# mozconfig-v4.1.eclass: the new mozilla.eclass
-
-inherit multilib flag-o-matic toolchain-funcs mozcoreconf-2
-
-case ${EAPI} in
-       0|1|2|3|4) die "EAPI=${EAPI} not supported"
-esac
-
-# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_WIFI
-# @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
-# @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.
-
-# use-flags common among all mozilla ebuilds
-IUSE="dbus debug gstreamer pulseaudio startup-notification system-cairo 
system-icu system-jpeg system-sqlite"
-
-# 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
-       >=dev-libs/libevent-1.4.7
-       >=x11-libs/cairo-1.10[X]
-       >=x11-libs/gtk+-2.14:2
-       x11-libs/gdk-pixbuf
-       >=x11-libs/pango-1.22.0
-       >=media-libs/libpng-1.6.10:0=[apng]
-       >=media-libs/libvpx-1.3.0
-       >=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
-       virtual/libffi
-       gstreamer? ( media-plugins/gst-plugins-meta:1.0[ffmpeg] )
-       x11-libs/libX11
-       x11-libs/libXext
-       x11-libs/libXrender
-       x11-libs/libXt
-       system-cairo? ( >=x11-libs/cairo-1.12[X] >=x11-libs/pixman-0.19.2 )
-       system-icu? ( >=dev-libs/icu-51.1 )
-       system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-       system-sqlite? ( >=dev-db/sqlite-3.8.4.2:3[secure-delete,debug=] )
-"
-
-if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]]; then
-       if [[ ${MOZCONFIG_OPTIONAL_WIFI} = "enabled" ]]; then
-               IUSE+=" +wifi"
-       else
-               IUSE+=" wifi"
-       fi
-       RDEPEND+="
-       wifi? ( >=sys-apps/dbus-0.60
-               >=dev-libs/dbus-glib-0.72
-               net-wireless/wireless-tools )"
-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
-       virtual/pkgconfig
-       >=sys-devel/binutils-2.16.1
-       ${RDEPEND}"
-
-# @FUNCTION: mozconfig_config
-# @DESCRIPTION:
-# Set common configure options for mozilla packages.
-# Call this within src_configure() phase, after mozconfig_init
-#
-# Example:
-#
-# inherit mozconfig-v4
-#
-# src_configure() {
-#      mozconfig_init
-#      mozconfig_config
-#      # ... misc ebuild-unique settings via calls to
-#      # ... mozconfig_{annotate,use_with,use_enable}
-#      mozconfig_final
-# }
-
-mozconfig_config() {
-
-       mozconfig_annotate '' --enable-default-toolkit=cairo-gtk2
-
-       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
-       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 wifi && ! use dbus; then
-                       echo "Enabling dbus support due to wifi request"
-                       mozconfig_annotate 'dbus required by necko-wifi' 
--enable-dbus
-               else
-                       mozconfig_use_enable dbus
-               fi
-       else
-               mozconfig_use_enable dbus
-               mozconfig_annotate 'disabled' --disable-necko-wifi
-       fi
-
-       mozconfig_annotate 'required' --enable-ogg
-       mozconfig_annotate 'required' --enable-wave
-
-       if [[ -n ${MOZCONFIG_OPTIONAL_JIT} ]]; then
-               mozconfig_use_enable jit ion
-               mozconfig_use_enable jit yarr-jit
-       fi
-
-       # These are enabled by default in all mozilla applications
-       mozconfig_annotate '' --with-system-nspr 
--with-nspr-prefix="${EPREFIX}"/usr
-       mozconfig_annotate '' --with-system-nss 
--with-nss-prefix="${EPREFIX}"/usr
-       mozconfig_annotate '' --x-includes="${EPREFIX}"/usr/include 
--x-libraries="${EPREFIX}"/usr/$(get_libdir)
-       mozconfig_annotate '' --with-system-libevent="${EPREFIX}"/usr
-       mozconfig_annotate '' --prefix="${EPREFIX}"/usr
-       mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
-       mozconfig_annotate '' --enable-system-hunspell
-       mozconfig_annotate '' --disable-gnomevfs
-       mozconfig_annotate '' --disable-gnomeui
-       mozconfig_annotate '' --enable-gio
-       mozconfig_annotate '' --disable-crashreporter
-       mozconfig_annotate '' --with-system-png
-       mozconfig_annotate '' --enable-system-ffi
-       mozconfig_annotate '' --disable-gold
-       mozconfig_annotate '' --disable-gconf
-
-       # We must force enable jemalloc 3 threw .mozconfig
-       echo "export MOZ_JEMALLOC=1" >> "${S}"/.mozconfig || die
-       mozconfig_annotate '' --enable-jemalloc
-       mozconfig_annotate '' --enable-replace-malloc
-
-       mozconfig_annotate '' --target="${CTARGET:-${CHOST}}"
-       mozconfig_annotate '' --build="${CTARGET:-${CHOST}}"
-
-       if use gstreamer; then
-               mozconfig_annotate '+gstreamer' --enable-gstreamer=1.0
-       else
-               mozconfig_annotate '' --disable-gstreamer
-       fi
-       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_enable system-icu intl-api
-}

diff --git a/eclass/mozconfig-v5.31.eclass b/eclass/mozconfig-v5.31.eclass
index ca4fcd7..4771347 100644
--- a/eclass/mozconfig-v5.31.eclass
+++ b/eclass/mozconfig-v5.31.eclass
@@ -78,7 +78,7 @@ RDEPEND=">=app-text/hunspell-1.2
        x11-libs/libXrender
        x11-libs/libXt
        system-cairo? ( >=x11-libs/cairo-1.12[X] >=x11-libs/pixman-0.19.2 )
-       system-icu? ( >=dev-libs/icu-51.1 )
+       system-icu? ( >=dev-libs/icu-51.1:= )
        system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
        system-sqlite? ( >=dev-db/sqlite-3.8.4.2:3[secure-delete,debug=] )
        system-libvpx? ( =media-libs/libvpx-1.3.0* )

diff --git a/eclass/mozconfig-v5.33.eclass b/eclass/mozconfig-v5.33.eclass
index 6d85651..7e604a3 100644
--- a/eclass/mozconfig-v5.33.eclass
+++ b/eclass/mozconfig-v5.33.eclass
@@ -83,7 +83,7 @@ RDEPEND=">=app-text/hunspell-1.2
        x11-libs/libXrender
        x11-libs/libXt
        system-cairo? ( >=x11-libs/cairo-1.12[X] >=x11-libs/pixman-0.19.2 )
-       system-icu? ( >=dev-libs/icu-51.1 )
+       system-icu? ( >=dev-libs/icu-51.1:= )
        system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
        system-sqlite? ( >=dev-db/sqlite-3.8.5:3[secure-delete,debug=] )
        system-libvpx? ( =media-libs/libvpx-1.3.0*[postproc] )

diff --git a/eclass/mozconfig-v5.34.eclass b/eclass/mozconfig-v5.34.eclass
index 020d6ec..49ad77b 100644
--- a/eclass/mozconfig-v5.34.eclass
+++ b/eclass/mozconfig-v5.34.eclass
@@ -83,7 +83,7 @@ RDEPEND=">=app-text/hunspell-1.2
        x11-libs/libXrender
        x11-libs/libXt
        system-cairo? ( >=x11-libs/cairo-1.12[X] >=x11-libs/pixman-0.19.2 )
-       system-icu? ( >=dev-libs/icu-51.1 )
+       system-icu? ( >=dev-libs/icu-51.1:= )
        system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
        system-sqlite? ( >=dev-db/sqlite-3.8.6:3[secure-delete,debug=] )
        system-libvpx? ( =media-libs/libvpx-1.3.0*[postproc] )

diff --git a/eclass/mozcoreconf-2.eclass b/eclass/mozcoreconf-2.eclass
deleted file mode 100644
index f27fd72..0000000
--- a/eclass/mozcoreconf-2.eclass
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mozcoreconf-2.eclass,v 1.29 
2013/03/25 13:08:39 anarchy Exp $
-#
-# mozcoreconf.eclass : core options for mozilla
-# inherit mozconfig-2 if you need USE flags
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads,sqlite'
-
-inherit multilib flag-o-matic python-any-r1 versionator
-
-IUSE="${IUSE} custom-cflags custom-optimization"
-
-RDEPEND="x11-libs/libXrender
-       x11-libs/libXt
-       >=sys-libs/zlib-1.1.4"
-
-DEPEND="${RDEPEND}
-       virtual/pkgconfig
-       ${PYTHON_DEPS}"
-
-# mozconfig_annotate: 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
-}
-
-# mozconfig_use_enable: 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}"
-}
-
-# mozconfig_use_with: 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}"
-}
-
-# mozconfig_use_extension: 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}
-}
-
-mozversion_is_new_enough() {
-       case ${PN} in
-               firefox|thunderbird)
-                       if [[ $(get_version_component_range 1) -ge 17 ]] ; then
-                               return 0
-                       fi
-               ;;
-               seamonkey)
-                       if [[ $(get_version_component_range 1) -eq 2 ]] && [[ 
$(get_version_component_range 2) -ge 14 ]] ; then
-                               return 0
-                       fi
-               ;;
-       esac
-
-       return 1
-}
-
-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 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
-       eval unset MOZCONFIG
-
-       # 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
-}
-
-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 -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
-
-       # Go a little faster; use less RAM
-       append-flags "$MAKEEDIT_FLAGS"
-
-       ####################################
-       #
-       # mozconfig setup
-       #
-       ####################################
-
-       mozconfig_annotate system_libs \
-               --with-system-jpeg \
-               --with-system-zlib \
-               --enable-pango \
-               --enable-system-cairo
-               if ! $(mozversion_is_new_enough) ; then
-                       mozconfig_annotate system-libs --enable-svg
-               fi
-
-       mozconfig_annotate disable_update_strip \
-               --disable-pedantic \
-               --disable-updater \
-               --disable-strip \
-               --disable-install-strip
-               if ! $(mozversion_is_new_enough) ; then
-                       mozconfig_annotate disable_update_strip \
-                               --disable-installer \
-                               --disable-strip-libs
-               fi
-
-       if [[ ${PN} != seamonkey ]]; then
-               mozconfig_annotate basic_profile \
-                       --disable-profilelocking
-                       if ! $(mozversion_is_new_enough) ; then
-                               mozconfig_annotate basic_profile \
-                                       --enable-single-profile \
-                                       --disable-profilesharing
-                       fi
-       fi
-
-       # Here is a strange one...
-       if is-flag '-mcpu=ultrasparc*' || is-flag '-mtune=ultrasparc*'; then
-               mozconfig_annotate "building on ultrasparc" 
--enable-js-ultrasparc
-       fi
-
-       # Currently --enable-elf-dynstr-gc only works for x86,
-       # thanks to Jason Wever <[email protected]> for the fix.
-       if use x86 && [[ ${enable_optimize} != -O0 ]]; then
-               mozconfig_annotate "${ARCH} optimized build" 
--enable-elf-dynstr-gc
-       fi
-
-       # jemalloc won't build with older glibc
-       ! has_version ">=sys-libs/glibc-2.4" && mozconfig_annotate "we have old 
glibc" --disable-jemalloc
-}
-
-# mozconfig_final: display a table describing all configuration options paired
-# with reasons, then clean up extensions list
-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
-}
-

Reply via email to