--- /usr/portage/www-client/mozilla-firefox/mozilla-firefox-2.0_rc3.ebuild	2006-10-18 09:06:22.000000000 -0500
+++ /home/gentoo/www-client/mozilla-firefox/mozilla-firefox-2.0.ebuild	2006-10-23 19:46:18.729494360 -0500
@@ -4,12 +4,9 @@
 
 inherit flag-o-matic toolchain-funcs eutils mozconfig-2 mozilla-launcher makeedit multilib fdo-mime mozextension autotools
 
-PATCH="mozilla-firefox-2.0_rc1-patches-1.4"
-LANGS="ar be bg ca cs da de el en-GB es-AR es-ES eu fi fr fy-NL ga-IE gu-IN hu
-it ja ko lt mk mn nb-NO nl nn-NO pa-IN pl pt-BR pt-PT ru sk sl sv-SE tr zh-CN
-zh-TW"
+PATCH="${PN}-2.0_rc1-patches-1.4"
+LANGS="ar bg ca cs da de el en-GB es-AR es-ES eu fi fr fy-NL ga-IE gu-IN hu it ja ko lt mk mn nb-NO nl nn-NO pl pt-BR pt-PT ru sk sl sv-SE tr zh-CN zh-TW"
 NOSHORTLANGS="en-GB es-AR pt-BR zh-TW"
-MY_PV=${PV/_}
 
 DESCRIPTION="Firefox Web Browser"
 HOMEPAGE="http://www.mozilla.org/projects/firefox/"
@@ -19,13 +16,14 @@
 LICENSE="MPL-1.1 NPL-1.1"
 IUSE="java mozdevelop branding xforms"
 
-MOZ_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${MY_PV}"
-SRC_URI="${MOZ_URI}/source/firefox-${MY_PV}-source.tar.bz2
-	http://gentooexperimental.org/~genstef/dist/${PATCH}.tar.bz2"
+MOZ_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PV}"
+SRC_URI="${MOZ_URI}/source/firefox-${PV}-source.tar.bz2
+	http://gentooexperimental.org/~genstef/dist/${PATCH}.tar.bz2
+	http://releases.mozilla.org/pub/mozilla.org/extensions/noscript/noscript-1.1.4.5-fx+fl+mz+zm.xpi"
 
 # These are in
 #
-#  http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${MY_PV}/linux-i686/xpi/
+#  http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/linux-i686/xpi/
 #
 # for i in $LANGS $SHORTLANGS; do wget $i.xpi -O ${P}-$i.xpi; done
 for X in ${LANGS} ; do
@@ -193,6 +191,7 @@
 
 src_install() {
 	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	declare emid
 
 	# Most of the installation happens here
 	dodir "${MOZILLA_FIVE_HOME}"
@@ -212,6 +211,15 @@
 			die "sed failed to change locale"
 	fi
 
+	# Install the no-script plugin
+	cd ${T}
+	unzip ${DISTDIR}/noscript-1.1.4.5-fx+fl+mz+zm.xpi install.rdf
+	emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
+
+	dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
+	cd ${D}${MOZILLA_FIVE_HOME}/extensions/${emid}
+	unzip ${DISTDIR}/noscript-1.1.4.5-fx+fl+mz+zm.xpi install.rdf
+
 	# Create /usr/bin/firefox
 	install_mozilla_launcher_stub firefox "${MOZILLA_FIVE_HOME}"
 
@@ -264,6 +272,10 @@
 	elog "is the case, please search at http://bugs.gentoo.org and open a new bug"
 	elog "if one does not exist. Before filing any bugs, please move or remove ~/.mozilla"
 	elog "and test with a clean profile directory."
+
+	elog "We are now shipping firefox with noscript. All javascript is block by default due"
+	elog "to security issues, You are still able to enable java script via plugin if you believe"
+	elog "the site your visiting is safe."
 }
 
 pkg_postrm() {