commit:     230613586cd9faaee7e7af9036448173b51a48ed
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 23 16:05:33 2015 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Thu Jul 23 16:05:33 2015 +0000
URL:        https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=23061358

Added option of IUSE=gtk3 to mozconfig, and a firefox-40 beta with the GTK3 use 
flag option enabled

 eclass/mozconfig-v6.40.eclass                | 263 ++++++++++++++++++
 www-client/firefox/Manifest                  |  12 +-
 www-client/firefox/firefox-40.0_beta6.ebuild | 402 +++++++++++++++++++++++++++
 3 files changed, 667 insertions(+), 10 deletions(-)

diff --git a/eclass/mozconfig-v6.40.eclass b/eclass/mozconfig-v6.40.eclass
new file mode 100644
index 0000000..c305db2
--- /dev/null
+++ b/eclass/mozconfig-v6.40.eclass
@@ -0,0 +1,263 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-v5.38.eclass,v 1.1 
2015/05/27 19:00:31 axs Exp $
+#
+# @ECLASS: mozconfig-v5.33.eclass
+# @MAINTAINER:
+# mozilla team <mozi...@gentoo.org>
+# @BLURB: the new mozilla common configuration eclass for FF33 and newer, v5
+# @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.
+
+inherit multilib flag-o-matic toolchain-funcs mozcoreconf-v3
+
+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.
+
+# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_GTK3
+# @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.
+
+# use-flags common among all mozilla ebuilds
+IUSE="${IUSE} dbus debug gstreamer gstreamer-0 +jemalloc3 pulseaudio selinux 
startup-notification system-cairo system-icu system-jpeg 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
+       >=dev-libs/libevent-1.4.7
+       >=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.17: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
+       gstreamer? (
+               >=media-libs/gstreamer-1.4.5:1.0
+               >=media-libs/gst-plugins-base-1.4.5:1.0
+               >=media-libs/gst-plugins-good-1.4.5:1.0
+               >=media-plugins/gst-plugins-libav-1.4.5:1.0
+       )
+       gstreamer-0? (
+               >=media-libs/gstreamer-0.10.25:0.10
+               media-plugins/gst-plugins-meta:0.10[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] >=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.9:3[secure-delete,debug=] )
+       system-libvpx? ( >=media-libs/libvpx-1.3.0[postproc] )
+"
+
+if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then
+       if [[ ${MOZCONFIG_OPTIONAL_GTK3} = "enabled" ]]; then
+               IUSE+=" +gtk3"
+       else
+               IUSE+=" gtk3"
+       fi
+       RDEPEND+="
+       gtk3? ( >=x11-libs/gtk+-3.14.0:3 )"
+fi
+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
+       >=sys-devel/binutils-2.16.1
+       ${RDEPEND}"
+
+RDEPEND+="
+       selinux? ( sec-policy/selinux-mozilla )"
+
+# only one of gstreamer and gstreamer-0 can be enabled at a time, so set 
REQUIRED_USE to signify this
+REQUIRED_USE="?? ( gstreamer gstreamer-0 )"
+
+# @FUNCTION: mozconfig_config
+# @DESCRIPTION:
+# Set common configure options for mozilla packages.
+# Call this within src_configure() phase, after mozconfig_init
+#
+# Example:
+#
+# inherit mozconfig-v5.33
+#
+# 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 \
+               --enable-pango \
+               --enable-svg \
+               --with-system-bz2
+
+       if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then
+               mozconfig_annotate 'gtk3 use flag' 
--enable-default-toolkit=$(usex gtk3 cairo-gtk3 cairo-gtk2)
+       else
+               mozconfig_annotate '' --enable-default-toolkit=cairo-gtk2
+       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
+
+       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 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
+
+       # These are forced-on for webm support
+       mozconfig_annotate 'required' --enable-ogg
+       mozconfig_annotate 'required' --enable-wave
+
+       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="${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 'Gentoo default' --enable-system-hunspell
+       mozconfig_annotate '' --disable-gnomevfs
+       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
+
+       # 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 jemalloc3; then
+               # We must force-enable jemalloc 3 via .mozconfig
+               echo "export MOZ_JEMALLOC3=1" >> "${S}"/.mozconfig || die
+               mozconfig_annotate '' --enable-jemalloc
+               mozconfig_annotate '' --enable-replace-malloc
+       fi
+
+       mozconfig_annotate '' --target="${CTARGET:-${CHOST}}"
+       mozconfig_annotate '' --build="${CTARGET:-${CHOST}}"
+
+       if use gstreamer ; then
+               mozconfig_annotate '+gstreamer' --enable-gstreamer=1.0
+       elif use gstreamer-0 ; then
+               mozconfig_annotate '+gstreamer-0' --enable-gstreamer=0.10
+       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
+       mozconfig_use_with system-libvpx
+}

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 8a37bc6..66f8d7b 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST firefox-38.0-patches-0.3.tar.xz 4796 SHA256 
bfbef81748f76f5f80c3ce6e6b810b65f6266f71da02722b1e8c9fad865b02bd SHA512 
a974e33759246153db7d83488f1326275efd12c44a6c8c539cbc35709b4dbd27e848bda32f302ac2baa5d8729ba20579ebc7f643419757f542972ca1a264d520
 WHIRLPOOL 
