Make it PDEPEND on noscript with an USE-flag, bug 179098

Package-Manager: portage-2.1.2.9

3 files changed, 19 insertions, 13 deletions

diff --git a/www-client/mozilla-firefox-bin/ChangeLog b/www-client/mozilla-firefox-bin/ChangeLog
index a2addc93ddef..63804f5c5337 100644
--- a/www-client/mozilla-firefox-bin/ChangeLog
+++ b/www-client/mozilla-firefox-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/mozilla-firefox-bin
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/ChangeLog,v 1.88 2007/06/08 13:46:48 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/ChangeLog,v 1.89 2007/06/13 12:23:09 armin76 Exp $
+
+  13 Jun 2007; Raúl Porcel <armin76@gentoo.org>
+  mozilla-firefox-bin-2.0.0.4.ebuild:
+  Make it PDEPEND on noscript with an USE-flag, bug 179098
 
   08 Jun 2007; Raúl Porcel <armin76@gentoo.org>
   mozilla-firefox-bin-2.0.0.4.ebuild:
diff --git a/www-client/mozilla-firefox-bin/Manifest b/www-client/mozilla-firefox-bin/Manifest
index b5c4def0c664..e66712995ab6 100644
--- a/www-client/mozilla-firefox-bin/Manifest
+++ b/www-client/mozilla-firefox-bin/Manifest
@@ -58,14 +58,14 @@ DIST mozilla-firefox-2.0.0.4-sv-SE.xpi 165892 RMD160 77c4e78d40a1bbf63a972e844fb
 DIST mozilla-firefox-2.0.0.4-tr.xpi 148656 RMD160 02a26de5b657048b7296eabf99c5b92247468c7b SHA1 5488b823320d18ab8458425b7430b00523801034 SHA256 1237a7ef8c0edb68bcd0f2f2741ac9454d88da90775cd7c44d70bdd1b645b735
 DIST mozilla-firefox-2.0.0.4-zh-CN.xpi 139265 RMD160 87ca046501204c2c3bf5927605a5d0ac6b89b07b SHA1 68b6dd0becd0f10dd1f356d8793dcfe22ece2b32 SHA256 5cde19b36442d1b8a84ea8a1159901ccba4d56623e5bb03d5ee86653d1faee2b
 DIST mozilla-firefox-2.0.0.4-zh-TW.xpi 141994 RMD160 bc8d9427d75d496af03cfefbe96f8b0e014f6b20 SHA1 270d3fbae8b492c8fba3ea1506acf970e78138f3 SHA256 ec5ecefded81d44a5ad56242cd059ebdeefce476e584764f75958f37eb8d0a95
-EBUILD mozilla-firefox-bin-2.0.0.4.ebuild 4185 RMD160 9366e4e9a6b1721cffc8f0ca0c3b42de8db02be7 SHA1 75be188fa503d4ab26a1cb9d52a589da8e87f86d SHA256 50ba6707bfbd74c813305ea2085660d81039240fb5622d24d9f2c1a7b06e63cf
-MD5 dbff31b61b7cf470ec30dc569714dc99 mozilla-firefox-bin-2.0.0.4.ebuild 4185
-RMD160 9366e4e9a6b1721cffc8f0ca0c3b42de8db02be7 mozilla-firefox-bin-2.0.0.4.ebuild 4185
-SHA256 50ba6707bfbd74c813305ea2085660d81039240fb5622d24d9f2c1a7b06e63cf mozilla-firefox-bin-2.0.0.4.ebuild 4185
-MISC ChangeLog 20061 RMD160 49567c42d0ad82a73c327d91a6e6247190bcf7a8 SHA1 6df292e6e93d54e203f5e03bc9c2b61450f8ecfe SHA256 cdd44b15af03976ce128a3a07d0b0800655ac60fe595dd77387177cc080467d7
-MD5 22f0830d550f729749cfab83f789389c ChangeLog 20061
-RMD160 49567c42d0ad82a73c327d91a6e6247190bcf7a8 ChangeLog 20061
-SHA256 cdd44b15af03976ce128a3a07d0b0800655ac60fe595dd77387177cc080467d7 ChangeLog 20061
+EBUILD mozilla-firefox-bin-2.0.0.4.ebuild 4262 RMD160 c1d54ebc94d55d1813a5853a28ab82e7675c54ea SHA1 994d5244041bb4088b5fab23f0894b619ed3b689 SHA256 53b6c706c473c764af69f6f2dbfbeaac458bb62efc4a2d55bca89dd471617929
+MD5 d1e2fc69404e14d8ac5a1af1be1dc2da mozilla-firefox-bin-2.0.0.4.ebuild 4262
+RMD160 c1d54ebc94d55d1813a5853a28ab82e7675c54ea mozilla-firefox-bin-2.0.0.4.ebuild 4262
+SHA256 53b6c706c473c764af69f6f2dbfbeaac458bb62efc4a2d55bca89dd471617929 mozilla-firefox-bin-2.0.0.4.ebuild 4262
+MISC ChangeLog 20208 RMD160 c84a3652ad78f5a93f0986bb81a205cdc33eb513 SHA1 684e15e19f8161b5844a9abbea768ae0f29c6ffa SHA256 5614e55f8c1abd11013d96392dc398ab8db4933015edcb5092fbfe54c28aa041
+MD5 1a48c78e56193e51515da40a766bb386 ChangeLog 20208
+RMD160 c84a3652ad78f5a93f0986bb81a205cdc33eb513 ChangeLog 20208
+SHA256 5614e55f8c1abd11013d96392dc398ab8db4933015edcb5092fbfe54c28aa041 ChangeLog 20208
 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 metadata.xml 160
diff --git a/www-client/mozilla-firefox-bin/mozilla-firefox-bin-2.0.0.4.ebuild b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-2.0.0.4.ebuild
index b2558ba1b9e1..cdad90d52f8d 100644
--- a/www-client/mozilla-firefox-bin/mozilla-firefox-bin-2.0.0.4.ebuild
+++ b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-2.0.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/mozilla-firefox-bin-2.0.0.4.ebuild,v 1.6 2007/06/08 13:51:41 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/mozilla-firefox-bin-2.0.0.4.ebuild,v 1.7 2007/06/13 12:23:09 armin76 Exp $
 
 inherit eutils mozilla-launcher multilib mozextension
 
@@ -15,7 +15,7 @@ RESTRICT="nostrip"
 KEYWORDS="-* amd64 x86"
 SLOT="0"
 LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
-IUSE=""
+IUSE="restrict-javascript"
 
 for X in ${LANGS} ; do
 	SRC_URI="${SRC_URI}
@@ -44,7 +44,9 @@ RDEPEND="x11-libs/libXrender
 	)
 	>=www-client/mozilla-launcher-1.41"
 
-S=${WORKDIR}/firefox
+PDEPEND="restrict-javascript? ( x11-plugins/noscript )"
+
+S="${WORKDIR}/firefox"
 
 pkg_setup() {
 	# This is a binary x86 package => ABI=x86
@@ -145,4 +147,4 @@ pkg_postinst() {
 
 pkg_postrm() {
 	update_mozilla_launcher_symlinks
-}
+}
\ No newline at end of file