Use mozconfig_final to resolve --enable-extensions to a single option

8 files changed, 24 insertions, 12 deletions

diff --git a/net-www/mozilla-firefox/ChangeLog b/net-www/mozilla-firefox/ChangeLog
index a65976547b8a..bf2a956d7b8e 100644
--- a/net-www/mozilla-firefox/ChangeLog
+++ b/net-www/mozilla-firefox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/mozilla-firefox
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox/ChangeLog,v 1.77 2004/11/13 23:27:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox/ChangeLog,v 1.78 2004/11/14 03:27:04 agriffis Exp $
+
+*mozilla-firefox-1.0-r2 (13 Nov 2004)
+
+  13 Nov 2004; Aron Griffis <agriffis@gentoo.org>
+  -mozilla-firefox-1.0-r1.ebuild, +mozilla-firefox-1.0-r2.ebuild:
+  Use mozconfig_final to resolve --enable-extensions to a single option
 
 *mozilla-firefox-1.0-r1 (13 Nov 2004)
 
diff --git a/net-www/mozilla-firefox/Manifest b/net-www/mozilla-firefox/Manifest
index a72629800a89..bfc8a4e8fb4d 100644
--- a/net-www/mozilla-firefox/Manifest
+++ b/net-www/mozilla-firefox/Manifest
@@ -5,7 +5,7 @@ MD5 6c89295fc5264c6798ee06f9e2f5c936 mozilla-firefox-1.0_rc2.ebuild 5066
 MD5 1886b4b2093f8116f5f8639402dc8df1 mozilla-firefox-1.0.ebuild 5060
 MD5 c543ce361b2035afbb9db4010f9f776e mozilla-firefox-0.9.3.ebuild 8425
 MD5 faaa52e819364f34c1b174f0c47a6d86 mozilla-firefox-1.0_pre-r2.ebuild 5073
-MD5 06c49d9cefa1602e21c0d9ea468b1e63 mozilla-firefox-1.0-r1.ebuild 5332
+MD5 06c49d9cefa1602e21c0d9ea468b1e63 mozilla-firefox-1.0-r2.ebuild 5332
 MD5 606e82226379fd5ae6cd1d0d1faff7ff files/10MozillaFirefox 31
 MD5 fa885b490a3c76594784843a1c06ee3a files/digest-mozilla-firefox-1.0_rc1 76
 MD5 e5cc0a5838a73f3fdaf38f4e3c368c26 files/digest-mozilla-firefox-1.0_rc2 76
@@ -15,7 +15,7 @@ MD5 3ad7410bd680964096c84eee3fa21abf files/firefox-0.8-gcc-3.4.patch 460
 MD5 23d1fbd03cc6dd346a4e4ce8f2d88ebf files/mozilla-1.3-alpha-stubs.patch 4646
 MD5 f0e9adeb0454377ce019e8969e644efb files/mozilla-firebird-amd64.patch 35052
 MD5 88371b8f812caf799a1ede2b1b07c079 files/mozilla-firefox-mousebuttons.patch 17099
-MD5 47c899122e30bc898b5a899ed0e10129 files/digest-mozilla-firefox-1.0-r1 73
+MD5 47c899122e30bc898b5a899ed0e10129 files/digest-mozilla-firefox-1.0-r2 73
 MD5 48baf2f328e6478812c24e59037ff99c files/firefox-0.9-init.tar.bz2 3322
 MD5 c6308c086c87ed2e1e4f3d136efdd770 files/firefox-0.9-nsFormHistory-crash-fix.patch 1755
 MD5 0c7804fd13815f9a0e7a1ef0eab6a871 files/digest-mozilla-firefox-0.9.3 75
diff --git a/net-www/mozilla-firefox/files/digest-mozilla-firefox-1.0-r1 b/net-www/mozilla-firefox/files/digest-mozilla-firefox-1.0-r2
index e6d2584b2eac..e6d2584b2eac 100644
--- a/net-www/mozilla-firefox/files/digest-mozilla-firefox-1.0-r1
+++ b/net-www/mozilla-firefox/files/digest-mozilla-firefox-1.0-r2
diff --git a/net-www/mozilla-firefox/mozilla-firefox-1.0-r1.ebuild b/net-www/mozilla-firefox/mozilla-firefox-1.0-r2.ebuild
index a77dd409c44e..c0e00de229b4 100644
--- a/net-www/mozilla-firefox/mozilla-firefox-1.0-r1.ebuild
+++ b/net-www/mozilla-firefox/mozilla-firefox-1.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox/mozilla-firefox-1.0-r1.ebuild,v 1.1 2004/11/13 23:27:14 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox/mozilla-firefox-1.0-r2.ebuild,v 1.1 2004/11/14 03:27:04 agriffis Exp $
 
 inherit makeedit flag-o-matic gcc nsplugins eutils mozconfig mozilla-launcher
 