3549239db380c02a1575ff407ea684a14827f2250d991b5eb6c8a341ceebaca57cd2cc422e160f00dfab933385d677574cd84947da07bd282c68bb84c40fa42b
 DIST firefox-38.1.0esr-af.xpi 483325 SHA256 
1a4c6835db2ba384767f6ceddf021a30b61c1d29f17577cf2f7330e3358c9ff7 SHA512 
44c08b31c3c1c3160c4e992a01bb2eeb30c8177956b29d09be336970521a7671f1847dd88122973236f34bd5559a9d69bdefc271386f6cda8edf90be520f34e1
 WHIRLPOOL 
a104dfcfd811424d53e1bb4d85d20b7a4d56dff6275d94ac180073f5abc770bf81e0cfa6fa7a6a98f29bc76b687e58071a4c7dbea51a638019a3e6fb5295864f
 DIST firefox-38.1.0esr-ar.xpi 516495 SHA256 
47eef2d1bfa6e5594cd8835bddca7bfd5019aac1553b54b05c1c749fad659dda SHA512 
156891397a303d80833bcfdb459ff79f252257c5b9a7d9af5df334772b855f3c19d82af8daf3b6a1c205d63cc508fc57a75b85c756e22813b7a680784cf5289d
 WHIRLPOOL 
2d8ab97d91087bafeeea01174da694d8de9e12fb0854e5b770f80822f1b72246c65ae7d6f7c993908883bf138fc6732f6aa62f40263b42f609506001a3dd39b1
@@ -162,10 +159,5 @@ DIST firefox-39.0-xh.xpi 454916 SHA256 
8d66c08160c6a2e3860bca6cc7d9c87b653c97c70
 DIST firefox-39.0-zh-CN.xpi 492380 SHA256 
a7e959d6aba6f67b880b9ebcc1d1c2e253f01e079475191dc3eef978a9d9b2b5 SHA512 
cb4e8c6f813692b66d2f86c454b25b129308ccf68e830f0b7c104340858f0b2fc7472a7e0ba1fbe093a05ac0c07e2d5cedf390abf4b1b4b74b68d45b43ca6ec7
 WHIRLPOOL 
dc5a3f3e80712986203a9d6e8883378e3de72f1a365649e601526a4b36286f9fbe29e181ea55bd6b221bbf5a53951ce0818888a886654d5147591bacd3b5dcaa
 DIST firefox-39.0-zh-TW.xpi 471887 SHA256 
