updated mozilla eclasses to match mozilla-overlay

3 files changed, 77 insertions, 63 deletions

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 15b2e1d3c308..ded8d8e62343 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.554 2012/12/08 15:58:47 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.555 2012/12/09 15:37:12 axs Exp $
+
+  09 Dec 2012; Ian Stakenvicius <axs@gentoo.org> mozcoreconf-2.eclass,
+  mozconfig-3.eclass:
+  updated mozilla eclasses to match mozilla-overlay
 
   08 Dec 2012; Michael Palimaka <kensington@gentoo.org> cmake-utils.eclass:
   Respect ASMFLAGS, wrt bug #432480. Permit ebuilds to define 'myctestargs'.
diff --git a/eclass/mozconfig-3.eclass b/eclass/mozconfig-3.eclass
index 64241cd5e2fa..82ee228ae77e 100644
--- a/eclass/mozconfig-3.eclass
+++ b/eclass/mozconfig-3.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-3.eclass,v 1.32 2012/09/12 22:52:18 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-3.eclass,v 1.33 2012/12/09 15:37:12 axs Exp $
 #
 # mozconfig.eclass: the new mozilla.eclass
 
@@ -41,28 +41,39 @@ mozconfig_config() {
 		fi
 	fi
 
-	mozconfig_use_enable alsa ogg
-	mozconfig_use_enable alsa wave
+	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
-	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 $(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
@@ -78,8 +89,11 @@ mozconfig_config() {
 		mozconfig_annotate '' --disable-system-libvpx
 	fi
 
-	if use amd64 || use x86 || use arm || use sparc; then
-		mozconfig_annotate '' --enable-tracejit
+	# Disable webrtc for arches that it doesn't support, bug 444780
+	if $(mozversion_is_new_enough) ; then
+		if ! use x86 && ! use amd64 ; then
+			mozconfig_annotate '' --disable-webrtc
+		fi
 	fi
 
 	# These are enabled by default in all mozilla applications
@@ -92,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 971a59bdc88b..c2aad8ca0146 100644
--- a/eclass/mozcoreconf-2.eclass
+++ b/eclass/mozcoreconf-2.eclass
@@ -1,11 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mozcoreconf-2.eclass,v 1.23 2012/05/02 18:31:42 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mozcoreconf-2.eclass,v 1.24 2012/12/09 15:37:12 axs Exp $
 #
 # mozcoreconf.eclass : core options for mozilla
 # inherit mozconfig-2 if you need USE flags
 
-inherit multilib flag-o-matic python
+inherit multilib flag-o-matic python versionator
 
 IUSE="${IUSE} custom-cflags custom-optimization"
 
@@ -61,6 +61,23 @@ mozconfig_use_extension() {
 	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"
@@ -76,6 +93,12 @@ moz_pkgsetup() {
 	export ALDFLAGS=${LDFLAGS}
 
 	python_set_active_version 2
+
+	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
 }
 
 mozconfig_init() {
@@ -135,6 +158,8 @@ mozconfig_init() {
 			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
@@ -170,36 +195,8 @@ mozconfig_init() {
 	ppc64)
 		append-flags -fPIC -mminimal-toc
 		;;
-
-	ppc)
-		# Fix to avoid gcc-3.3.x micompilation issues.
-		if [[ $(gcc-major-version).$(gcc-minor-version) == 3.3 ]]; then
-			append-flags -fno-strict-aliasing
-		fi
-		;;
-
-	x86)
-		if [[ $(gcc-major-version) -eq 3 ]]; then
-			# gcc-3 prior to 3.2.3 doesn't work well for pentium4
-			# see bug 25332
-			if [[ $(gcc-minor-version) -lt 2 ||
-				( $(gcc-minor-version) -eq 2 && $(gcc-micro-version) -lt 3 ) ]]
-			then
-				replace-flags -march=pentium4 -march=pentium3
-				filter-flags -msse2
-			fi
-		fi
-		;;
 	esac
 
-	if [[ $(gcc-major-version) -eq 3 ]]; then
-		# Enable us to use flash, etc plugins compiled with gcc-2.95.3
-		mozconfig_annotate "building with >=gcc-3" --enable-old-abi-compat-wrappers
-
-		# Needed to build without warnings on gcc-3
-		CXXFLAGS="${CXXFLAGS} -Wno-deprecated"
-	fi
-
 	# Go a little faster; use less RAM
 	append-flags "$MAKEEDIT_FLAGS"
 
@@ -213,26 +210,29 @@ mozconfig_init() {
 		--with-system-jpeg \
 		--with-system-zlib \
 		--enable-pango \
-		--enable-svg \
 		--enable-system-cairo
-		# Requires libpng with apng support
-		#--with-system-png \
+		if ! $(mozversion_is_new_enough) ; then
+			mozconfig annotate system-libs --enable-svg
+		fi
 
 	mozconfig_annotate disable_update_strip \
 		--disable-installer \
 		--disable-pedantic \
 		--disable-updater \
 		--disable-strip \
-		--disable-strip-libs \
 		--disable-install-strip
-
-
+		if ! $(mozversion_is_new_enough) ; then
+			mozconfig_annotate disable_update_strip --disable-strip-libs
+		fi
 
 	if [[ ${PN} != seamonkey ]]; then
 		mozconfig_annotate basic_profile \
-			--enable-single-profile \
-			--disable-profilesharing \
 			--disable-profilelocking
+			if ! $(mozversion_is_new_enough) ; then
+				mozconfig_annotate basic_profile \
+					--enable-single-profile \
+					--disable-profilesharing
+			fi
 	fi
 
 	# Here is a strange one...
@@ -279,3 +279,4 @@ mozconfig_final() {
 	sed -i '/^ac_add_options --enable-extensions/d' .mozconfig
 	echo "ac_add_options --enable-extensions=${exts// /,}" >> .mozconfig
 }
+