Gentoo Archives: gentoo-commits

From: Jory Pratt <anarchy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/mozilla:master commit in: net-libs/xulrunner/files/, www-client/firefox/, net-libs/xulrunner/, ...
Date: Thu, 26 May 2011 11:52:11
Message-Id: 6cba76e35e10ff8c98bbeadc9a006da4565c197b.anarchy@gentoo
1 commit: 6cba76e35e10ff8c98bbeadc9a006da4565c197b
2 Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
3 AuthorDate: Thu May 26 11:49:02 2011 +0000
4 Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
5 CommitDate: Thu May 26 11:49:02 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=6cba76e3
7
8 Xul/Fx-5.0_beta2 support
9
10 ---
11 net-libs/xulrunner/Manifest | 7 +-
12 .../mozilla-2.0_support_64bit_big_endian.patch | 60 --------------
13 ...-2.0.1-r1.ebuild => xulrunner-5.0_beta2.ebuild} | 18 ++--
14 www-client/firefox/Manifest | 82 +-------------------
15 .../files/fix_omnijar_startupcache_breakage.patch | 26 ++++++
16 ...ox-4.0.1-r1.ebuild => firefox-5.0_beta2.ebuild} | 18 ++++-
17 6 files changed, 57 insertions(+), 154 deletions(-)
18
19 diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
20 index cee9486..825e183 100644
21 --- a/net-libs/xulrunner/Manifest
22 +++ b/net-libs/xulrunner/Manifest
23 @@ -1,5 +1,4 @@
24 -AUX mozilla-2.0_support_64bit_big_endian.patch 1667 RMD160 cba6fa2f23e9ecbb42abe1865f9a7e32472a66d0 SHA1 fe54162cf85d9e86f2d2ed8b0c4e0b8efd11c9f8 SHA256 bc3363cf9dabdadf6595bef72b355a68ff7568cacbdfb3d77eeb8d08c4b45d6c
25 AUX xulrunner-default-prefs.js 709 RMD160 a4d062f75c17552545267ec3fe2f6b54073dafbd SHA1 580128e9edf8021fdbbca2c91abf63cb83bab2c7 SHA256 e6850b0a22f7d3889b49ec4a79a3c4d3d077edd98c8f0ffdc26e30bc70bb4b09
26 -DIST firefox-4.0.1.source.tar.bz2 65980273 RMD160 63faaae78b56db407a34454986361212382c838e SHA1 c89bc5106266aa0097a7be15be84555bd2649f03 SHA256 cf3a39877facc229a67760915341fe95095cca647faab3a7adcb70046105199c
27 -DIST xulrunner-2.0-patches-1.8.tar.bz2 68053 RMD160 58ef5ff8fd037f34232a8acc706a1cb086651940 SHA1 bac72e12bfc1150ed116ba5e930688ec72157671 SHA256 88950bf5bdc34cf96bf79e1e1d2f2a4071e1f9e9d53e52f400c433f2f661b77f
28 -EBUILD xulrunner-2.0.1-r1.ebuild 5935 RMD160 e7e6c2e2605e2ca5903074ee4b92d9c5534637d9 SHA1 0f063678cb2eb889f9fa03afc526b29bd1841363 SHA256 a9bdca0fc5211cce26e23cec0c14db62ed5000fdecaed2c2973ec96ec808ea4b
29 +DIST firefox-5.0b2.source.tar.bz2 68883059 RMD160 948509c32a35f224d77eb22ebe3e87b99148754c SHA1 1466717db96c992691b32dba28a32ccefb5d0b9d SHA256 634e963b03ba460617771e19e138ac124894165aebc81afc535c22dbda0766fc
30 +DIST xulrunner-5.0-patches-0.3.tar.bz2 17651 RMD160 3b7ae9eff944ecfc8daf2b4e5756793a8818f676 SHA1 2bada1fd15efd811666260b82379de4da7ae37ae SHA256 cbca0cfd802095054d6b22648587aee4c83f616a0c9df384c5f2dc6364167715
31 +EBUILD xulrunner-5.0_beta2.ebuild 5943 RMD160 f83e1514fad8ace31232f5499d20e87b4184f208 SHA1 d19f6b74fa6aca31670b8063c27c9100f9d4cdae SHA256 c15cb53b59cd027f20943b20236d46c441c2fdfa50b917238f5c5b20c403f777
32
33 diff --git a/net-libs/xulrunner/files/mozilla-2.0_support_64bit_big_endian.patch b/net-libs/xulrunner/files/mozilla-2.0_support_64bit_big_endian.patch
34 deleted file mode 100644
35 index 5814d81..0000000
36 --- a/net-libs/xulrunner/files/mozilla-2.0_support_64bit_big_endian.patch
37 +++ /dev/null
38 @@ -1,60 +0,0 @@
39 -# HG changeset patch
40 -# User Mike Hommey <mh+mozilla@××××××××.org>
41 -# Date 1303461188 -7200
42 -# Node ID 59771590e9203d48ef8cbcd7eaf2f8ae45dbb1c1
43 -# Parent c4b82ec27d6d6e1c02ef0abb3b6e805bfdd092ec
44 -Bug 638056 - Avoid "The cacheFlush support is missing on this platform" error on exotic platforms. r=cdleary
45 -
46 -diff --git a/js/src/Makefile.in b/js/src/Makefile.in
47 ---- a/js/src/Makefile.in
48 -+++ b/js/src/Makefile.in
49 -@@ -383,17 +383,17 @@ CPPSRCS += checks.cc \
50 - platform.cc \
51 - utils.cc \
52 - $(NONE)
53 -
54 - #
55 - # END enclude sources for V8 dtoa
56 - #############################################
57 -
58 --ifeq (,$(filter-out powerpc sparc,$(TARGET_CPU)))
59 -+ifeq (,$(filter arm %86 x86_64,$(TARGET_CPU)))
60 -
61 - VPATH += $(srcdir)/assembler \
62 - $(srcdir)/assembler/wtf \
63 - $(srcdir)/yarr/pcre \
64 - $(NULL)
65 -
66 - CPPSRCS += pcre_compile.cpp \
67 - pcre_exec.cpp \
68 -
69 -# HG changeset patch
70 -# User Luke Wagner <lw@×××××××.com>
71 -# Date 1299520258 28800
72 -# Node ID 68203913d04cf5be53fd16278816183d5670ba5c
73 -# Parent 27e5814815491ebb68e474e453aff6c2ea908c43
74 -Bug 618485 - Add missing 64-bit big-endian jsval_layout field (r=luke)
75 -
76 -diff --git a/js/src/jsval.h b/js/src/jsval.h
77 ---- a/js/src/jsval.h
78 -+++ b/js/src/jsval.h
79 -@@ -342,16 +342,17 @@ typedef union jsval_layout
80 - JSValueTag tag : 17;
81 - uint64 payload47 : 47;
82 - } debugView;
83 - struct {
84 - union {
85 - int32 i32;
86 - uint32 u32;
87 - JSWhyMagic why;
88 -+ jsuword word;
89 - } payload;
90 - } s;
91 - double asDouble;
92 - void *asPtr;
93 - } jsval_layout;
94 - # endif /* JS_BITS_PER_WORD */
95 - #endif /* defined(IS_LITTLE_ENDIAN) */
96 -
97 -
98 -
99
100 diff --git a/net-libs/xulrunner/xulrunner-2.0.1-r1.ebuild b/net-libs/xulrunner/xulrunner-5.0_beta2.ebuild
101 similarity index 94%
102 rename from net-libs/xulrunner/xulrunner-2.0.1-r1.ebuild
103 rename to net-libs/xulrunner/xulrunner-5.0_beta2.ebuild
104 index 5e743ce..e71e58e 100644
105 --- a/net-libs/xulrunner/xulrunner-2.0.1-r1.ebuild
106 +++ b/net-libs/xulrunner/xulrunner-5.0_beta2.ebuild
107 @@ -8,13 +8,13 @@ WANT_AUTOCONF="2.1"
108 inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib autotools python versionator pax-utils prefix
109
110 MAJ_XUL_PV="$(get_version_component_range 1-2)" # from mozilla-* branch name
111 -MAJ_FF_PV="4.0"
112 +MAJ_FF_PV="5.0"
113 FF_PV="${PV/${MAJ_XUL_PV}/${MAJ_FF_PV}}" # 3.7_alpha6, 3.6.3, etc.
114 FF_PV="${FF_PV/_alpha/a}" # Handle alpha for SRC_URI
115 FF_PV="${FF_PV/_beta/b}" # Handle beta for SRC_URI
116 FF_PV="${FF_PV/_rc/rc}" # Handle rc for SRC_URI
117 CHANGESET="e56ecd8b3a68"
118 -PATCH="${PN}-2.0-patches-1.8"
119 +PATCH="${PN}-5.0-patches-0.3"
120
121 DESCRIPTION="Mozilla runtime package that can be used to bootstrap XUL+XPCOM applications"
122 HOMEPAGE="http://developer.mozilla.org/en/docs/XULRunner"
123 @@ -25,6 +25,7 @@ LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
124 IUSE="+crashreporter gconf +ipc system-sqlite +webm"
125
126 REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases"
127 +FTP_URI="ftp://ftp.mozilla.org/pub/firefox/releases/"
128 # More URIs appended below...
129 SRC_URI="http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2"
130
131 @@ -50,11 +51,15 @@ DEPEND="${RDEPEND}
132 webm? ( amd64? ( ${ASM_DEPEND} )
133 x86? ( ${ASM_DEPEND} ) )"
134
135 -if [[ ${PV} =~ alpha|beta ]]; then
136 +if [[ ${PV} =~ alpha ]]; then
137 # hg snapshot tarball
138 SRC_URI="${SRC_URI}
139 http://dev.gentoo.org/~anarchy/mozilla/firefox/firefox-${FF_PV}_${CHANGESET}.source.tar.bz2"
140 S="${WORKDIR}/mozilla-central"
141 +elif [[ ${PV} =~ beta ]]; then
142 + SRC_URI="${SRC_URI}
143 + ${FTP_URI}/${FF_PV}/source/firefox-${FF_PV}.source.tar.bz2"
144 + S="${WORKDIR}/mozilla-beta"
145 else
146 SRC_URI="${SRC_URI}
147 ${REL_URI}/${FF_PV}/source/firefox-${FF_PV}.source.tar.bz2"
148 @@ -71,17 +76,11 @@ src_prepare() {
149 EPATCH_FORCE="yes" \
150 epatch "${WORKDIR}"
151
152 - #64bit big indian support
153 - epatch "${FILESDIR}/mozilla-2.0_support_64bit_big_endian.patch"
154 -
155 # Allow user to apply any additional patches without modifing ebuild
156 epatch_user
157
158 eprefixify \
159 - extensions/java/xpcom/interfaces/org/mozilla/xpcom/Mozilla.java \
160 xpcom/build/nsXPCOMPrivate.h \
161 - xulrunner/installer/Makefile.in \
162 - xulrunner/app/nsRegisterGREUnix.cpp
163
164 # fix double symbols due to double -ljemalloc
165 sed -i -e '/^LIBS += $(JEMALLOC_LIBS)/s/^/#/' \
166 @@ -135,6 +134,7 @@ src_configure() {
167 mozconfig_annotate '' --enable-safe-browsing
168 mozconfig_annotate '' --with-system-png
169 mozconfig_annotate '' --enable-system-ffi
170 + #mozconfig_annotate '' --enable-chrome-format=jar
171 mozconfig_use_enable system-sqlite
172 mozconfig_use_enable gconf
173
174
175 diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
176 index 5cce947..4cf4eba 100644
177 --- a/www-client/firefox/Manifest
178 +++ b/www-client/firefox/Manifest
179 @@ -1,83 +1,9 @@
180 AUX firefox-default-prefs.js 95 RMD160 805cdfec6fb31c224322cb71125547ad7a515f49 SHA1 7fab69d85b12a9f1b0c87fbb1821bdafd7485ac9 SHA256 8bc4cb870bc402db1f20b135a689f8c5dbfa5de8f1755b1926198d627c12c5f1
181 AUX fix-preferences-gentoo.patch 426 RMD160 83075ec3c2e4c39ba298096bd08447bb94cad34d SHA1 ffff69bcff712483d1962ce04a700748fdab24f5 SHA256 7edae5ea1efb042412d02ef00c51f5e55c4499751c240b48c7b07f69cc420d94
182 +AUX fix_omnijar_startupcache_breakage.patch 888 RMD160 603b41e22c55414e8f707b2b5f1342f377eb2638 SHA1 021ba3b753991e54f3d6b18be903bf4e312642d4 SHA256 937a6e3e366f5faf42ad039c37e237eb9079434028d1c9b63d1fcdf9645f75c9
183 AUX icon/firefox-1.5-unbranded.desktop 258 RMD160 32ebb016d6a4d3d2728c031f3b3762796e02f5d3 SHA1 69820d445d06b90d7ac35ffd39dad5926caa0862 SHA256 f2bf5c237a5c56b443c20fd16d3da429bf3b99e9fe27b661a1a462aa46ed25d3
184 AUX icon/firefox-1.5.desktop 255 RMD160 4ef1cf548f11057274620b82f0728958a3424bea SHA1 6a440f817072fb60516c1a1d999dffb6d3fa1583 SHA256 9bf6e1264d986c68d64831d166ed6b506bff6df8b56d21bfc166aee09cbc753f
185 AUX icon/firefox.desktop 276 RMD160 92a5671cd09e399b3330c4be31b7ac7583747031 SHA1 b757763670a00982f3cb38b8d41d7faa6eee3818 SHA256 06565ade11b6e4b448cf10339696c43f31e73cb6824491094bb6e0ab902c7cf5
186 -DIST firefox-4.0-patches-1.0.tar.bz2 16462 RMD160 46755eac7eb04eb19f79c93af3fd2016289a62a4 SHA1 270afe97a49bc507bc0d1d3159ec23e69e9ec40f SHA256 db5e993bf309c316ca370186c7866a7505cb37ecc729a3449bd0f6538aa2eda0
187 -DIST firefox-4.0.1-af.xpi 220422 RMD160 ec60332dd0115ae4087778ae45999485dd5e79b0 SHA1 5668120b63f9cafc738b05f66b45e0c0f343a14c SHA256 6b3529b78e6643578d407d454a70bce423742206d13f69bdd97871da9c533688
188 -DIST firefox-4.0.1-ak.xpi 222042 RMD160 c71d3c421e0297c599f5d6d8f135d12c2ae56b56 SHA1 5479593fc3c3c546f6289dc0634aa887dc30fc9d SHA256 a09ffd1618a1596cb8803a73bcbba74cfc79f8809168576b97fd023bf1c990c8
189 -DIST firefox-4.0.1-ar.xpi 241601 RMD160 d875b31df6568e7a0903684b5c68952241ae3d7c SHA1 11ddcb8f9139dbcdf898e691a4cbdf1841563755 SHA256 f2d19b19c1d817d935bbe3df0531ae9ff95a801109c65e1230f4f3bae60a0662
190 -DIST firefox-4.0.1-ast.xpi 218123 RMD160 7d3a3aae95c7e08ce40698e6e0972b84727260e2 SHA1 ed90f29f1ce4ebf001d8d3f2624f1f1c24a79b2c SHA256 3763a902e7db3f0ed40e5168edc98d0ad9357f78e7406051eba94d3c066b0388
191 -DIST firefox-4.0.1-be.xpi 231346 RMD160 bceabe55c0e4e638685673ced45e286d164b1c99 SHA1 5b76b18dd1514ba2d01ffe31a6799563ced54806 SHA256 edb4b777f2b36937b8f48662e8cf5c1a709e742205c3adcf4460d34b3c51ff56
192 -DIST firefox-4.0.1-bg.xpi 254933 RMD160 e9b139d0b77661a652d3700a84ee9d50a19b1088 SHA1 301505683fe4263919a803a33018cb17bf725dd9 SHA256 3edb2a3f1fab20d51ce57ee8b31beadadc40a1de0f9fe693f42e0e5f16f83db0
193 -DIST firefox-4.0.1-bn-BD.xpi 263230 RMD160 12ab0ab28c67bd2ab239813108f3c29b3b3feb74 SHA1 80cb616722d44b167b5d832957a0a163b88dca59 SHA256 6fb4247ca4900717b8ab76cbfa25ddfd9bc799296752e5b1d829e0318747f795
194 -DIST firefox-4.0.1-bn-IN.xpi 292731 RMD160 9acd2a515436b5d4c7dd55849510151f1dfce6a5 SHA1 cc53e0e339e990ba320ed70883efbe2cdf4c0a59 SHA256 65b7beaab67dc0a66558a1ba8d481ae94afb81c8eea3907ddc8103ce60dcb62d
195 -DIST firefox-4.0.1-br.xpi 228724 RMD160 58f5d4610a6e67665ef81998f3404c84bcb75e5d SHA1 14e47aed55d01c416e33109901e522a3fffeeb8b SHA256 6764cfab9d896a8b43d60fa6383e1be52faf37526a9883389cb933bb2a2f12ec
196 -DIST firefox-4.0.1-bs.xpi 226718 RMD160 609f877aee41d0373ec952d1c36d5d4b92f3d10e SHA1 5d895b88d0d783b91870cadbdbedd88a5725e2d3 SHA256 d502f8e154e386eafdabc96bea4e5d4ce2aebb980f5c98ef0ede798428974867
197 -DIST firefox-4.0.1-ca.xpi 228114 RMD160 c09fa5e331d7ac16d0c31e4ff3cdc3b1df1f2267 SHA1 1b799329e13d9869c0a2f9322e5edde5dac9701d SHA256 67d919edddfb7f58de3655afdd7dd0c3992d549c3cb02db4ee5a27e9ce4c9178
198 -DIST firefox-4.0.1-cs.xpi 229191 RMD160 07fb7c15bb5c8b5e265ae77906237bebcb63b2be SHA1 c79bfe0bf81acea4207250873e8456f8e6f8075b SHA256 1746e852231aa5b504bf36434d73eb0989e93a34a50d95277f5aebf3617d1ad9
199 -DIST firefox-4.0.1-cy.xpi 221682 RMD160 cd77cc2619277e7c17c08a85d761bd4dfb77e9d8 SHA1 d026f83918407cff06892b5f835992d50b8cbeaf SHA256 0de01085aaf07e0ee6604088651a1bdbe8e6d5c799d4a6164b02523ebe88d1b6
200 -DIST firefox-4.0.1-da.xpi 221658 RMD160 cfb8524e9a8324eadb17efd6981abbc653616184 SHA1 6cf77fedbcad80123773fb4737323051d0fbd354 SHA256 9f4c12725d2fb6a5f7c20afe1de1407a66e25f4d34f9f085e1013a466ed28e4c
201 -DIST firefox-4.0.1-de.xpi 229257 RMD160 51eb9b28544871cbf733ad4a97ae65d20b49e10d SHA1 a1f6129e7a779107b3808ff2eb7ec98a4ff65781 SHA256 bf5258a6e3549e3fd9ff9d2c7ebd435219b0a271000bb9f2e4ece238b8fe0869
202 -DIST firefox-4.0.1-el.xpi 243564 RMD160 47d6d66378661ab9b495d3769cc54ca2375102e4 SHA1 6182dffbb16d25e76628c9c6a9aa9bcb3de19a6f SHA256 75d6e97d5a1eaeaf44353cc3ea3a259aebb51eaa9800865b2190038072d14492
203 -DIST firefox-4.0.1-en-ZA.xpi 213525 RMD160 7c74f5040f8b06ea80b7ecb2db66397ccf93bfb0 SHA1 eb79891b74d524a9d46c7fe671713a65fa9be3d0 SHA256 3c0066026972c870087901ae763516f87a14152aef0ffc3d6b7e661986fd2992
204 -DIST firefox-4.0.1-eo.xpi 222304 RMD160 370dbcaa0b30cd17f85a475cf4ab937e61a5f2e6 SHA1 189e0d0fecc80454d7b0d03bd59b1a21453c71df SHA256 d389663243416eac7af309b2bac387977dcfa4abfa8ade18c0a83ced0f8bdc8d
205 -DIST firefox-4.0.1-es-ES.xpi 202316 RMD160 f3dea9e7acfd69de845b351d299e3df7538a5e42 SHA1 0e2bb1140f4cde0ceb909ef7adbbfde3358799d1 SHA256 f7c2d17b9e632956346d651d1a387e12e92643639bedd01509c9df8a4c661bf3
206 -DIST firefox-4.0.1-et.xpi 223433 RMD160 5488c10f129bed2527ee67f81b1a3d7684e13a9d SHA1 997aaf4a8074dba2480a309931f13f8459b3adfb SHA256 911f52cdd00d50881cbd98836fd8c3a7f5bd8c1533865fb447254683612010ed
207 -DIST firefox-4.0.1-eu.xpi 221330 RMD160 3f2f83aca483f64dd1b5993935943da9689fa8ed SHA1 d2d6092f2bb1189b4b039f720114c3a5284689cd SHA256 ca8c7edd050d73f43e8685fc2f763124e10fe6a3f10a8900b7daa060885eda6b
208 -DIST firefox-4.0.1-fa.xpi 249722 RMD160 7c645aa6fe293b8c9979ecba01b24e7e7ccf4102 SHA1 fac7c9a2af4254f8c965ec9d1617ffea471bb3f6 SHA256 a45e298a3e300ea9ffc64c42909e11db6e7bb2d941585884db743847b67e4756
209 -DIST firefox-4.0.1-fi.xpi 224502 RMD160 9a5ab40eb3df0299276e060af2e28f5e345ec866 SHA1 e935262bad4c7feb064303e01b79e9d4e5a67d8a SHA256 fb69f58589a4f66d970b4e9e94c9cd59b1fd2fe97e49f90786cd1f3b2ee59178
210 -DIST firefox-4.0.1-fr.xpi 230272 RMD160 572f46b060ea317bca1005d4813ced07209dd2d2 SHA1 cadb3f4413cc92fcfd2e4e9cca101512bea501c5 SHA256 34d2350057923735f3cc56ba2f54fd8c0daa153d1c2af145bf3b594aea5f42d3
211 -DIST firefox-4.0.1-fy-NL.xpi 227615 RMD160 ad3a9cf208c50b40b7089a5c45a5ec41e2b616f4 SHA1 2d9ca5afd1e48a95c36434f40069e02918d0b1d9 SHA256 991cfc1725510ab47f715076bf5ab6728bb59e898ec075f609782a0b2542750c
212 -DIST firefox-4.0.1-ga-IE.xpi 232342 RMD160 37faefa8c4ba1dbc3fd11d7abf8cd057e2b55290 SHA1 2417c08da97c5f26be9a7e699605d23f7ccc30d9 SHA256 566338ac72be0c59ae58f43cedf8b7ed7cc03eb4aade6da56f4a4bc649857887
213 -DIST firefox-4.0.1-gd.xpi 233887 RMD160 e2265ad2c4db19d51d7831403e08ae3ad87333f2 SHA1 ba7bc78482c983ca8d0d130f3e14f1aa316ca221 SHA256 547591e3a49b93b2f39306cd13e0a548b655f84bc1a2f92b2848c95f1c3e0c0b
214 -DIST firefox-4.0.1-gl.xpi 224437 RMD160 a0bc5e8fff02606e45c5088395f8ff1aa570c06a SHA1 aef092915119c17db4f1ec14b8c12b318eb77d55 SHA256 ce4c3638151b28d612ae53fa9b1d604c5ddef2b7f84c5508b21c5198dd9db5ae
215 -DIST firefox-4.0.1-gu-IN.xpi 252617 RMD160 fcbc362bdec869042a926d6f436c146f576fdd14 SHA1 696e7f29df809f659527a0d05b7f5ac884184efc SHA256 34f381592403e63b03b7349123ee727e3df66d0496ad27688a2b671e9b0fcddd
216 -DIST firefox-4.0.1-he.xpi 234330 RMD160 48f55f631046aa74293b6d009f6d56ea499959b4 SHA1 bdd17f84554305bbc8b35dd67674f08f31c13501 SHA256 8b517d41b62f757001307f9f99f76fecefd393cad9756751499682e49b32c803
217 -DIST firefox-4.0.1-hi-IN.xpi 257584 RMD160 3c4edb1e796fac4c0e3f9dd04fd66c8b3cf56d33 SHA1 f9d75c3ce9c49acb70f6f05d33ff0d59c44ea6de SHA256 390f65fcb7b474fd6348978427be254f94cfc80bcc594a8b5acdfec9e9a42bf3
218 -DIST firefox-4.0.1-hr.xpi 234112 RMD160 0b02beb5bd9b9b576b1ac495d47fbde62501ceb3 SHA1 701cb21f9fdef72a1f9a00f3cec44c6a8bd6cc6a SHA256 721eae6dd46da5adb22bed63986f72fb873b7315e1cdd41d48d63bd28c59d498
219 -DIST firefox-4.0.1-hu.xpi 234692 RMD160 e55b8c101a77b9e5059622ca8a989f7a873c770a SHA1 1bcb0ce280aa2afe34fb16fd441be95cb779f93f SHA256 1167b384bb2f1855a6551a35ad9c21c382e58f051a101a506c43ecb34728610c
220 -DIST firefox-4.0.1-hy-AM.xpi 418864 RMD160 f80d7d8936c20dce5c1267874314f9b9d0751dc2 SHA1 c50a924c921ba0e0873e9fb914e8257e080f8978 SHA256 5debb46f72776254662bfb72188470b537394b9bce29f9c2113b40dfd3b23e19
221 -DIST firefox-4.0.1-id.xpi 218468 RMD160 85ba3e60d8bebaa35991dc205ee289dfd1528cc4 SHA1 69d5aeb375722310903d2c28ca0e26365ceeb7b8 SHA256 9767e46ab7a4f341feb6b80bc559f44a22e2db62699970e6d1a423bc41b92324
222 -DIST firefox-4.0.1-is.xpi 224206 RMD160 4875eb59f3c75e2f30ddb1017ba7d7c99e719dad SHA1 86290f41c59af1f56fb77e3cd6de0217ae528220 SHA256 da92b0f17d8d37e4b48237fa9d23ef70a8d4317916eb219c663ce9997e5acca5
223 -DIST firefox-4.0.1-it.xpi 199845 RMD160 502c4bd22eae78b053996b6e1ee110d07cef943b SHA1 2fda513f7df563dfcfe1e986add2757bc9c2da61 SHA256 ff4a70d419f537fa8ae5d631a291c925725ff18c596888bfbe8de9f610753024
224 -DIST firefox-4.0.1-ja.xpi 252159 RMD160 29a7c24681d35d93ebeac67e09a0737f6adfc723 SHA1 57c8e695afc4bc2dfbee413c3c78bfb0f8276d87 SHA256 1dd8854f2ee2c8a571e98d32e6993c1829640e6f66add4025f858bcbf63a3047
225 -DIST firefox-4.0.1-kk.xpi 256607 RMD160 260f8c3b358089b06d46f4ae44b115291d70c0c0 SHA1 5e9c700fdd4dc7afc79842827afcf553e222036a SHA256 c42b67048c3360bbba688254aa1cd760ee82510023ffdf807f9fe27d8fe2c1d8
226 -DIST firefox-4.0.1-kn.xpi 273823 RMD160 8806d36e14bed90eb67bebcbe1338adb863e52ae SHA1 4228d0607e6096530bc8266cbf5b60ace061aa74 SHA256 f6d284b74a3055441344d7128d3a0f18c33baed3cc845a12f3d740e97fcabcea
227 -DIST firefox-4.0.1-ko.xpi 206945 RMD160 2e8000a5ccc0f1f22083523d84427415fb5c242d SHA1 4410ac1b4d3743a13088af11445091a9f91594cb SHA256 a410f4ed933dee17e846701ed938ff5ed513b222793fcb51265da4104197701a
228 -DIST firefox-4.0.1-ku.xpi 231607 RMD160 594d3cca337997d094ca676997ca516a51d8c996 SHA1 e09cba6bf36e45931d306bda97aac4f7472b0b24 SHA256 6e21a64f14ed6f19f50ae4b4accb7829ea3fbf2f69962715781349ff7235eccb
229 -DIST firefox-4.0.1-lg.xpi 228828 RMD160 c83d0477a5d1140aa0154e76b19359374642bdd8 SHA1 6413fd30d6689807db461a892d18fd0127a12a59 SHA256 64ce8df858a651fab26ea65b50c4b938a383969d1e5e3746b478e88412d9fb8c
230 -DIST firefox-4.0.1-lt.xpi 314014 RMD160 83d0aeebf2c26606a4106badba8d41e93bac1801 SHA1 6fdb9f734a87a54ecd51c4ce941c4f9d680c28ee SHA256 a9e816093405b627d1c67ccc60e046f9d51ced5d5aa34822dc8188e96a499d2b
231 -DIST firefox-4.0.1-lv.xpi 225535 RMD160 0cf0f27a374bf6d37704f8cfabbfa95704f54977 SHA1 775ce6957cd1bd06d902cae1e772a751ebff66f0 SHA256 bd7200b38d34f96035a479f840f0be63820d7d404b48fcabfdd6670df7a78171
232 -DIST firefox-4.0.1-mai.xpi 257134 RMD160 0b1082ac6a7c07412e7487a77b59fdb53e78eb49 SHA1 62abf505a08f656de1dcc7ecd07959f50fb67867 SHA256 d6202a51a21ce549469b6c678ece7b344758e7db9b05ca8b5ed4b43904e69f98
233 -DIST firefox-4.0.1-mk.xpi 250541 RMD160 9f34aa8e683506966607339c49e7a16576ffa98c SHA1 f880bc3c729ffe65125f52629c5334284b0ab33a SHA256 35ac22e21cb5b530437f276aace1283ec8ef0be2472d0b19e4b40544d1163872
234 -DIST firefox-4.0.1-ml.xpi 282447 RMD160 284f0e3e92557a9c1186fd3be3d2115f2b0ca10a SHA1 b582a3f9f22079acd05496b86e778cfc1254bb61 SHA256 32ca3d3eb383bb067981d5b40a3fbf508ce189f3fa105092ab00ab5b49cae67d
235 -DIST firefox-4.0.1-mr.xpi 257805 RMD160 b1939bc8451e52e5bdf00e197c5e5fbec25d63fe SHA1 d4ccf68b7c21c46389413f24a475eb6e0b5da910 SHA256 7d177b9d98487b9f0563e1e53fbca48ab4df36534fe8f7b38e339933b6a2eb61
236 -DIST firefox-4.0.1-nb-NO.xpi 222493 RMD160 dc9902b3c8df832e52a6cf8476ad2c9bbe48e8e0 SHA1 6a86417d540b922aeb23300b6b5e9c35ccf00660 SHA256 05d485c0eb9abc9dbe19934c4cac6b69a6fcb56217df26286a7dc7863d94adec
237 -DIST firefox-4.0.1-nl.xpi 223776 RMD160 44721ba15558d02b1a3934e2380993d44797c46f SHA1 ac9989dbe7a405f051b2eb6fef77c70de1ee0801 SHA256 bda740575ae1da40c0ccf87d3213916d1847972ab2523a30af8ccef476d17be2
238 -DIST firefox-4.0.1-nn-NO.xpi 223784 RMD160 f4e5e8a3055cae220607d461bf0412503bf54ed3 SHA1 35e7fd5285fe40242baae04d0e31b018c0344bcd SHA256 e3f34c474898021d0f8f70ff5b40ab0a85f9d10743b470ce67ac736c544dca90
239 -DIST firefox-4.0.1-nso.xpi 227056 RMD160 c32ab502e5ae46dcea3d89c330ad3e43bc595057 SHA1 ea95b8a1754fdbfcfe7ec90eb6c93431f2f90730 SHA256 8d81e36399371b488821fe13a22cd2c3855c0bb7a0c1856dbc7ec834895f3432
240 -DIST firefox-4.0.1-or.xpi 261472 RMD160 6b33f7ab004e3b53ce6ba9c039c4147f4d06e402 SHA1 935d4012f98adf0ffd77446f5929d00b982149e7 SHA256 cc830f87a191460cb3e595f2596160224c5e6dd9dbc0c1455dc558ca83def60b
241 -DIST firefox-4.0.1-pa-IN.xpi 258820 RMD160 b9341d5c51082d4a480e7fb4eb26351ece95df3f SHA1 38d2908a2ce3e2f7e2f9f0effe400b1408249588 SHA256 ed7f9ed51bd6c15aaf5f895d1e2adddc7328788f8a99c8c722d7651eb433b37c
242 -DIST firefox-4.0.1-pl.xpi 232239 RMD160 541269d2ffeab8219b2c4366a522a40ba22ad4e4 SHA1 f5375ee49b94f5e86e1c54b75c9f530e550bde04 SHA256 9988d6918a2cfb60e6cab999bc90f2b3bde948a3331a8daf1be11895f177f163
243 -DIST firefox-4.0.1-pt-PT.xpi 227260 RMD160 4296ccda0a1ecbb907837308701482aec921e187 SHA1 6dd3180838a69bfd6695ee69e9f94e724ddab188 SHA256 dccd2e5d458533451e6fdbb9dc90622b1c2abe6914eefaf6275f6d6bba4b86dd
244 -DIST firefox-4.0.1-rm.xpi 226580 RMD160 584a3ea61f6b07157bc532ed19c4ec752794281f SHA1 0a03b842632991b50bc7d8dda2178cfca4d133f8 SHA256 fb0796264bfe9ba5b69bc2fac588c5c3ea02191cbd1bbb6a5cc9e1debe8556dd
245 -DIST firefox-4.0.1-ro.xpi 230023 RMD160 7a8adaa9ba1e7675a2169eb2c7270e57783baa9a SHA1 e5d4a65efeb994741a8f0e301cd38751913bbf4f SHA256 584fab1a0f399631f99741f6575bef916f75be361136d5a1bc017eadc1a25895
246 -DIST firefox-4.0.1-ru.xpi 239442 RMD160 f412c1fb3b86001aeaae6c8d5ea3c8a2d2ea9453 SHA1 c2f847dae16327e527c9189d6b21a277ab97c670 SHA256 95d73a38abd1371c6d7b2b5ca2365b359f728878731dae5ca69120d74479c1e6
247 -DIST firefox-4.0.1-si.xpi 252437 RMD160 8ffdca8e315361d18808a5cf0b79a9aac68f449f SHA1 089602a157fccc32d8d6234a612ba63988472bf5 SHA256 24afc5858116c69559a5b76bdec8c9fb2efe204bd1f673d89dee02083953240d
248 -DIST firefox-4.0.1-sk.xpi 234295 RMD160 7d95911417ac45b91cd03fc25375d91349416077 SHA1 5d394fdc250e157534e7141ea84e79e301e04514 SHA256 017f565e2bee568988bee079f0dffa4d287fb9ff4e9692f94da1ad831bae8ce8
249 -DIST firefox-4.0.1-sl.xpi 222381 RMD160 956df91464afd3809c22fa0008ae909e5bed5bb8 SHA1 ab488b2142824b9d190e589210d0936850bd8637 SHA256 7471f994be4e43c4624622edf6d6ef725b85d160e57f7397e490822b5b6b6b65
250 -DIST firefox-4.0.1-son.xpi 220136 RMD160 8ece25e8a6f1217eb04f0695c5ad4149906eec97 SHA1 54b5e3b700733e7a7b5a7aaaa650e23ebf11ab45 SHA256 9a3bb75ae65c75a474778591a7ac77c660c59550b18095a843a9f0e768cd807f
251 -DIST firefox-4.0.1-sq.xpi 207488 RMD160 7ffcd2edba834fb56c9431d1b21ae34bfc60621a SHA1 da81be8e004a6ac7a8e56875c7dff2dbbc3bdfdb SHA256 c7e6eeb61c2edb7c902d30d417da676e5a087787d95d137269c87dc7663b2014
252 -DIST firefox-4.0.1-sr.xpi 258226 RMD160 f932dcb6e3c83b3e17742160729c0ac0c5ea6f44 SHA1 63bf99126a81ba21beeef08f1d8813761f680491 SHA256 f215e7ce5be9903069cd10ba20b0ef62d703111bb63bb19e030b3f771a85db75
253 -DIST firefox-4.0.1-sv-SE.xpi 260773 RMD160 1fdc4fb8104255e78edbb5b1cd731d114f51e87a SHA1 ff2590c1bd98bd882bf65f5582689ccec122d3cf SHA256 287935fe120bbd11496ebc67e4502f6a8e11c50a286d26f3f0fe09345ea9d150
254 -DIST firefox-4.0.1-ta-LK.xpi 267030 RMD160 a655f021bcb859f5b0eadbeac9560a080224cba7 SHA1 90d617329d7ccf94d08c524a37ce933265b743e1 SHA256 47cab0e3f19adaa8d0d42abe54d2ce63a03e0fc08464552b16e3b414c3b39417
255 -DIST firefox-4.0.1-ta.xpi 252374 RMD160 0316910624940e9b216dd437a1e8dd770da259bd SHA1 52bf76cb05b478753e6818c6c7cd31d01bc5fbc2 SHA256 02c14b534f5db23db68967aaa9ded8dfb9677951d7482abda06452b9d1406a39
256 -DIST firefox-4.0.1-te.xpi 266689 RMD160 d12630acd82a4e6354ae55d79ab24e02ca98d6a0 SHA1 aac6754630ddf710c0978eab0ce9ed9cb8daf15c SHA256 8f9c2a74c42e3aa295794b0bf60b5ff34a8a0d91d9f845c864093200cd28933b
257 -DIST firefox-4.0.1-th.xpi 253295 RMD160 d10f6c9072e49d5eaed64a3e975411ebe7cf9baf SHA1 ca8e349a4e98c81d8492bef08c4db0d4e4f5cee9 SHA256 d49d74da70f522d8c7d7605b6d683f7750f906f6a0876c47603828ed63e1ab36
258 -DIST firefox-4.0.1-tr.xpi 227124 RMD160 7dce476a04fdd338b0ca16e585ab51a62bb79461 SHA1 301fe0f38cce5c50ac82da9262f0732283be9b21 SHA256 4d4b80b81eb829053bb10a22b97c2515f60357ae9f25fb40d9bb35885da8bfc7
259 -DIST firefox-4.0.1-uk.xpi 260131 RMD160 7a4ea1bd3728037b6a72f2bffea2691433472429 SHA1 e55cfab8a580689688b8689e6f73be13b4215e0e SHA256 685acc732cabe069dfe006ee82c0f8be5a7195b54c4bbf1556603cac4a347f4e
260 -DIST firefox-4.0.1-vi.xpi 239967 RMD160 15bcdf411cd432329d743c060c68d1cce16d7e56 SHA1 ff34a6697c4c02485d592da9849dbbcabdb87689 SHA256 78408acdada24372e27a2b0bc162d49b70accdcda506f56e6e700168c2434c2b
261 -DIST firefox-4.0.1-zu.xpi 227606 RMD160 4341384271eb8c3341f55512c301dcd9dc9fc542 SHA1 d171ff639bbcd5173e3dfd185fd7902da70815ad SHA256 6c8575e740f4058ee54be0f89a25994c25fca691499762b4036e190d03c24698
262 -DIST firefox-4.0.1.source.tar.bz2 65980273 RMD160 63faaae78b56db407a34454986361212382c838e SHA1 c89bc5106266aa0097a7be15be84555bd2649f03 SHA256 cf3a39877facc229a67760915341fe95095cca647faab3a7adcb70046105199c
263 -EBUILD firefox-4.0.1-r1.ebuild 8009 RMD160 ebac173dbe2df329e247646ac4aee4e2dfcbf306 SHA1 79230c70497625eaf44192255b1ff3292beeb90f SHA256 4f2739cdbdb66505acafe7a216f86eb3eb576bb7fb23bb116bc95a053c3611b0
264 +DIST firefox-5.0-patches-0.3.tar.bz2 14956 RMD160 905688afd3339d791faeacd4930022bcc92d146d SHA1 8c7fa871bef5e02a71d4fac195ce4c8ab8ce0eda SHA256 f0d72278018ed443ca1fe07fd69e612fc3bf9a0e3ee6fc15c5a1700df3126eef
265 +DIST firefox-5.0b2.source.tar.bz2 68883059 RMD160 948509c32a35f224d77eb22ebe3e87b99148754c SHA1 1466717db96c992691b32dba28a32ccefb5d0b9d SHA256 634e963b03ba460617771e19e138ac124894165aebc81afc535c22dbda0766fc
266 +EBUILD firefox-5.0_beta2.ebuild 8478 RMD160 8aace231bb39d5d911a696bbc758ce0b49dd9d61 SHA1 096dcd4b7c574e98c1e500de156d10c8ec0cd02a SHA256 596daa7f737f23b3ebefb37411b3635460350b5e8cbf32d0418b2b9beced1d21
267
268 diff --git a/www-client/firefox/files/fix_omnijar_startupcache_breakage.patch b/www-client/firefox/files/fix_omnijar_startupcache_breakage.patch
269 new file mode 100644
270 index 0000000..ccb63c6
271 --- /dev/null
272 +++ b/www-client/firefox/files/fix_omnijar_startupcache_breakage.patch
273 @@ -0,0 +1,26 @@
274 +# HG changeset patch
275 +# Parent 321c235ffaf41a77747672f46c43aa024490b8e4
276 +
277 +diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in
278 +--- a/browser/installer/Makefile.in
279 ++++ b/browser/installer/Makefile.in
280 +@@ -118,9 +118,8 @@
281 + endif
282 +
283 + ifneq (1_,$(if $(CROSS_COMPILE),1,0)_$(UNIVERSAL_BINARY))
284 +-ifdef RUN_TEST_PROGRAM
285 +-_ABS_RUN_TEST_PROGRAM = $(call core_abspath,$(RUN_TEST_PROGRAM))
286 +-endif
287 ++ifndef RUN_TEST_PROGRAM
288 ++_ABS_RUN_TEST_PROGRAM = /usr/lib64/xulrunner-devel-5.0
289 +
290 + GENERATE_CACHE = \
291 + $(_ABS_RUN_TEST_PROGRAM) $(_ABS_DIST)/bin/xpcshell$(BIN_SUFFIX) -g "$$PWD" -f $(topsrcdir)/browser/installer/precompile_cache.js -e 'populate_startupcache("omni.jar", "startupCache.zip");' && \
292 +@@ -130,6 +129,7 @@
293 + find jsloader | xargs touch -t 201001010000 && \
294 + $(ZIP) -r9mX omni.jar jsloader
295 + endif
296 ++endif
297 +
298 + include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
299 +
300
301 diff --git a/www-client/firefox/firefox-4.0.1-r1.ebuild b/www-client/firefox/firefox-5.0_beta2.ebuild
302 similarity index 93%
303 rename from www-client/firefox/firefox-4.0.1-r1.ebuild
304 rename to www-client/firefox/firefox-5.0_beta2.ebuild
305 index fa685bd..2dcbede 100644
306 --- a/www-client/firefox/firefox-4.0.1-r1.ebuild
307 +++ b/www-client/firefox/firefox-5.0_beta2.ebuild
308 @@ -7,14 +7,14 @@ WANT_AUTOCONF="2.1"
309
310 inherit flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-3 makeedit multilib pax-utils fdo-mime autotools mozextension versionator python
311
312 -MAJ_XUL_PV="2.0"
313 +MAJ_XUL_PV="5.0"
314 MAJ_FF_PV="$(get_version_component_range 1-2)" # 3.5, 3.6, 4.0, etc.
315 XUL_PV="${MAJ_XUL_PV}${PV/${MAJ_FF_PV}/}" # 1.9.3_alpha6, 1.9.2.3, etc.
316 FF_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
317 FF_PV="${FF_PV/_beta/b}" # Handle beta for SRC_URI
318 FF_PV="${FF_PV/_rc/rc}" # Handle rc for SRC_URI
319 CHANGESET="e56ecd8b3a68"
320 -PATCH="${PN}-4.0-patches-1.0"
321 +PATCH="${PN}-5.0-patches-0.3"
322
323 DESCRIPTION="Firefox Web Browser"
324 HOMEPAGE="http://www.mozilla.com/firefox"
325 @@ -25,6 +25,7 @@ LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
326 IUSE="bindist +ipc system-sqlite +webm"
327
328 REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases"
329 +FTP_URI="ftp://ftp.mozilla.org/pub/firefox/releases/"
330 # More URIs appended below...
331 SRC_URI="http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2"
332
333 @@ -49,10 +50,14 @@ DEPEND="${RDEPEND}
334 amd64? ( ${ASM_DEPEND} ) )"
335
336 # No source releases for alpha|beta
337 -if [[ ${PV} =~ alpha|beta ]]; then
338 +if [[ ${PV} =~ alpha ]]; then
339 SRC_URI="${SRC_URI}
340 http://dev.gentoo.org/~anarchy/mozilla/firefox/firefox-${FF_PV}_${CHANGESET}.source.tar.bz2"
341 S="${WORKDIR}/mozilla-central"
342 +elif [[ ${PV} =~ beta ]]; then
343 + SRC_URI="${SRC_URI}
344 + ${FTP_URI}/${FF_PV}/source/firefox-${FF_PV}.source.tar.bz2"
345 + S="${WORKDIR}/mozilla-beta"
346 else
347 SRC_URI="${SRC_URI}
348 ${REL_URI}/${FF_PV}/source/firefox-${FF_PV}.source.tar.bz2"
349 @@ -139,6 +144,7 @@ src_prepare() {
350 epatch "${WORKDIR}"
351
352 epatch "${FILESDIR}"/fix-preferences-gentoo.patch
353 + epatch "${FILESDIR}"/fix_omnijar_startupcache_breakage.patch
354
355 # Allow user to apply any additional patches without modifing ebuild
356 epatch_user
357 @@ -177,6 +183,7 @@ src_configure() {
358 mozconfig_annotate '' --enable-system-ffi
359 mozconfig_annotate '' --with-system-libxul
360 mozconfig_annotate '' --with-libxul-sdk="${EPREFIX}"/usr/$(get_libdir)/xulrunner-devel-${MAJ_XUL_PV}
361 + # mozconfig_annotate '' --enable-chrome-format=jar
362
363 # Other ff-specific settings
364 mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
365 @@ -248,6 +255,11 @@ src_install() {
366
367 pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/firefox
368
369 +
370 + # Must symlink xulrunner into firefox directory now
371 + dosym ../xulrunner-"${MAJ_XUL_PV}" "${MOZILLA_FIVE_HOME}"/xulrunner \
372 + || die "failed to setup xulrunner"
373 +
374 # Plugins dir
375 dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins \
376 || die "failed to symlink"