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

["Jory Pratt" <anarchy@gentoo.org>]

commit:     01c114560549666e5aa4a45a12029f806fbadbc7
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  2 21:11:03 2012 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sun Dec  2 21:11:03 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=01c11456

Needed changes, work in progress, does break overlay

---
 eclass/mozconfig-3.eclass                |   56 ++++++++++++++++--------------
 eclass/mozcoreconf-2.eclass              |   18 +++++----
 www-client/firefox/firefox-17.0.1.ebuild |   11 ++----
 3 files changed, 44 insertions(+), 41 deletions(-)

diff --git a/eclass/mozconfig-3.eclass b/eclass/mozconfig-3.eclass
index e5c1c0f..33c5fb0 100644
--- a/eclass/mozconfig-3.eclass
+++ b/eclass/mozconfig-3.eclass
@@ -41,28 +41,39 @@ mozconfig_config() {
 		fi
 	fi
 
-	mozconfig_use_enable alsa ogg
-	mozconfig_use_enable alsa wave
+	if [[ ${PN} == firefox || thunderbird ]] && [[ ${PV} < 17.0 ]] || [[ ${P} < seamonkey-2.14 ]]; 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
-	mozconfig_use_enable debug debugger-info-modules
-	if has +ipc ${IUSE}; then
-		mozconfig_use_enable ipc
-	fi
-	mozconfig_use_enable libnotify
 	mozconfig_use_enable startup-notification
 	mozconfig_use_enable system-sqlite
-	if use system-sqlite; then
-		mozconfig_annotate '' --with-sqlite-prefix="${EPREFIX}"/usr
-	fi
 	mozconfig_use_enable wifi necko-wifi
 
-	if [[ ${PN} == xulrunner ]] ; then
-		mozconfig_annotate 'mozjs' --enable-shared-js
-	fi
-
-	if has +webm ${IUSE} && use webm; then
+	if [[ ${PN} == firefox || thunderbird ]] && [[ ${PV} >= 17.0 ]] || [[ ${P} >= seamonkey-2.14 ]]; 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
@@ -78,13 +89,11 @@ mozconfig_config() {
 		mozconfig_annotate '' --disable-system-libvpx
 	fi
 
-	if use amd64 || use x86 || use arm || use sparc; then
-		mozconfig_annotate '' --enable-tracejit
-	fi
-
 	# Disable webrtc for arches that it doesn't support, bug 444780
-	if use ppc || use ppc64 || arm; then
-		mozconfig_annotate '' --disable-webrtc
+	if [[ ${PN} == firefox || thunderbird ]] && [[ ${PV} >= 17.0 ]] || [[ ${P} >= seamonkey-2.14 ]]; then
+		if use ppc || use ppc64 || arm; then
+			mozconfig_annotate '' --disable-webrtc
+		fi
 	fi
 
 	# These are enabled by default in all mozilla applications
@@ -97,9 +106,4 @@ mozconfig_config() {
 	mozconfig_annotate '' --disable-gnomeui
 	mozconfig_annotate '' --enable-gio
 	mozconfig_annotate '' --disable-crashreporter
-	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
 }

diff --git a/eclass/mozcoreconf-2.eclass b/eclass/mozcoreconf-2.eclass
index 1f1b21c..e34cb17 100644
--- a/eclass/mozcoreconf-2.eclass
+++ b/eclass/mozcoreconf-2.eclass
@@ -193,25 +193,27 @@ mozconfig_init() {
 		--with-system-jpeg \
 		--with-system-zlib \
 		--enable-pango \
-		--enable-svg \
+		if [[ ${PN} == firefox || thunderbird ]] && [[ ${PV} < 17.0 ]] || [[ ${P} < seamonkey-2.14 ]]; then
+			--enable-svg \
+		fi
 		--enable-system-cairo
-		# Requires libpng with apng support
-		#--with-system-png \
 
 	mozconfig_annotate disable_update_strip \
 		--disable-installer \
 		--disable-pedantic \
 		--disable-updater \
 		--disable-strip \
-		--disable-strip-libs \
+		if [[ ${PN} == firefox || thunderbird ]] && [[ ${PV} < 17.0 ]] || [[ ${P} < seamonkey-2.14 ]]; then
+			--disable-strip-libs \
+		fi
 		--disable-install-strip
 
-
-
 	if [[ ${PN} != seamonkey ]]; then
 		mozconfig_annotate basic_profile \
-			--enable-single-profile \
-			--disable-profilesharing \
+			if [[ ${PN} == firefox || thunderbird ]] && [[ ${PV} < 17.0 ]] || [[ ${P} < seamonkey-2.14 ]]; then
+				--enable-single-profile \
+				--disable-profilesharing \
+			fi
 			--disable-profilelocking
 	fi
 

diff --git a/www-client/firefox/firefox-17.0.1.ebuild b/www-client/firefox/firefox-17.0.1.ebuild
index 985a7e5..96d6ee1 100644
--- a/www-client/firefox/firefox-17.0.1.ebuild
+++ b/www-client/firefox/firefox-17.0.1.ebuild
@@ -38,7 +38,7 @@ HOMEPAGE="http://www.mozilla.com/firefox"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist gstreamer +ipc +jit +minimal pgo selinux system-sqlite +webm"
+IUSE="bindist gstreamer +ipc +jit +minimal pgo selinux system-sqlite"
 
 # More URIs appended below...
 SRC_URI="${SRC_URI}
@@ -60,8 +60,8 @@ RDEPEND="
 		>=media-libs/gstreamer-0.10.33:0.10
 		>=media-libs/gst-plugins-base-0.10.33:0.10 )
 	system-sqlite? ( >=dev-db/sqlite-3.7.13[fts3,secure-delete,threadsafe,unlock-notify,debug=] )
-	webm? ( >=media-libs/libvpx-1.0.0
-		media-libs/alsa-lib )
+	>=media-libs/libvpx-1.0.0
+	elibc_glibc? ( media-libs/alsa-lib )
 	selinux? ( sec-policy/selinux-mozilla )"
 # We don't use PYTHON_DEPEND/PYTHON_USE_WITH for some silly reason
 DEPEND="${RDEPEND}
@@ -70,8 +70,7 @@ DEPEND="${RDEPEND}
 	pgo? (
 		=dev-lang/python-2*[sqlite]
 		>=sys-devel/gcc-4.5 )
-	webm? ( x86? ( ${ASM_DEPEND} )
-		amd64? ( ${ASM_DEPEND} )
+	x86? || amd64? ( ${ASM_DEPEND} )
 		virtual/opengl )"
 
 # No source releases for alpha|beta
@@ -212,8 +211,6 @@ src_configure() {
 	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
 	mozconfig_annotate '' --disable-gconf
 	mozconfig_annotate '' --disable-mailnews
-	mozconfig_annotate '' --enable-canvas
-	mozconfig_annotate '' --enable-safe-browsing
 	mozconfig_annotate '' --with-system-png
 	mozconfig_annotate '' --enable-system-ffi