Removing noscript dep (bug 315999) and restrict-javascript USE flag.

(Portage version: 15511-svn/cvs/Linux i686)

7 files changed, 16 insertions, 26 deletions

diff --git a/www-client/firefox-bin/ChangeLog b/www-client/firefox-bin/ChangeLog
index 2711a7d8c8be..3bddba144f4a 100644
--- a/www-client/firefox-bin/ChangeLog
+++ b/www-client/firefox-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/firefox-bin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v 1.12 2010/04/05 05:18:46 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v 1.13 2010/04/18 18:59:44 volkmar Exp $
+
+  18 Apr 2010; Mounir Lamouri <volkmar@gentoo.org> firefox-bin-3.5.6.ebuild,
+  firefox-bin-3.5.8.ebuild, firefox-bin-3.6-r1.ebuild,
+  firefox-bin-3.6.2.ebuild, firefox-bin-3.6.3.ebuild, metadata.xml:
+  Removing noscript dep (bug 315999) and restrict-javascript USE flag.
 
 *firefox-bin-3.6.3 (05 Apr 2010)
 
diff --git a/www-client/firefox-bin/firefox-bin-3.5.6.ebuild b/www-client/firefox-bin/firefox-bin-3.5.6.ebuild
index 3403b11e1146..82e8b0e920b7 100644
--- a/www-client/firefox-bin/firefox-bin-3.5.6.ebuild
+++ b/www-client/firefox-bin/firefox-bin-3.5.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-3.5.6.ebuild,v 1.4 2010/01/03 21:16:10 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-3.5.6.ebuild,v 1.5 2010/04/18 18:59:44 volkmar Exp $
 EAPI="2"
 
 inherit eutils mozilla-launcher multilib mozextension
@@ -21,7 +21,7 @@ RESTRICT="strip mirror"
 KEYWORDS="-* amd64 x86"
 SLOT="0"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="restrict-javascript startup-notification"
+IUSE="startup-notification"
 
 for X in ${LANGS} ; do
 	if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
@@ -54,8 +54,6 @@ RDEPEND="dev-libs/dbus-glib
 		>=app-emulation/emul-linux-x86-soundlibs-20081109
 	)"
 
-PDEPEND="restrict-javascript? ( www-plugins/noscript )"
-
 S="${WORKDIR}/${MY_PN}"
 
 pkg_setup() {
diff --git a/www-client/firefox-bin/firefox-bin-3.5.8.ebuild b/www-client/firefox-bin/firefox-bin-3.5.8.ebuild
index cf81c01dd50f..cc2bb3fc17e4 100644
--- a/www-client/firefox-bin/firefox-bin-3.5.8.ebuild
+++ b/www-client/firefox-bin/firefox-bin-3.5.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-3.5.8.ebuild,v 1.3 2010/03/02 20:24:34 keytoaster Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-3.5.8.ebuild,v 1.4 2010/04/18 18:59:44 volkmar Exp $
 EAPI="2"
 
 inherit eutils mozilla-launcher multilib mozextension
@@ -21,7 +21,7 @@ RESTRICT="strip mirror"
 KEYWORDS="-* amd64 x86"
 SLOT="0"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="restrict-javascript startup-notification"
+IUSE="startup-notification"
 
 for X in ${LANGS} ; do
 	if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
@@ -54,8 +54,6 @@ RDEPEND="dev-libs/dbus-glib
 		>=app-emulation/emul-linux-x86-soundlibs-20081109
 	)"
 