ec30c554c57aa27835723253f4c0dfc4fc75ca591f9a64fbd65f7622d7b212dd SHA512 
6f247e71d3b6d232972a538517a9d148d30ecfd24efa4a4851b52a3db7a079ef039473be8596e09236009b785f84f98c82a01c7013cfc0e2333ff4dbfdff0a1f
 WHIRLPOOL 
735fde774086000d85e9718b498aad5fbbc5e7df6105c34d33a67210a119aae748dcb3dbe11039057b0cea242640f257883131a341895dc4acfbfdacf4681736
 DIST firefox-39.0.source.tar.bz2 182881881 SHA256 
7e25014deb926df9220c3ab40ac6816c13a04c4cf7bd89b08fc1743307df1096 SHA512 
963dbf48c077659edd49868e2e11600ba232a7cbf35e4acb20f10b878f2d2278e3d33c9eaa9272a07b7b6e2e565e4b40ebc269a128935ee4e044857c828dbc50
 WHIRLPOOL 
7c67f401c4fb1c5f194f4c9c90af3583622eea36ed14840ea24ec2c4f007407bb984488e6fddc161b399de30511bed70f93000de4c94f837c23e822a67e72ec7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iF4EAREIAAYFAlWarpsACgkQAJxUfCtlWe2J4gEAioxOLNbMyBnyPrvAyvTNGrxx
-TNhZjn+yPD//oPpFpQkBAKNaEeny1l6UhCpGjN+2B8KUSY9Ggc7Jmv2ylJ3yVSFo
-=fKlR
------END PGP SIGNATURE-----
+DIST firefox-40.0-patches-0.01.tar.xz 5144 SHA256 
072c44c79ba82d04958b3fc3d1c6e90805cf71797a03b96961fd3a16bd14c3a7 SHA512 
bb9ca395ee380e6ec21fefadc5c5052ce8490039577ac0245bcee309686e802a654a999b3aeeaf8d97573f102fba3620c9995ec145ddcdded2ee9487490f87f9
 WHIRLPOOL 
e74ed6af06e61baaf0991d23849739fb8c1cb33c800467e76d1c15ae22360c18c757ac9f19d274ca9cc54a6f9a0d17f365bd815b4a35c94766b29980638e8c91
+DIST firefox-40.0b6.source.tar.bz2 178418614 SHA256 
2f6db263842ccfb06b249d60f9aaba0885a253e70977a20fa895c700537f6340 SHA512 
13326495f5887de17e346aa9591e9c60343909601e89a5863ccddbc551fd68d21352d3dd67f41a7e68341a8e9ce769f21ac3c67f8e081014b10e60ec52e948fe
 WHIRLPOOL 
f5810c6bf96a99a5c93fbaa4983e5a7fb390910e23c1ab8271c86e00e4586776badee83db452494de78bb9f425f4bf76cffb21df17055638b2b34dea542b876e

