--- /usr/portage/www-client/mozilla-firefox/mozilla-firefox-2.0_rc3.ebuild	2006-10-18 09:06:22.000000000 -0500
+++ mozilla-firefox-2.0.ebuild	2006-10-23 22:34:47.026542192 -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,13 @@
 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
+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"
 
 # 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
@@ -50,6 +47,8 @@
 DEPEND="${RDEPEND}
 	java? ( >=dev-java/java-config-0.2.0 )"
 
+PDEPEND="!javascript? ( x11-plugins/noscript )"
+
 S="${WORKDIR}/mozilla"
 
 linguas() {