-PDEPEND="restrict-javascript? ( www-plugins/noscript )"
-
 S="${WORKDIR}/${MY_PN}"
 
 pkg_setup() {
diff --git a/www-client/firefox-bin/firefox-bin-3.6-r1.ebuild b/www-client/firefox-bin/firefox-bin-3.6-r1.ebuild
index e0fc4eb88cca..155a264e8a63 100644
--- a/www-client/firefox-bin/firefox-bin-3.6-r1.ebuild
+++ b/www-client/firefox-bin/firefox-bin-3.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-3.6-r1.ebuild,v 1.1 2010/02/14 23:38:45 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-3.6-r1.ebuild,v 1.2 2010/04/18 18:59:44 volkmar Exp $
 EAPI="2"
 
 inherit eutils mozilla-launcher multilib mozextension
@@ -21,7 +21,7 @@ RESTRICT="strip mirror"
 KEYWORDS="-* ~amd64 ~x86"
 SLOT="0"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="restrict-javascript startup-notification"
+IUSE="startup-notification"
 
 for X in ${LANGS} ; do
 	if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
@@ -54,8 +54,6 @@ RDEPEND="dev-libs/dbus-glib
 		>=app-emulation/emul-linux-x86-soundlibs-20081109
 	)"
 
-PDEPEND="restrict-javascript? ( www-plugins/noscript )"
-
 S="${WORKDIR}/${MY_PN}"
 
 pkg_setup() {
diff --git a/www-client/firefox-bin/firefox-bin-3.6.2.ebuild b/www-client/firefox-bin/firefox-bin-3.6.2.ebuild
index 92e83b48e4da..ff1db62c70e2 100644
--- a/www-client/firefox-bin/firefox-bin-3.6.2.ebuild
+++ b/www-client/firefox-bin/firefox-bin-3.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-3.6.2.ebuild,v 1.1 2010/03/24 18:04:41 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-3.6.2.ebuild,v 1.2 2010/04/18 18:59:44 volkmar Exp $
 EAPI="2"
 
 inherit eutils mozilla-launcher multilib mozextension
@@ -21,7 +21,7 @@ RESTRICT="strip mirror"
 KEYWORDS="-* ~amd64 ~x86"
 SLOT="0"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="restrict-javascript startup-notification"
+IUSE="startup-notification"
 
 for X in ${LANGS} ; do
 	if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
@@ -54,8 +54,6 @@ RDEPEND="dev-libs/dbus-glib
 		>=app-emulation/emul-linux-x86-soundlibs-20081109
 	)"
 
-PDEPEND="restrict-javascript? ( www-plugins/noscript )"
-
 S="${WORKDIR}/${MY_PN}"
 
 pkg_setup() {
diff --git a/www-client/firefox-bin/firefox-bin-3.6.3.ebuild b/www-client/firefox-bin/firefox-bin-3.6.3.ebuild
index 6458177666e5..da210f7f0472 100644
--- a/www-client/firefox-bin/firefox-bin-3.6.3.ebuild
+++ b/www-client/firefox-bin/firefox-bin-3.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-3.6.3.ebuild,v 1.1 2010/04/05 05:18:46 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-3.6.3.ebuild,v 1.2 2010/04/18 18:59:44 volkmar Exp $
 EAPI="2"
 
 inherit eutils mozilla-launcher multilib mozextension
@@ -21,7 +21,7 @@ RESTRICT="strip mirror"
 KEYWORDS="-* ~amd64 ~x86"
 SLOT="0"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="restrict-javascript startup-notification"
+IUSE="startup-notification"
 
 for X in ${LANGS} ; do
 	if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
@@ -54,8 +54,6 @@ RDEPEND="dev-libs/dbus-glib
 		>=app-emulation/emul-linux-x86-soundlibs-20081109
 	)"
 
-PDEPEND="restrict-javascript? ( www-plugins/noscript )"
-
 S="${WORKDIR}/${MY_PN}"
 
 pkg_setup() {
diff --git a/www-client/firefox-bin/metadata.xml b/www-client/firefox-bin/metadata.xml
index e8048a96eee2..74d9257900cf 100644
--- a/www-client/firefox-bin/metadata.xml
+++ b/www-client/firefox-bin/metadata.xml
@@ -2,9 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>mozilla</herd>
-<use>
-	<flag name='restrict-javascript'>Pull in <pkg>x11-plugins/noscript</pkg>
-		extension to disable javascript globally, putting the user fully in
-		control of the sites he/she visits</flag>
-</use>
 </pkgmetadata>