@@ -71,8 +71,8 @@ src_compile() {
 	mozconfig_use_extension gnome gnomevfs
 	mozconfig_annotate '' --with-default-mozilla-five-home=/usr/lib/MozillaFirefox
 
-	# Report settings
-	mozconfig_explain
+	# Finalize and report settings
+	mozconfig_final
 
 	# hardened GCC uses -fstack-protector-all by default, and this breaks
 	# firefox.
diff --git a/net-www/mozilla/ChangeLog b/net-www/mozilla/ChangeLog
index 6583f76189d6..c31b4975cc8f 100644
--- a/net-www/mozilla/ChangeLog
+++ b/net-www/mozilla/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/mozilla
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.206 2004/11/13 23:29:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.207 2004/11/14 03:29:50 agriffis Exp $
+
+*mozilla-1.7.3-r2 (13 Nov 2004)
+
+  13 Nov 2004; Aron Griffis <agriffis@gentoo.org> -mozilla-1.7.3-r1.ebuild,
+  +mozilla-1.7.3-r2.ebuild:
+  Use mozconfig_final to resolve --enable-extensions to a single option
 
 *mozilla-1.7.3-r1 (13 Nov 2004)
 
diff --git a/net-www/mozilla/Manifest b/net-www/mozilla/Manifest
index 527e4940ea34..bac8a97c731e 100644
--- a/net-www/mozilla/Manifest
+++ b/net-www/mozilla/Manifest
@@ -3,9 +3,9 @@ MD5 9cf506f1bd70203ac5ceb7c29120b7d3 ChangeLog 35158
 MD5 7c90e1ccb807e874f4bfa5796d3c513d mozilla-1.6-r1.ebuild 16979
 MD5 21fbce86f739b098e11b5225b58f452d mozilla-1.7-r1.ebuild 16620
 MD5 aa7166da0319e88d9ad909403631ab70 mozilla-1.7.2-r1.ebuild 8874
-MD5 fe197a7b5151fd692a8e12f1bf8e0ee9 mozilla-1.7.3-r1.ebuild 9950
 MD5 f4b18993ea4e902777640a7afe26b4de mozilla-1.7.3.ebuild 8822
 MD5 9320e2015bdfdecec9c9bcd3a6f65cfb mozilla-1.7.ebuild 16477
+MD5 fe197a7b5151fd692a8e12f1bf8e0ee9 mozilla-1.7.3-r2.ebuild 9950
 MD5 b99dabe3c40cfafe2e63bdef95815596 files/10mozilla 105
 MD5 11cae063228d9997b2cf9f150d9837fe files/digest-mozilla-1.6-r1 201
 MD5 c3b63fbbf42894e19fff553092660af6 files/digest-mozilla-1.7-r1 204
@@ -28,7 +28,7 @@ MD5 7d244b888dbd302c14414cbfc1f62501 files/xft.js 135
 MD5 c3b63fbbf42894e19fff553092660af6 files/digest-mozilla-1.7 204
 MD5 a5fb876c8ca4e8dbd0208db31897f39d files/ipc-1.0.7-nsPipeChannel.patch 445
 MD5 a56a4dca744d428bef57871c21c54be7 files/digest-mozilla-1.7.3 281
-MD5 a56a4dca744d428bef57871c21c54be7 files/digest-mozilla-1.7.3-r1 281
+MD5 a56a4dca744d428bef57871c21c54be7 files/digest-mozilla-1.7.3-r2 281
 MD5 8803e1d528f2f49a3f3fa98ba14d9ff0 files/1.2/mozilla-1.2-branch-update.patch.bz2 8240
 MD5 83da5242120c74b0ca6cceae9d6cf237 files/1.2/mozilla-1.2-cutnpaste-limit-fix.patch.bz2 2838
 MD5 4877db25d49b916e55a5d11238c63d8c files/1.2/mozilla-1.2-image-reload-memleak.patch 1489
diff --git a/net-www/mozilla/files/digest-mozilla-1.7.3-r1 b/net-www/mozilla/files/digest-mozilla-1.7.3-r2
index ee9991bbd682..ee9991bbd682 100644
--- a/net-www/mozilla/files/digest-mozilla-1.7.3-r1
+++ b/net-www/mozilla/files/digest-mozilla-1.7.3-r2
diff --git a/net-www/mozilla/mozilla-1.7.3-r1.ebuild b/net-www/mozilla/mozilla-1.7.3-r2.ebuild
index f32a5653d632..bebc27a08ba6 100644
--- a/net-www/mozilla/mozilla-1.7.3-r1.ebuild
+++ b/net-www/mozilla/mozilla-1.7.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7.3-r1.ebuild,v 1.1 2004/11/13 23:29:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7.3-r2.ebuild,v 1.1 2004/11/14 03:29:50 agriffis Exp $
 
 unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
 inherit flag-o-matic gcc eutils nsplugins mozilla-launcher mozconfig makeedit
@@ -114,8 +114,8 @@ src_compile() {
 		mozconfig_annotate "-mozsvg" --disable-svg
 	fi
 
-	# Report settings
-	mozconfig_explain
+	# Finalize and report settings
+	mozconfig_final
 
 	####################################
 	#