bug #147107 thanks Nick Hofstede for the heads up on xform plugin support

Package-Manager: portage-2.1.2_pre3-r2

3 files changed, 21 insertions, 12 deletions

diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog
index ac5ca00bae5d..ffc0ac95c4bf 100644
--- a/www-client/mozilla-firefox/ChangeLog
+++ b/www-client/mozilla-firefox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/mozilla-firefox
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.196 2006/10/16 21:15:16 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.197 2006/10/16 21:34:33 genstef Exp $
+
+  16 Oct 2006; Stefan Schweizer <genstef@gentoo.org>
+  mozilla-firefox-2.0_rc2.ebuild:
+  bug #147107 thanks Nick Hofstede for the heads up on xform plugin support
 
   16 Oct 2006; Stefan Schweizer <genstef@gentoo.org>
   mozilla-firefox-2.0_rc2.ebuild:
diff --git a/www-client/mozilla-firefox/Manifest b/www-client/mozilla-firefox/Manifest
index e0b09c4bb180..9f85c4dff23f 100644
--- a/www-client/mozilla-firefox/Manifest
+++ b/www-client/mozilla-firefox/Manifest
@@ -162,14 +162,14 @@ EBUILD mozilla-firefox-1.5.0.7.ebuild 9530 RMD160 682a824c87c1fa3885795e29de7e6c
 MD5 009921ccc2d07dc7b680334d52b5a547 mozilla-firefox-1.5.0.7.ebuild 9530
 RMD160 682a824c87c1fa3885795e29de7e6cd4f125d3b1 mozilla-firefox-1.5.0.7.ebuild 9530
 SHA256 c3d98ad2848ad054155b8261d839336cdc21771886f04c09decbad6832b8e019 mozilla-firefox-1.5.0.7.ebuild 9530
-EBUILD mozilla-firefox-2.0_rc2.ebuild 8368 RMD160 d50c989546e3e8ccbc2659b7ef3d626b9bfa148f SHA1 9952d350416d3a9d1694f2f8154620ad18360515 SHA256 df7b4515fa10f9a88a0e412eaa1fbe2ffad01678b06a043c836987f649d56cfc
-MD5 da6d0b2efbdb9daf16e063875618c13e mozilla-firefox-2.0_rc2.ebuild 8368
-RMD160 d50c989546e3e8ccbc2659b7ef3d626b9bfa148f mozilla-firefox-2.0_rc2.ebuild 8368
-SHA256 df7b4515fa10f9a88a0e412eaa1fbe2ffad01678b06a043c836987f649d56cfc mozilla-firefox-2.0_rc2.ebuild 8368
-MISC ChangeLog 52066 RMD160 ec0c2a05e21cf405d09fc83711db0a7d07bb4e39 SHA1 61be5cc312c8dcb9a10ce264f695e35dc70270f1 SHA256 bf0f9602d93f3cf6e61b2883bd3b998e4eafba432454d17652557ccc6756569b
-MD5 6f3f4eea97352b040438bbe661143872 ChangeLog 52066
-RMD160 ec0c2a05e21cf405d09fc83711db0a7d07bb4e39 ChangeLog 52066
-SHA256 bf0f9602d93f3cf6e61b2883bd3b998e4eafba432454d17652557ccc6756569b ChangeLog 52066
+EBUILD mozilla-firefox-2.0_rc2.ebuild 8503 RMD160 b28899699b934afa671fbc8cb5fb67d7c476bb0e SHA1 43cb32620aa806cfc224f13f0f4b66b82653e7b5 SHA256 3503b1646c167b99fc87d0418545a4761ebfe8fafc98f28cf04d5801d67c6c74
+MD5 1f8a80b9754617aa9c005160d4db0667 mozilla-firefox-2.0_rc2.ebuild 8503
+RMD160 b28899699b934afa671fbc8cb5fb67d7c476bb0e mozilla-firefox-2.0_rc2.ebuild 8503
+SHA256 3503b1646c167b99fc87d0418545a4761ebfe8fafc98f28cf04d5801d67c6c74 mozilla-firefox-2.0_rc2.ebuild 8503
+MISC ChangeLog 52230 RMD160 ce276bc9f35b2b828987daecea1f5489aaba1a22 SHA1 f4e530201cd126fb7688d2a7bdef7832a98c4fed SHA256 23b46f88e9343267fac752b711c09e9b2843fd8313336e46f365137d80b9b7c0
+MD5 2cee57a2479644099c718852924db05b ChangeLog 52230
+RMD160 ce276bc9f35b2b828987daecea1f5489aaba1a22 ChangeLog 52230
+SHA256 23b46f88e9343267fac752b711c09e9b2843fd8313336e46f365137d80b9b7c0 ChangeLog 52230
 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 metadata.xml 160
diff --git a/www-client/mozilla-firefox/mozilla-firefox-2.0_rc2.ebuild b/www-client/mozilla-firefox/mozilla-firefox-2.0_rc2.ebuild
index 8c588e8c4408..4ffe172fcdac 100644
--- a/www-client/mozilla-firefox/mozilla-firefox-2.0_rc2.ebuild
+++ b/www-client/mozilla-firefox/mozilla-firefox-2.0_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-2.0_rc2.ebuild,v 1.8 2006/10/16 21:15:16 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-2.0_rc2.ebuild,v 1.9 2006/10/16 21:34:33 genstef Exp $
 
 inherit flag-o-matic toolchain-funcs eutils mozconfig-2 mozilla-launcher makeedit multilib fdo-mime mozextension autotools
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.mozilla.org/projects/firefox/"
 KEYWORDS="~alpha ~amd64 ~sparc ~x86"
 SLOT="0"
 LICENSE="MPL-1.1 NPL-1.1"
-IUSE="java mozdevelop branding"
+IUSE="java mozdevelop branding xform"
 
 MOZ_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${MY_PV}"
 SRC_URI="${MOZ_URI}/source/firefox-${MY_PV}-source.tar.bz2
@@ -115,12 +115,17 @@ src_compile() {
 	mozconfig_config
 
 	mozconfig_annotate '' --enable-application=browser
-	mozconfig_annotate '' --enable-extensions=default,typeaheadfind
 	mozconfig_annotate '' --enable-image-encoder=all
 	mozconfig_annotate '' --enable-canvas
 	mozconfig_annotate '' --with-system-nspr
 	mozconfig_annotate '' --with-system-nss
 
+	if use xform; then
+		mozconfig_annotate '' --enable-extensions=default,xforms,schema-validatalidation,typeaheadfind
+	else
+		mozconfig_annotate '' --enable-extensions=default,typeaheadfind
+	fi
+
 	if use branding; then
 		mozconfig_annotate '' --enable-official-branding
 	fi