Fix nss dep, remove EULA stuff

Package-Manager: portage-2.1.4.4

4 files changed, 12 insertions, 6 deletions

diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog
index 587a6db050b7..c2749924484c 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.412 2008/06/18 11:19:04 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.413 2008/06/18 15:04:48 armin76 Exp $
+
+  18 Jun 2008; Raúl Porcel <armin76@gentoo.org>
+  files/gentoo-default-prefs.js, mozilla-firefox-3.0.ebuild:
+  Fix nss dep, remove EULA stuff
 
   18 Jun 2008; Raúl Porcel <armin76@gentoo.org> mozilla-firefox-3.0.ebuild:
   Bump patchset to fix bug #228005
diff --git a/www-client/mozilla-firefox/Manifest b/www-client/mozilla-firefox/Manifest
index eec92f45f370..2edad5dafd87 100644
--- a/www-client/mozilla-firefox/Manifest
+++ b/www-client/mozilla-firefox/Manifest
@@ -1,5 +1,5 @@
 AUX firefox.1 2538 RMD160 4564007d7d5345e9ab09c941015e3cdb78913835 SHA1 8be1987451117820744ecc67fa411facdc653a12 SHA256 3483439a73c74b818bdde98c15223b6d3fcfe78e3ad974fb35f197cf3ad614e7
-AUX gentoo-default-prefs.js 565 RMD160 2cc248e9375e75d86d90cf4f5b4634b384df9aa6 SHA1 3adfdb6763fa340b87a0b0ddeb23c6aeca025d4c SHA256 12deb91fe8d41eaa27b45eec7b9a431025b262ea0a29f08f66253fb85dec6916
+AUX gentoo-default-prefs.js 668 RMD160 c4a66480679e74c9a6046aeabe4fd2b951ddf26f SHA1 e789e5d6a44536bc4d1ae58f1ed4196da78d4398 SHA256 64a6c621a4a4ac354507c4909d55b640fb17a72c81576294e89827e9d4eba6af
 AUX icon/iceweasel.desktop 251 RMD160 56a1e32c06c3bd460d15f5fc56d23293cffd62bd SHA1 51f9c9e098e2ce565569b220987b714ebed27e38 SHA256 04b952df4b80af25ea9cfb93fc992f921120c491f52640680e2b70b96ebc7dd7
 AUX icon/mozilla-firefox-1.5-unbranded.desktop 258 RMD160 32ebb016d6a4d3d2728c031f3b3762796e02f5d3 SHA1 69820d445d06b90d7ac35ffd39dad5926caa0862 SHA256 f2bf5c237a5c56b443c20fd16d3da429bf3b99e9fe27b661a1a462aa46ed25d3
 AUX icon/mozilla-firefox-1.5.desktop 255 RMD160 4ef1cf548f11057274620b82f0728958a3424bea SHA1 6a440f817072fb60516c1a1d999dffb6d3fa1583 SHA256 9bf6e1264d986c68d64831d166ed6b506bff6df8b56d21bfc166aee09cbc753f
@@ -149,6 +149,6 @@ DIST mozilla-firefox-3.0.tar.bz2 11530763 RMD160 1c814957d36b12414d45f8432b3dbe2
 DIST xulrunner-1.9.tar.bz2 34035285 RMD160 0cbc3e76c1ac43858375ab88610e5b68b2620d62 SHA1 091a1bf39c8b57b579fadb01c6377f357427cd90 SHA256 5a17a5e138fe5f3a39d6ad44eb9cba076360b7e1809e4b647c4ae4f316d8a2ee
 EBUILD mozilla-firefox-2.0.0.11.ebuild 9932 RMD160 fb61c475c0ceecc05b618f5e43d2e18ff38daef7 SHA1 f21f55d6dace4dc7e0f1f39624dd7996d766900b SHA256 52cb6783ddb30c4f0e9951d584b77e53797cfa23d80aaa059c1990ea53589b23
 EBUILD mozilla-firefox-2.0.0.14.ebuild 10393 RMD160 73fc1259fb9bdd0316d3daabf9903b5287ad23d8 SHA1 efc6ac8086a3f14d39d87e02b106ae7d5c9c5a42 SHA256 3d5586ab7e7c807253bb5086b26eda9334f5f8b1277e12f3316643bcd7585363
-EBUILD mozilla-firefox-3.0.ebuild 9741 RMD160 af20f87114316a63d0b5d78859c5ff69b43c1b7f SHA1 0880153a9eaa62fe6ea5d532e0c3276a50b1e5e4 SHA256 2962c7287387b3c9f06a2804138eaaf53b3b03ee22a923a9c11ffdd1a0608ad8
-MISC ChangeLog 83973 RMD160 792629bed3e6f3f9c7f46788885f95f5e7ee9707 SHA1 357f32c167c3ed7351a083e2d55813c84b725e41 SHA256 86fc6c22fdc4f022decbf43ce10be669b97ef9078292d4747cf5244eb4958837
+EBUILD mozilla-firefox-3.0.ebuild 9737 RMD160 add62be5f35d828b092ed83731df562297f33586 SHA1 fe3aa92107f536aea6e846e7b45a1c09da26d1d7 SHA256 c4097874086360544441fb7cf0558cb10318867339cba20834c2e7baf643142e
+MISC ChangeLog 84117 RMD160 5e4899aa0e6f1db4134185cb181598b4b849d1dd SHA1 6c30f7f39621d9ae9d6401a42a737e746fbaa15b SHA256 3467ea4690fccfa074d6d3e56c8f9b30a819a659e532077cedd8ec21a3f9e91b
 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
diff --git a/www-client/mozilla-firefox/files/gentoo-default-prefs.js b/www-client/mozilla-firefox/files/gentoo-default-prefs.js
index 0a678e5ec90f..3cea6d5a5473 100644
--- a/www-client/mozilla-firefox/files/gentoo-default-prefs.js
+++ b/www-client/mozilla-firefox/files/gentoo-default-prefs.js
@@ -9,3 +9,5 @@ pref("browser.backspace_action",           0);
 pref("browser.urlbar.hideGoButton",        true);
 pref("accessibility.typeaheadfind",        true);
 pref("browser.startup.homepage",           "http://www.gentoo.org/");
+pref("browser.shell.checkDefaultBrowser",  false); 
+pref("browser.EULA.override",              true); 
diff --git a/www-client/mozilla-firefox/mozilla-firefox-3.0.ebuild b/www-client/mozilla-firefox/mozilla-firefox-3.0.ebuild
index 004d94cbd144..3b7784e5b42c 100644
--- a/www-client/mozilla-firefox/mozilla-firefox-3.0.ebuild
+++ b/www-client/mozilla-firefox/mozilla-firefox-3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-3.0.ebuild,v 1.3 2008/06/18 11:19:04 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-3.0.ebuild,v 1.4 2008/06/18 15:04:48 armin76 Exp $
 EAPI="1"
 WANT_AUTOCONF="2.1"
 
@@ -48,7 +48,7 @@ done
 
 RDEPEND="java? ( virtual/jre )
 	>=sys-devel/binutils-2.16.1
-	>=dev-libs/nss-3.12_rc4
+	>=dev-libs/nss-3.12
 	>=dev-libs/nspr-4.7.1
 	>=media-libs/lcms-1.17
 	>=app-text/hunspell-1.1.9