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

["Ian Stakenvicius" <axs@gentoo.org>]

commit:     af11c412815a336006d304bb67ac27530157e2fb
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 25 19:20:37 2014 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Mon Aug 25 19:20:37 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=af11c412

Attempt to fix USE=jit behaviour in eclass and firefox ebuilds

Migrated the addition of jit to IUSE into eclass, using MOZCONFIG_OPTIONAL_JIT flag
and bumped the firefox ebuild to use it.

Also updated mozconfig-v4.eclass to mirror the version in the portage tree.

---
 .../{mozconfig-v4.eclass => mozconfig-v4.1.eclass} | 37 ++++++++++++++++++----
 eclass/mozconfig-v4.eclass                         |  6 ++--
 ...{firefox-31.0.ebuild => firefox-31.0-r1.ebuild} |  5 +--
 3 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/eclass/mozconfig-v4.eclass b/eclass/mozconfig-v4.1.eclass
similarity index 72%
copy from eclass/mozconfig-v4.eclass
copy to eclass/mozconfig-v4.1.eclass
index 0b5cf53..0721029 100644
--- a/eclass/mozconfig-v4.eclass
+++ b/eclass/mozconfig-v4.1.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-v4.eclass,v 1.3 2014/08/01 16:32:16 axs Exp $
 #
 # mozconfig-v4.eclass: the new mozilla.eclass
 
@@ -13,6 +13,18 @@ inherit multilib flag-o-matic mozcoreconf-2
 # 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="wifi".  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.
 
 # @FUNCTION: mozconfig_config
 # @DESCRIPTION:
@@ -40,19 +52,30 @@ RDEPEND=">=app-text/hunspell-1.2
 	>=x11-libs/cairo-1.12[X]
 	>=x11-libs/gtk+-2.10:2
 	>=x11-libs/pango-1.22.0
-	media-libs/alsa-lib
+	kernel_linux? ( media-libs/alsa-lib )
 	virtual/freedesktop-icon-theme
 	dbus? ( >=dev-libs/dbus-glib-0.72 )
 	startup-notification? ( >=x11-libs/startup-notification-0.8 )
 	>=dev-libs/glib-2.26:2"
 
 if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]]; then
-IUSE+=" wifi"
-RDEPEND+="
+	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
@@ -78,7 +101,7 @@ mozconfig_config() {
 
 	mozconfig_use_enable startup-notification
 
-	if has wifi ${IUSE} ; then
+	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
@@ -95,7 +118,7 @@ mozconfig_config() {
 	mozconfig_annotate 'required' --enable-ogg
 	mozconfig_annotate 'required' --enable-wave
 
-	if has jit ${IUSE}; then
+	if [[ -n ${MOZCONFIG_OPTIONAL_JIT} ]]; then
 		mozconfig_use_enable jit ion
 		mozconfig_use_enable jit yarr-jit
 	fi

diff --git a/eclass/mozconfig-v4.eclass b/eclass/mozconfig-v4.eclass
index 0b5cf53..0a0e941 100644
--- a/eclass/mozconfig-v4.eclass
+++ b/eclass/mozconfig-v4.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-v4.eclass,v 1.3 2014/08/01 16:32:16 axs Exp $
 #
 # mozconfig-v4.eclass: the new mozilla.eclass
 
@@ -40,7 +40,7 @@ RDEPEND=">=app-text/hunspell-1.2
 	>=x11-libs/cairo-1.12[X]
 	>=x11-libs/gtk+-2.10:2
 	>=x11-libs/pango-1.22.0
-	media-libs/alsa-lib
+	kernel_linux? ( media-libs/alsa-lib )
 	virtual/freedesktop-icon-theme
 	dbus? ( >=dev-libs/dbus-glib-0.72 )
 	startup-notification? ( >=x11-libs/startup-notification-0.8 )

diff --git a/www-client/firefox/firefox-31.0.ebuild b/www-client/firefox/firefox-31.0-r1.ebuild
similarity index 98%
rename from www-client/firefox/firefox-31.0.ebuild
rename to www-client/firefox/firefox-31.0-r1.ebuild
index d873db9..758b9e2 100644
--- a/www-client/firefox/firefox-31.0.ebuild
+++ b/www-client/firefox/firefox-31.0-r1.ebuild
@@ -32,8 +32,9 @@ MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/"
 MOZ_HTTP_URI="http://ftp.mozilla.org/pub/${PN}/releases/"
 
 MOZCONFIG_OPTIONAL_WIFI=1
+MOZCONFIG_OPTIONAL_JIT="enabled"
 
-inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-v4 multilib pax-utils fdo-mime autotools virtualx mozlinguas
+inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-v4.1 multilib pax-utils fdo-mime autotools virtualx mozlinguas
 
 DESCRIPTION="Firefox Web Browser"
 HOMEPAGE="http://www.mozilla.com/firefox"
@@ -41,7 +42,7 @@ 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 +minimal pgo pulseaudio selinux system-cairo system-icu system-jpeg system-sqlite test"
 
 # More URIs appended below...
 SRC_URI="${SRC_URI}