add --without-system-nspr, so we can include -r10

(Portage version: 2.1_pre4-r1)

3 files changed, 53 insertions, 8 deletions

diff --git a/www-client/mozilla-firefox/Manifest b/www-client/mozilla-firefox/Manifest
index 163aea7dd5b9..12d8931a9276 100644
--- a/www-client/mozilla-firefox/Manifest
+++ b/www-client/mozilla-firefox/Manifest
@@ -13,9 +13,9 @@ SHA256 e5ca27ea35d528bd873f1dfe59b15d06cf8e34e1325ca0ccf5b73f7e0307040a files/10
 MD5 c24bf7e058e8e34c7c18e6ad016be1a0 files/digest-mozilla-firefox-1.0.7-r4 435
 RMD160 bd34b43f06a13099276489d5e6d9798312cbc072 files/digest-mozilla-firefox-1.0.7-r4 435
 SHA256 7069e4786ed5d664ec723035af870d4635777477680aca87fe4feb7243ef581d files/digest-mozilla-firefox-1.0.7-r4 435
-MD5 ac76975af36529e733d44f796335f228 files/digest-mozilla-firefox-1.5-r9 2523
-RMD160 ef9dabe7dcf2fb22a157e1752cb916af36381f95 files/digest-mozilla-firefox-1.5-r9 2523
-SHA256 b9c1744fb2e60beff947875206724a33d928309efb832ae63ec3931f79677450 files/digest-mozilla-firefox-1.5-r9 2523
+MD5 942724f965942ebb0b378944365971d0 files/digest-mozilla-firefox-1.5-r9 5797
+RMD160 8481d85385633ee60f4116635d6c5d1c117cfdfb files/digest-mozilla-firefox-1.5-r9 5797
+SHA256 30f2e95fb485ef6858d6390b8c921cd368c67a6e65b41a1f818dd4809f4c9e55 files/digest-mozilla-firefox-1.5-r9 5797
 MD5 6a7a2240dc5864e7f8ee444e34e84461 files/firefox.1 2538
 RMD160 4564007d7d5345e9ab09c941015e3cdb78913835 files/firefox.1 2538
 SHA256 3483439a73c74b818bdde98c15223b6d3fcfe78e3ad974fb35f197cf3ad614e7 files/firefox.1 2538
@@ -40,6 +40,6 @@ SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b metadata
 MD5 88a8a7b16c2a9376c68e91be09ea0ba5 mozilla-firefox-1.0.7-r4.ebuild 9847
 RMD160 539d5c3ce8b2d225fa8871fd2722b52506ab5eef mozilla-firefox-1.0.7-r4.ebuild 9847
 SHA256 6dd31547c54e7ddb6e0faca73242aa74a7405ee4c27124a3404fcbbd518536a2 mozilla-firefox-1.0.7-r4.ebuild 9847
-MD5 ffc4ca21c72191889c35cc4814c0eb8a mozilla-firefox-1.5-r9.ebuild 8356
-RMD160 22b7d69e59e34626a052e58699a8102965f82404 mozilla-firefox-1.5-r9.ebuild 8356
-SHA256 8e35b951417b3192bb6055fd9a5219ba26edea2394d7bab53b0d8ad851ec7ba6 mozilla-firefox-1.5-r9.ebuild 8356
+MD5 ae219f921ac2fe5b911c8fc0e652ce6a mozilla-firefox-1.5-r9.ebuild 8402
+RMD160 0a73c7b7892e9d1a94a71935695bbf180362ef98 mozilla-firefox-1.5-r9.ebuild 8402
+SHA256 2cb8f7ef3b936864ff3e80b9042f997d2be6d7839d59111c51255674738f4250 mozilla-firefox-1.5-r9.ebuild 8402
diff --git a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5-r9 b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5-r9
index c6a68924cdce..7b10011cf93e 100644
--- a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5-r9
+++ b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5-r9
@@ -1,40 +1,84 @@
 MD5 ab89c9ecf8402c2d6703de08879b6053 ar.xpi 153267
+RMD160 5035808bbf14d55ad4a493276397493fd531a048 ar.xpi 153267
+SHA256 eede7996f20dcea615f74508a923fb75a985d569d8f10249e1809429fc6a5b7c ar.xpi 153267
 MD5 58ca5cc51582ab37aa7b1605f0d91679 ca.xpi 161282
+RMD160 e49729d6d1720a2156de5ab7762debd66fc27346 ca.xpi 161282
+SHA256 1a67da5e4bb11e2a9d328197f382308b2546340a74348b164e4ad4044346ef29 ca.xpi 161282
 MD5 6f81abef4371fbf65849e9bec2939f39 cs.xpi 153049
+RMD160 7f6bac6a50ad58bc01f8216dbefbe3aa403a79f0 cs.xpi 153049
+SHA256 5c83b1debeb5d43df21e3557ae4b06155c8acadba7524ed8de4dd05f9869ebc6 cs.xpi 153049
 MD5 b6a5341ffd63ef0b39b8f561afe1072e da.xpi 142463
