[gentoo-commits] proj/mozilla:master commit in: www-client/firefox/, eclass/

[Jory Pratt]

commit:     ab3bb4073c161cee30b3ae33c7428a2c4507fc49
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  6 17:58:24 2014 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sun Jul  6 17:59:05 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=ab3bb407

Redesign mozconfig eclass to be better suited to handle esr and testing
branch

---
 eclass/mozconfig-v4.eclass             | 80 ++++++++++++++++++++++++++++++++++
 www-client/firefox/firefox-30.0.ebuild | 18 ++------
 2 files changed, 84 insertions(+), 14 deletions(-)

diff --git a/eclass/mozconfig-v4.eclass b/eclass/mozconfig-v4.eclass
new file mode 100644
index 0000000..72d66b2
--- /dev/null
+++ b/eclass/mozconfig-v4.eclass
@@ -0,0 +1,80 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+#
+# mozconfig-v4.eclass: the new mozilla.eclass
+
+inherit multilib flag-o-matic mozcoreconf-2
+
+# use-flags common among all mozilla ebuilds
+IUSE="dbus debug startup-notification"
+
+RDEPEND=">=app-text/hunspell-1.2
+	dev-libs/expat
+	>=dev-libs/libevent-1.4.7
+	>=x11-libs/cairo-1.10[X]
+	>=x11-libs/gtk+-2.10:2
+	>=x11-libs/pango-1.22.0
+	media-libs/alsa-lib
+	virtual/freedesktop-icon-theme
+	dbus? ( >=dev-libs/dbus-glib-0.72 )
+	startup-notification? ( >=x11-libs/startup-notification-0.8 )
+	wifi? ( >=sys-apps/dbus-0.60
+		net-wireless/wireless-tools )
+	>=dev-libs/glib-2.26:2"
+
+DEPEND="app-arch/zip
+	app-arch/unzip
+	${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
+
+	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 has wifi ${IUSE} && use wifi; then
+		if ! use dbus; then
+			echo "Enabling dbus support due to wifi request"
+			mozconfig_annotate wifi --enable-necko-wifi
+			mozconfig_annotate dbus --enable-dbus
+		else
+			mozconfig_annotate wifi --enable-necko-wifi
+		fi
+	fi
+
+	mozconfig_annotate 'required' --enable-ogg
+	mozconfig_annotate 'required' --enable-wave
+
+	if has jit ${IUSE}; then
+		mozconfig_use_enable jit ion
+		mozconfig_use_enable jit yarr-jit
+	fi
+
+	mozconfig_use_enable dbus
+
+	# 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/www-client/firefox/firefox-30.0.ebuild b/www-client/firefox/firefox-30.0.ebuild
index 6d823f7..2c33bb9 100644
--- a/www-client/firefox/firefox-30.0.ebuild
+++ b/www-client/firefox/firefox-30.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-28.0.ebuild,v 1.4 2014/04/02 14:03:36 axs Exp $
+# $Header: $
 
 EAPI="5"
 VIRTUALX_REQUIRED="pgo"
@@ -31,7 +31,7 @@ PATCH="${PN}-30.0-patches-0.1"
 MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/"
 MOZ_HTTP_URI="http://ftp.mozilla.org/pub/${PN}/releases/"
 
-inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-3 multilib pax-utils fdo-mime autotools virtualx mozlinguas
+inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-v4 multilib pax-utils fdo-mime autotools virtualx mozlinguas
 
 DESCRIPTION="Firefox Web Browser"
 HOMEPAGE="http://www.mozilla.com/firefox"
@@ -39,12 +39,11 @@ 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 gstreamer hardened +jit +minimal pgo pulseaudio selinux system-cairo system-icu system-jpeg system-sqlite test"
+IUSE="bindist gstreamer hardened +jit +minimal pgo pulseaudio selinux system-cairo system-icu system-jpeg system-sqlite test wifi"
 
 # More URIs appended below...
 SRC_URI="${SRC_URI}
 	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz
-	http://dev.gentoo.org/~nirbheek/mozilla/patchsets/${PATCH}.tar.xz
 	http://dev.gentoo.org/~axs/distfiles/${PATCH}.tar.xz"
 
 ASM_DEPEND=">=dev-lang/yasm-1.1"
@@ -53,13 +52,12 @@ ASM_DEPEND=">=dev-lang/yasm-1.1"
 RDEPEND="
 	>=dev-libs/nss-3.16
 	>=dev-libs/nspr-4.10.6
-	>=dev-libs/glib-2.26:2
 	>=media-libs/mesa-7.10
 	>=media-libs/libpng-1.6.7[apng]
 	virtual/libffi
 	gstreamer? ( media-plugins/gst-plugins-meta:1.0[ffmpeg] )
 	pulseaudio? ( media-sound/pulseaudio )
-	system-cairo? ( >=x11-libs/cairo-1.12[X] )
+	system-cairo? ( >=x11-libs/cairo-1.10[X] )
 	system-icu? ( >=dev-libs/icu-51.1 )
 	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
 	system-sqlite? ( >=dev-db/sqlite-3.8.3.1:3[secure-delete,debug=] )
@@ -247,8 +245,6 @@ src_configure() {
 	mozconfig_use_with system-jpeg
 	mozconfig_use_with system-icu
 	mozconfig_use_enable system-icu intl-api
-	# Feature is know to cause problems on hardened
-	mozconfig_use_enable jit ion
 
 	# Allow for a proper pgo build
 	if use pgo; then
@@ -322,12 +318,6 @@ src_install() {
 		>> "${S}/${obj_dir}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
 		|| die
 
-	if ! use libnotify; then
-		echo "pref(\"browser.download.manager.showAlertOnComplete\", false);" \
-			>> "${S}/${obj_dir}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-	fi
-
 	echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
 		"${S}/${obj_dir}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
 		|| die