--- mozilla-firefox-2.0.ebuild	2006-10-24 00:00:03.697689944 -0500
+++ mozilla-firefox-2.0.ebuild-new	2006-10-24 21:11:01.060808632 -0500
@@ -14,7 +14,7 @@
 KEYWORDS="~alpha ~amd64 ~sparc ~x86 ~ppc"
 SLOT="0"
 LICENSE="MPL-1.1 NPL-1.1"
-IUSE="java mozdevelop branding xforms javascript"
+IUSE="java mozdevelop mozbranding xforms restrict-javascript"
 
 MOZ_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PV}"
 SRC_URI="${MOZ_URI}/source/firefox-${PV}-source.tar.bz2
@@ -47,7 +47,7 @@
 DEPEND="${RDEPEND}
 	java? ( >=dev-java/java-config-0.2.0 )"
 
-PDEPEND="!javascript? ( x11-plugins/noscript )"
+PDEPEND="restrict-javascript? ( x11-plugins/noscript )"
 
 S="${WORKDIR}/mozilla"
 
@@ -75,7 +75,7 @@
 }
 
 pkg_setup(){
-	if use branding; then
+	if use mozbranding; then
 		einfo "You are enabling official branding. You may not redistribute this build"
 		einfo "to any users on your network or the internet. Doing so puts yourself into"
 		einfo "a legal problem with mozilla foundation"
@@ -131,7 +131,7 @@
 		mozconfig_annotate '' --enable-extensions=default,typeaheadfind
 	fi
 
-	if use branding; then
+	if use mozbranding; then
 		mozconfig_annotate '' --enable-official-branding
 	fi