+RMD160 7ee7c41e720749b921fc44219aae4dd420571ebc da.xpi 142463
+SHA256 f9335bd8f1f7df6a67ad22920c4dc765b68eb14e1535336ddd5eb87bbdcdb358 da.xpi 142463
 MD5 63de76d822b986367f2029f363e8e625 de.xpi 141056
+RMD160 68458e5790169e6957578c3cf346edb79b6fb002 de.xpi 141056
+SHA256 7769dfbc2dd1abfa6fc594cd8fb3214825f38804cd3278b8c015cde052fe19a9 de.xpi 141056
 MD5 b1d2189b9248c994999e7e3d82885b31 el.xpi 146943
+RMD160 1604d3bb614de1ecbd6ef6b0d47c1e079b4e9da7 el.xpi 146943
+SHA256 466f01dcabeabd8d0641d0a9df2a28378f05576d342f28b89b39465c600a7bad el.xpi 146943
 MD5 655c2d6f95185260fad7f782729da10e es-AR.xpi 146125
+RMD160 fcb4255a0986bf0a8d330bc95d130b5cf483de6d es-AR.xpi 146125
+SHA256 96ce83874880023d8c1f3403a5924c9948e8bed408e0d129f2dfc52891c4314d es-AR.xpi 146125
 MD5 89cbf50f50ddde89a4b1cada2157f51a es-ES.xpi 132461
 RMD160 781a628f8f5424267a42209bbc49f1acdb2448bf es-ES.xpi 132461
 SHA256 56cb4bb4cdd836785bb958e1664251d1d6b141d242d68d241e0192b3fd2b7735 es-ES.xpi 132461
 MD5 a04056b74d7541da63a9a3f4e2deef38 fi.xpi 143012
+RMD160 97af038b65f7c4fb1c05da78be1e2ed1e85a0297 fi.xpi 143012
+SHA256 5ec58931f0ace1406523a7dd9ae8b3bcd1dbc25180ab8e7dabc67dac5488457f fi.xpi 143012
 MD5 fa915ddcadecda30ed3e13694f26a779 firefox-1.5-source.tar.bz2 34491496
 RMD160 5e7475846e9c92e36167a384e1e8a3d699b0b62f firefox-1.5-source.tar.bz2 34491496
 SHA256 3cdbd0929b1f92c60b3fb27601f621975fefea23465d5253238c6e120360d36b firefox-1.5-source.tar.bz2 34491496
 MD5 5a359eedd21c01b5bd3f17830cc69310 fr.xpi 203230
+RMD160 66eebebaec59a1cfdbc7efc413c4246d5869fa65 fr.xpi 203230
+SHA256 a22fd927cad9d2e266c9a13b6684c30763d2a85abcc043ff3de40338f3eaf171 fr.xpi 203230
 MD5 62767c9e689a4b0abadaf80abb374e2c he.xpi 144976
+RMD160 301602ab3e3a03554c903ec03e1a768ebd2cfbf3 he.xpi 144976
+SHA256 16461ebb53b51d65727ee8822a7a09ec583623e397a7c336c6ec66f4135563ea he.xpi 144976
 MD5 08bac8b89fa2bd0740c8e24d30533f47 it.xpi 156712
+RMD160 888fefe892a89cf9a2e502ff9ae870e4931b6b2d it.xpi 156712
+SHA256 963a9475fc1b83da95df82d0400ff6b0111dd787bf04eb42ed346657ca5d75ab it.xpi 156712
 MD5 1b5f28d3a980c5a92d590219fc337f03 ja.xpi 162438
+RMD160 a8c2a21ae116348b652334a58329d42bb7d294ba ja.xpi 162438
+SHA256 a9c6a328f91602b0739b2ea358f82f99915f7c33323067ac7528eb06648aeaf8 ja.xpi 162438
 MD5 15724eb7fb952b2dd90add37d3331ac9 ko.xpi 149473
-MD5 c1d99cb89d46d98b825acc5eac3ba668 mozilla-firefox-1.5-patches-1.0.tar.bz2 30485
+RMD160 1f89d42286c662277ee438e943f55bf90e92841f ko.xpi 149473
+SHA256 520441b894523485bbe973f3528cd221fea0e533b1e80863f3e172a3503dd432 ko.xpi 149473
 RMD160 e7b0d6475d8f3c77846a9a4584df5597e702c8b6 mozilla-firefox-1.5-patches-1.0.tar.bz2 30485
 SHA256 0c84abed2b311b48b8666972798b758d5a5887804d688c672164cbeda52c36be mozilla-firefox-1.5-patches-1.0.tar.bz2 30485
+MD5 c1d99cb89d46d98b825acc5eac3ba668 mozilla-firefox-1.5-patches-1.0.tar.bz2 30485
 MD5 6e030a4c52bc0144e7de6f2092ba57dc nb-NO.xpi 151770
 RMD160 df19b6fb3a8def33bf1caecf404525413eb7ac60 nb-NO.xpi 151770
 SHA256 a4b8f35a4b487d161ba1b9e1e19052a56218b38206757ca168aef945ae6d8f61 nb-NO.xpi 151770
 MD5 92f8b9f0a4aaf3ebfc1b6fb74189ede3 nl.xpi 150929