diff --git a/www-client/firefox/firefox-40.0_beta6.ebuild 
b/www-client/firefox/firefox-40.0_beta6.ebuild
new file mode 100644
index 0000000..45e21ca
--- /dev/null
+++ b/www-client/firefox/firefox-40.0_beta6.ebuild
@@ -0,0 +1,402 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+VIRTUALX_REQUIRED="pgo"
+WANT_AUTOCONF="2.1"
+MOZ_ESR=""
+
+# This list can be updated with scripts/get_langs.sh from the mozilla overlay
+# No official support as of fetch time
+# csb
+MOZ_LANGS=( af ar as ast be bg bn-BD bn-IN br bs ca cs cy da de el en
+en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd
+gl gu-IN he hi-IN hr hu hy-AM id is it ja kk km kn ko lt lv mai mk ml mr
+nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te
+th tr uk vi xh zh-CN zh-TW )
+
+# Convert the ebuild version to the upstream mozilla version, used by 
mozlinguas
+MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
+MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
+MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
+
+if [[ ${MOZ_ESR} == 1 ]]; then
+       # ESR releases have slightly version numbers
+       MOZ_PV="${MOZ_PV}esr"
+fi
+
+# Patch version
+PATCH="${PN}-40.0-patches-0.01"
+# Upstream ftp release URI that's used by mozlinguas.eclass
+# We don't use the http mirror because it deletes old tarballs.
+MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases";
+MOZ_HTTP_URI="http://ftp.mozilla.org/pub/${PN}/releases";
+
+MOZCONFIG_OPTIONAL_GTK3=1
+MOZCONFIG_OPTIONAL_WIFI=1
+MOZCONFIG_OPTIONAL_JIT="enabled"
+
+inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils 
mozconfig-v6.40 multilib pax-utils fdo-mime autotools virtualx mozlinguas
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="http://www.mozilla.com/firefox";
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux 
~x86-linux"
+
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="bindist egl hardened +minimal neon pgo selinux +gmp-autoupdate test"
+RESTRICT="!bindist? ( bindist )"
+
+# More URIs appended below...
+SRC_URI="${SRC_URI}
+       http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz
+       http://dev.gentoo.org/~axs/distfiles/${PATCH}.tar.xz
+       http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz";
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+# Mesa 7.10 needed for WebGL + bugfixes
+RDEPEND="
+       >=dev-libs/nss-3.19.2
+       >=dev-libs/nspr-4.10.8
+       selinux? ( sec-policy/selinux-mozilla )"
+
+DEPEND="${RDEPEND}
+       pgo? (
+               >=sys-devel/gcc-4.5 )
+       amd64? ( ${ASM_DEPEND}
+               virtual/opengl )
+       x86? ( ${ASM_DEPEND}
+               virtual/opengl )"
+
+# No source releases for alpha|beta
+if [[ ${PV} =~ alpha ]]; then
+       CHANGESET="8a3042764de7"
+       SRC_URI="${SRC_URI}
+               
http://dev.gentoo.org/~nirbheek/mozilla/firefox/firefox-${MOZ_PV}_${CHANGESET}.source.tar.bz2";
+       S="${WORKDIR}/mozilla-aurora-${CHANGESET}"
+elif [[ ${PV} =~ beta ]]; then
+       S="${WORKDIR}/mozilla-beta"
+       SRC_URI="${SRC_URI}
+               ${MOZ_FTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2
+               
${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2"
+else
+       SRC_URI="${SRC_URI}
+               ${MOZ_FTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2
+               
${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2"
+       if [[ ${MOZ_ESR} == 1 ]]; then
+               S="${WORKDIR}/mozilla-esr${PV%%.*}"
+       else
+               S="${WORKDIR}/mozilla-release"
+       fi
+fi
+
+QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/firefox"
+
+BUILD_OBJ_DIR="${S}/ff"
+
+pkg_setup() {
+       moz_pkgsetup
+
+       # Avoid PGO profiling problems due to enviroment leakage
+       # These should *always* be cleaned up anyway
+       unset DBUS_SESSION_BUS_ADDRESS \
+               DISPLAY \
+               ORBIT_SOCKETDIR \
+               SESSION_MANAGER \
+               XDG_SESSION_COOKIE \
+               XAUTHORITY
+
+       if ! use bindist; then
+               einfo
+               elog "You are enabling official branding. You may not 
redistribute this build"
+               elog "to any users on your network or the internet. Doing so 
puts yourself into"
+               elog "a legal problem with Mozilla Foundation"
+               elog "You can disable it by emerging ${PN} _with_ the bindist 
USE-flag"
+       fi
+
+       if use pgo; then
+               einfo
+               ewarn "You will do a double build for profile guided 
optimization."
+               ewarn "This will result in your build taking at least twice as 
long as before."
+       fi
+}
+
+pkg_pretend() {
+       # Ensure we have enough disk space to compile
+       if use pgo || use debug || use test ; then
+               CHECKREQS_DISK_BUILD="8G"
+       else
+               CHECKREQS_DISK_BUILD="4G"
+       fi
+       check-reqs_pkg_setup
+}
+
+src_unpack() {
+       unpack ${A}
+
+       # Unpack language packs
+       mozlinguas_src_unpack
+}
+
+src_prepare() {
+       # Apply our patches
+       EPATCH_SUFFIX="patch" \
+       EPATCH_FORCE="yes" \
+       epatch "${WORKDIR}/firefox"
+
+       # Allow user to apply any additional patches without modifing ebuild
+       epatch_user
+
+       # Enable gnomebreakpad
+       if use debug ; then
+               sed -i -e 
"s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
+                       "${S}"/build/unix/run-mozilla.sh || die "sed failed!"
+       fi
+
+       # Ensure that our plugins dir is enabled as default
+       sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
+               "${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed 
failed to replace plugin path for 32bit!"
+       sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
+               "${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed 
failed to replace plugin path for 64bit!"
+
+       # Fix sandbox violations during make clean, bug 372817
+       sed -e "s:\(/no-such-file\):${T}\1:g" \
+               -i "${S}"/config/rules.mk \
+               -i "${S}"/nsprpub/configure{.in,} \
+               || die
+
+       # Don't exit with error when some libs are missing which we have in
+       # system.
+       sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+               -i "${S}"/browser/installer/Makefile.in || die
+
+       # Don't error out when there's no files to be removed:
+       sed 's@\(xargs rm\)$@\1 -f@' \
+               -i "${S}"/toolkit/mozapps/installer/packager.mk || die
+
+       eautoreconf
+
+       # Must run autoconf in js/src
+       cd "${S}"/js/src || die
+       eautoconf
+
+       # Need to update jemalloc's configure
+       cd "${S}"/memory/jemalloc/src || die
+       WANT_AUTOCONF= eautoconf
+}
+
+src_configure() {
+       MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+       MEXTENSIONS="default"
+       # Google API keys (see 
http://www.chromium.org/developers/how-tos/api-keys)
+       # Note: These are for Gentoo Linux use ONLY. For your own distribution, 
please
+       # get your own set of keys.
+       _google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+
+       ####################################
+       #
+       # mozconfig, CFLAGS and CXXFLAGS setup
+       #
+       ####################################
+
+       mozconfig_init
+       mozconfig_config
+
+       # It doesn't compile on alpha without this LDFLAGS
+       use alpha && append-ldflags "-Wl,--no-relax"
+
+       # Add full relro support for hardened
+       use hardened && append-ldflags "-Wl,-z,relro,-z,now"
+
+       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
+
+       use egl && mozconfig_annotate 'Enable EGL as GL provider' 
--with-gl-provider=EGL
+
+       # Setup api key for location services
+       echo -n "${_google_api_key}" > "${S}"/google-api-key
+       mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
+
+       mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+       mozconfig_annotate '' --disable-mailnews
+
+       # Other ff-specific settings
+       mozconfig_annotate '' 
--with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+
+       # Allow for a proper pgo build
+       if use pgo; then
+               echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON) 
\$(OBJDIR)/_profile/pgo/profileserver.py'" >> "${S}"/.mozconfig
+       fi
+
+       echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
+
+       # Finalize and report settings
+       mozconfig_final
+
+       if [[ $(gcc-major-version) -lt 4 ]]; then
+               append-cxxflags -fno-stack-protector
+       fi
+
+       # workaround for funky/broken upstream configure...
+       emake -f client.mk configure
+}
+
+src_compile() {
+       if use pgo; then
+               addpredict /root
+               addpredict /etc/gconf
+               # Reset and cleanup environment variables used by GNOME/XDG
+               gnome2_environment_reset
+
+               # Firefox tries to use dri stuff when it's run, see bug 380283
+               shopt -s nullglob
+               cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+               if test -z "${cards}"; then
+                       cards=$(echo -n /dev/ati/card* /dev/nvidiactl* | sed 
's/ /:/g')
+                       if test -n "${cards}"; then
+                               # Binary drivers seem to cause access 
violations anyway, so
+                               # let's use indirect rendering so that the 
device files aren't
+                               # touched at all. See bug 394715.
+                               export LIBGL_ALWAYS_INDIRECT=1
+                       fi
+               fi
+               shopt -u nullglob
+               addpredict "${cards}"
+
+               CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+               MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
+               Xemake -f client.mk profiledbuild || die "Xemake failed"
+       else
+               CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+               MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
+               emake -f client.mk realbuild
+       fi
+
+}
+
+src_install() {
+       MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+       DICTPATH="\"${EPREFIX}/usr/share/myspell\""
+
+       cd "${BUILD_OBJ_DIR}" || die
+
+       # Pax mark xpcshell for hardened support, only used for startupcache 
creation.
+       pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
+
+       # Add our default prefs for firefox
+       cp "${FILESDIR}"/gentoo-default-prefs.js-1 \
+               
"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+               || die
+
+       # Set default path to search for dictionaries.
+       echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
+               >> 
"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+               || die
+
+       echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
+               
"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+               || die
+
+       local plugin
+       use gmp-autoupdate || for plugin in \
+       gmp-gmpopenh264 ; do
+               echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
+                       
"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+                       || die
+       done
+
+       MOZ_MAKE_FLAGS="${MAKEOPTS}" \
+       emake DESTDIR="${D}" install
+
+       # Install language packs
+       mozlinguas_src_install
+
+       local size sizes icon_path icon name
+       if use bindist; then
+               sizes="16 32 48"
+               icon_path="${S}/browser/branding/aurora"
+               # Firefox's new rapid release cycle means no more codenames
+               # Let's just stick with this one...
+               icon="aurora"
+               name="Aurora"
+       else
+               sizes="16 22 24 32 256"
+               icon_path="${S}/browser/branding/official"
+               icon="${PN}"
+               name="Mozilla Firefox"
+       fi
+
+       # Install icons and .desktop for menu entry
+       for size in ${sizes}; do
+               insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
+               newins "${icon_path}/default${size}.png" "${icon}.png"
+       done
+       # The 128x128 icon has a different name
+       insinto "/usr/share/icons/hicolor/128x128/apps"
+       newins "${icon_path}/mozicon128.png" "${icon}.png"
+       # Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+       newicon "${icon_path}/content/icon48.png" "${icon}.png"
+       newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop"
+       sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
+               "${ED}/usr/share/applications/${PN}.desktop" || die
+
+       # Add StartupNotify=true bug 237317
+       if use startup-notification ; then
+               echo "StartupNotify=true"\
+                        >> "${ED}/usr/share/applications/${PN}.desktop" \
+                       || die
+       fi
+
+       # Required in order to use plugins and even run firefox on hardened.
+       if use jit; then
+               pax-mark m 
"${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
+       else
+               pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container
+       fi
+
+       if use minimal; then
+               rm -r "${ED}"/usr/include 
"${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk} \
+                       || die "Failed to remove sdk and headers"
+       fi
+
+       # very ugly hack to make firefox not sigbus on sparc
+       # FIXME: is this still needed??
+       use sparc && { sed -e 's/Firefox/FirefoxGentoo/g' \
+                                        -i 
"${ED}/${MOZILLA_FIVE_HOME}/application.ini" \
+                                       || die "sparc sed failed"; }
+
+       # revdep-rebuild entry
+       insinto /etc/revdep-rebuild
+       echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10firefox
+       doins "${T}"/10${PN} || die
+}
+
+pkg_preinst() {
+       gnome2_icon_savelist
+}
+
+pkg_postinst() {
+       # Update mimedb for the new .desktop file
+       fdo-mime_desktop_database_update
+       gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+       gnome2_icon_cache_update
+}

Reply via email to