From: Mounir Lamouri <volkmar@gentoo.org>
Date: Sun, 18 Apr 2010 19:04:45 +0000 (+0000)
Subject: Removing noscript dep (bug 315999) and restrict-javascript USE flag.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b1917f79c8e2ff93e5a4c1c14ac324d75963de28;p=gentoo.git

Removing noscript dep (bug 315999) and restrict-javascript USE flag.
Package-Manager: portage-15511-svn/cvs/Linux i686
---

diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog
index 184834e16e05..a26131380f71 100644
--- a/www-client/mozilla-firefox/ChangeLog
+++ b/www-client/mozilla-firefox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/mozilla-firefox
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.609 2010/04/18 16:05:46 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.610 2010/04/18 19:04:45 volkmar Exp $
+
+  18 Apr 2010; Mounir Lamouri <volkmar@gentoo.org>
+  mozilla-firefox-2.0.0.19.ebuild, metadata.xml:
+  Removing noscript dep (bug 315999) and restrict-javascript USE flag.
 
   18 Apr 2010; <anarchy@gentoo.org> mozilla-firefox-3.6.3.ebuild:
   make use of epatch_user
diff --git a/www-client/mozilla-firefox/metadata.xml b/www-client/mozilla-firefox/metadata.xml
index a27997431b2e..9349fc50a0aa 100644
--- a/www-client/mozilla-firefox/metadata.xml
+++ b/www-client/mozilla-firefox/metadata.xml
@@ -11,9 +11,6 @@
 		Venkman)</flag>
 	<flag name='moznopango'>Disable <pkg>x11-libs/pango</pkg> during
 		runtime</flag>
-	<flag name='restrict-javascript'>Pull in <pkg>www-plugins/noscript</pkg>
-		extension to disable javascript globally, putting the user fully in
-		control of the sites he/she visits</flag>
 	<flag name='system-sqlite'>Use the system-wide <pkg>dev-db/sqlite</pkg>
 		installation with secure-delete enabled</flag>
 	<flag name='xforms'>XForms is a standard to split up XHTML into XForms,
diff --git a/www-client/mozilla-firefox/mozilla-firefox-2.0.0.19.ebuild b/www-client/mozilla-firefox/mozilla-firefox-2.0.0.19.ebuild
index 74aa60627813..ed318edccd41 100644
--- a/www-client/mozilla-firefox/mozilla-firefox-2.0.0.19.ebuild
+++ b/www-client/mozilla-firefox/mozilla-firefox-2.0.0.19.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.0.19.ebuild,v 1.9 2009/07/21 15:11:05 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-2.0.0.19.ebuild,v 1.10 2010/04/18 19:04:45 volkmar Exp $
 
 WANT_AUTOCONF="2.1"
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.mozilla.com/firefox"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 SLOT="0"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="java mozdevelop bindist xforms restrict-javascript filepicker iceweasel"
+IUSE="java mozdevelop bindist xforms filepicker iceweasel"
 
 MOZ_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PV}"
 SRC_URI="${MOZ_URI}/source/firefox-${PV}-source.tar.bz2
@@ -53,8 +53,6 @@ RDEPEND="java? ( virtual/jre )
 DEPEND="${RDEPEND}
 	java? ( >=dev-java/java-config-0.2.0 )"
 
-PDEPEND="restrict-javascript? ( www-plugins/noscript )"
-
 S="${WORKDIR}/mozilla"
 
 # Needed by src_compile() and src_install().