+RMD160 214986a22f66ddb68b438d183c6005a0609b2aa6 nl.xpi 150929
+SHA256 a9eceae035b6500aeca74739a91c2d584929068f5792acaf9791f8bfa3e81b38 nl.xpi 150929
 MD5 1864b9b0c82b9d30018a9537336e56bf pl.xpi 243650
+RMD160 a4508fb3ed59d77bff95034cd3f7067d9aabcbea pl.xpi 243650
+SHA256 fb891a2ae5ba30ece532f8b26394f96dd8d4e760a5f0c1c493d7221ddbde73b3 pl.xpi 243650
 MD5 4ea8f665e814e03474d955f89711d73a pt-BR.xpi 143568
+RMD160 8d1a0760fb51c36820f6ecf5e7fb0ca9dc21062f pt-BR.xpi 143568
+SHA256 b05bb410e9a15903680a47151cff46c09d18eaf43ad0544e57294baa45d64c23 pt-BR.xpi 143568
 MD5 d62c152f06dd1479441f7769635ee4e8 ro.xpi 144106
+RMD160 ff5c55e195d40c2f22238190889d4da895de56ad ro.xpi 144106
+SHA256 71ce3a15328cc6233ab45fae63ca1b96004293c7f9d468e91a2dc2a3eae9670b ro.xpi 144106
 MD5 f19c6d0e4131d04536f05f5534753c38 ru.xpi 170096
+RMD160 4f8c0b4b2f6dcf6dde33c3f1f2aa176eb660f9a1 ru.xpi 170096
+SHA256 14d16d0667b0acac03b0acc0e0f5a1bcaf8b27740a612b4d036c88855eab225b ru.xpi 170096
 MD5 bdc1cb09937465d5f8d6e3d3666b280d sk.xpi 153991
+RMD160 87a7bbe19097980ac4795cb19ec746926b213f9e sk.xpi 153991
+SHA256 6cb4ca78d2da883869a817241c9f98f6f79aaab11814423ae47d637cc056041f sk.xpi 153991
 MD5 a6e5d8d95c795782bd4cf9204f712424 sl.xpi 145205
+RMD160 0ae69cecaa58122a939e8619a1342e59ed9dbc27 sl.xpi 145205
+SHA256 2c44e2234b57cb6822f5d2a4658accb17494f27aa31476a71c8a1fc80fdc558a sl.xpi 145205
 MD5 704fadd436b1443cf996fe28ea4af017 sv-SE.xpi 154919
 RMD160 5dbb8816f8aaa1141fb02de7dd1099db2ba60cb6 sv-SE.xpi 154919
 SHA256 eb63409a62a54a504615e2c0c133528401c982aef45c9828546405acfc0160d8 sv-SE.xpi 154919
 MD5 eff05aaf7f64bb1daa8e3d646237f077 tr.xpi 136159
+RMD160 04b974970583ca5eb54079e767ab205b58754bee tr.xpi 136159
+SHA256 92852dcc2f869024fdb7feea6244a06fc9cdcfa9307a6b678987666f881efe27 tr.xpi 136159
 MD5 2213a8fab73a160366046fdd86eda0cc zh-CN.xpi 136431
+RMD160 1a820a7ff5a9e28f26ab869a5d93cd08d7027a01 zh-CN.xpi 136431
+SHA256 6ba364dc70611887641df19d11713ea5272cb3df9d1bc73275a3eb82b2e103bc zh-CN.xpi 136431
 MD5 f017d6f4421f9bd306cdcd306def80b5 zh-TW.xpi 128229
 RMD160 772c561fd36ad83e3cef3e4815175e76059f6223 zh-TW.xpi 128229
 SHA256 c3d72c4fb98358fcd8f57038c74a929f3c9a2f1e9f6f44fafe68612a323258ce zh-TW.xpi 128229
diff --git a/www-client/mozilla-firefox/mozilla-firefox-1.5-r9.ebuild b/www-client/mozilla-firefox/mozilla-firefox-1.5-r9.ebuild
index 1aa5923bafce..748a9f2c7629 100644
--- a/www-client/mozilla-firefox/mozilla-firefox-1.5-r9.ebuild
+++ b/www-client/mozilla-firefox/mozilla-firefox-1.5-r9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-1.5-r9.ebuild,v 1.2 2006/01/31 18:08:22 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-1.5-r9.ebuild,v 1.3 2006/02/01 21:37:10 anarchy Exp $
 
 unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
 MOZ_FREETYPE2="no"   # Need to disable for newer .. remove here and in mozconfig
@@ -90,6 +90,7 @@ src_compile() {
 	#mozconfig_annotate '' --enable-native-uconv
 	mozconfig_annotate '' --enable-image-encoder=all
 	mozconfig_annotate ''  --enable-canvas
+	mozconfig_annotate ''  --without-system-nspr
 
 	# Bug 60668: Galeon doesn't build without oji enabled, so enable it
 	# regardless of java setting.