Gentoo Archives: gentoo-commits

From: "Nirbheek Chauhan (nirbheek)" <nirbheek@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-client/firefox-bin: ChangeLog firefox-bin-3.6.17.ebuild firefox-bin-3.6.18.ebuild firefox-bin-3.6.20.ebuild firefox-bin-3.6.21.ebuild
Date: Wed, 31 Aug 2011 20:03:24
Message-Id: 20110831200314.2F8492004C@flycatcher.gentoo.org
1 nirbheek 11/08/31 20:03:14
2
3 Modified: ChangeLog firefox-bin-3.6.17.ebuild
4 firefox-bin-3.6.18.ebuild firefox-bin-3.6.20.ebuild
5 Added: firefox-bin-3.6.21.ebuild
6 Log:
7 Bump to 3.6.21, certificate blacklisting security release. Fix SRC_URI, bug 375197.
8
9 (Portage version: 2.2.0_alpha51/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.66 www-client/firefox-bin/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox-bin/ChangeLog?rev=1.66&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox-bin/ChangeLog?rev=1.66&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox-bin/ChangeLog?r1=1.65&r2=1.66
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v
21 retrieving revision 1.65
22 retrieving revision 1.66
23 diff -u -r1.65 -r1.66
24 --- ChangeLog 29 Aug 2011 21:37:05 -0000 1.65
25 +++ ChangeLog 31 Aug 2011 20:03:14 -0000 1.66
26 @@ -1,6 +1,14 @@
27 # ChangeLog for www-client/firefox-bin
28 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v 1.65 2011/08/29 21:37:05 hwoarang Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v 1.66 2011/08/31 20:03:14 nirbheek Exp $
31 +
32 +*firefox-bin-3.6.21 (31 Aug 2011)
33 +
34 + 31 Aug 2011; Nirbheek Chauhan <nirbheek@g.o>
35 + firefox-bin-3.6.17.ebuild, firefox-bin-3.6.18.ebuild,
36 + firefox-bin-3.6.20.ebuild, +firefox-bin-3.6.21.ebuild:
37 + Bump to 3.6.21, certificate blacklisting security release. Fix SRC_URI, bug
38 + 375197.
39
40 29 Aug 2011; Markos Chandras <hwoarang@g.o> firefox-bin-3.6.20.ebuild:
41 Stable on amd64 wrt bug #380913
42
43
44
45 1.4 www-client/firefox-bin/firefox-bin-3.6.17.ebuild
46
47 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox-bin/firefox-bin-3.6.17.ebuild?rev=1.4&view=markup
48 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox-bin/firefox-bin-3.6.17.ebuild?rev=1.4&content-type=text/plain
49 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox-bin/firefox-bin-3.6.17.ebuild?r1=1.3&r2=1.4
50
51 Index: firefox-bin-3.6.17.ebuild
52 ===================================================================
53 RCS file: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-3.6.17.ebuild,v
54 retrieving revision 1.3
55 retrieving revision 1.4
56 diff -u -r1.3 -r1.4
57 --- firefox-bin-3.6.17.ebuild 1 May 2011 16:47:47 -0000 1.3
58 +++ firefox-bin-3.6.17.ebuild 31 Aug 2011 20:03:14 -0000 1.4
59 @@ -1,6 +1,6 @@
60 # Copyright 1999-2011 Gentoo Foundation
61 # Distributed under the terms of the GNU General Public License v2
62 -# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-3.6.17.ebuild,v 1.3 2011/05/01 16:47:47 phajdan.jr Exp $
63 +# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-3.6.17.ebuild,v 1.4 2011/08/31 20:03:14 nirbheek Exp $
64
65 EAPI="2"
66
67 @@ -19,7 +19,7 @@
68 MY_P="${MY_PN}-${MY_PV}"
69
70 DESCRIPTION="Firefox Web Browser"
71 -REL_URI="http://releases.mozilla.org/pub/mozilla.org/${MY_PN}/releases/"
72 +REL_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MY_PN}/releases/"
73 SRC_URI="${REL_URI}/${MY_PV}/linux-i686/en-US/${MY_P}.tar.bz2
74 mirror://gentoo/libnotify.so.1.bz2"
75 HOMEPAGE="http://www.mozilla.com/firefox"
76
77
78
79 1.2 www-client/firefox-bin/firefox-bin-3.6.18.ebuild
80
81 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox-bin/firefox-bin-3.6.18.ebuild?rev=1.2&view=markup
82 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox-bin/firefox-bin-3.6.18.ebuild?rev=1.2&content-type=text/plain
83 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox-bin/firefox-bin-3.6.18.ebuild?r1=1.1&r2=1.2
84
85 Index: firefox-bin-3.6.18.ebuild
86 ===================================================================
87 RCS file: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-3.6.18.ebuild,v
88 retrieving revision 1.1
89 retrieving revision 1.2
90 diff -u -r1.1 -r1.2
91 --- firefox-bin-3.6.18.ebuild 23 Jun 2011 14:12:11 -0000 1.1
92 +++ firefox-bin-3.6.18.ebuild 31 Aug 2011 20:03:14 -0000 1.2
93 @@ -1,6 +1,6 @@
94 # Copyright 1999-2011 Gentoo Foundation
95 # Distributed under the terms of the GNU General Public License v2
96 -# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-3.6.18.ebuild,v 1.1 2011/06/23 14:12:11 polynomial-c Exp $
97 +# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-3.6.18.ebuild,v 1.2 2011/08/31 20:03:14 nirbheek Exp $
98
99 EAPI="2"
100
101 @@ -19,7 +19,7 @@
102 MY_P="${MY_PN}-${MY_PV}"
103
104 DESCRIPTION="Firefox Web Browser"
105 -REL_URI="http://releases.mozilla.org/pub/mozilla.org/${MY_PN}/releases/"
106 +REL_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MY_PN}/releases/"
107 SRC_URI="${REL_URI}/${MY_PV}/linux-i686/en-US/${MY_P}.tar.bz2
108 mirror://gentoo/libnotify.so.1.bz2"
109 HOMEPAGE="http://www.mozilla.com/firefox"
110
111
112
113 1.3 www-client/firefox-bin/firefox-bin-3.6.20.ebuild
114
115 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox-bin/firefox-bin-3.6.20.ebuild?rev=1.3&view=markup
116 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox-bin/firefox-bin-3.6.20.ebuild?rev=1.3&content-type=text/plain
117 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox-bin/firefox-bin-3.6.20.ebuild?r1=1.2&r2=1.3
118
119 Index: firefox-bin-3.6.20.ebuild
120 ===================================================================
121 RCS file: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-3.6.20.ebuild,v
122 retrieving revision 1.2
123 retrieving revision 1.3
124 diff -u -r1.2 -r1.3
125 --- firefox-bin-3.6.20.ebuild 29 Aug 2011 21:37:05 -0000 1.2
126 +++ firefox-bin-3.6.20.ebuild 31 Aug 2011 20:03:14 -0000 1.3
127 @@ -1,6 +1,6 @@
128 # Copyright 1999-2011 Gentoo Foundation
129 # Distributed under the terms of the GNU General Public License v2
130 -# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-3.6.20.ebuild,v 1.2 2011/08/29 21:37:05 hwoarang Exp $
131 +# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-3.6.20.ebuild,v 1.3 2011/08/31 20:03:14 nirbheek Exp $
132
133 EAPI="2"
134
135 @@ -19,7 +19,7 @@
136 MY_P="${MY_PN}-${MY_PV}"
137
138 DESCRIPTION="Firefox Web Browser"
139 -REL_URI="http://releases.mozilla.org/pub/mozilla.org/${MY_PN}/releases/"
140 +REL_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MY_PN}/releases/"
141 SRC_URI="${REL_URI}/${MY_PV}/linux-i686/en-US/${MY_P}.tar.bz2
142 mirror://gentoo/libnotify.so.1.bz2"
143 HOMEPAGE="http://www.mozilla.com/firefox"
144
145
146
147 1.1 www-client/firefox-bin/firefox-bin-3.6.21.ebuild
148
149 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox-bin/firefox-bin-3.6.21.ebuild?rev=1.1&view=markup
150 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox-bin/firefox-bin-3.6.21.ebuild?rev=1.1&content-type=text/plain
151
152 Index: firefox-bin-3.6.21.ebuild
153 ===================================================================
154 # Copyright 1999-2011 Gentoo Foundation
155 # Distributed under the terms of the GNU General Public License v2
156 # $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-3.6.21.ebuild,v 1.1 2011/08/31 20:03:14 nirbheek Exp $
157
158 EAPI="2"
159
160 inherit eutils mozilla-launcher multilib mozextension
161
162 # Can be updated using scripts/get_langs.sh from mozilla overlay
163 # '\' at EOL is needed for ${LANG} matching in linguas() below
164 LANGS="af ar as be bg bn-BD bn-IN ca cs cy da de el en en-GB en-US eo es-AR \
165 es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gl gu-IN he hi-IN hr hu id is it \
166 ja ka kk kn ko ku lt lv mk ml mr nb-NO nl nn-NO oc or pa-IN pl pt-BR pt-PT rm \
167 ro ru si sk sl sq sr sv-SE ta ta-LK te th tr uk vi zh-CN zh-TW"
168 NOSHORTLANGS="en-GB es-AR pt-BR zh-CN"
169
170 MY_PV="${PV/_rc/rc}"
171 MY_PN="${PN/-bin}"
172 MY_P="${MY_PN}-${MY_PV}"
173
174 DESCRIPTION="Firefox Web Browser"
175 REL_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MY_PN}/releases/"
176 SRC_URI="${REL_URI}/${MY_PV}/linux-i686/en-US/${MY_P}.tar.bz2
177 mirror://gentoo/libnotify.so.1.bz2"
178 HOMEPAGE="http://www.mozilla.com/firefox"
179 RESTRICT="strip mirror"
180
181 KEYWORDS="-* ~amd64 ~x86"
182 SLOT="0"
183 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
184 IUSE="startup-notification"
185
186 for X in ${LANGS} ; do
187 if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
188 SRC_URI="${SRC_URI}
189 linguas_${X/-/_}? ( ${REL_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> ${P/-bin/}-${X}.xpi )"
190 fi
191 IUSE="${IUSE} linguas_${X/-/_}"
192 # english is handled internally
193 if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then
194 if [ "${X}" != "en-US" ]; then
195 SRC_URI="${SRC_URI}
196 linguas_${X%%-*}? ( ${REL_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> ${P/-bin/}-${X}.xpi )"
197 fi
198 IUSE="${IUSE} linguas_${X%%-*}"
199 fi
200 done
201
202 DEPEND="app-arch/unzip"
203 RDEPEND="dev-libs/dbus-glib
204 x11-libs/libXrender
205 x11-libs/libXt
206 x11-libs/libXmu
207 x86? (
208 >=x11-libs/gtk+-2.2:2
209 >=media-libs/alsa-lib-1.0.16
210 )
211 amd64? (
212 >=app-emulation/emul-linux-x86-baselibs-20081109
213 >=app-emulation/emul-linux-x86-gtklibs-20081109
214 >=app-emulation/emul-linux-x86-soundlibs-20081109
215 )"
216
217 S="${WORKDIR}/${MY_PN}"
218
219 pkg_setup() {
220 # This is a binary x86 package => ABI=x86
221 # Please keep this in future versions
222 # Danny van Dyk <kugelfang@g.o> 2005/03/26
223 has_multilib_profile && ABI="x86"
224 }
225
226 linguas() {
227 local LANG SLANG
228 for LANG in ${LINGUAS}; do
229 if has ${LANG} en en_US; then
230 has en ${linguas} || linguas="${linguas:+"${linguas} "}en"
231 continue
232 elif has ${LANG} ${LANGS//-/_}; then
233 has ${LANG//_/-} ${linguas} || linguas="${linguas:+"${linguas} "}${LANG//_/-}"
234 continue
235 elif [[ " ${LANGS} " == *" ${LANG}-"* ]]; then
236 for X in ${LANGS}; do
237 if [[ "${X}" == "${LANG}-"* ]] && \
238 [[ " ${NOSHORTLANGS} " != *" ${X} "* ]]; then
239 has ${X} ${linguas} || linguas="${linguas:+"${linguas} "}${X}"
240 continue 2
241 fi
242 done
243 fi
244 ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA"
245 done
246 }
247
248 src_unpack() {
249 unpack ${MY_P}.tar.bz2
250 unpack libnotify.so.1.bz2
251
252 linguas
253 for X in ${linguas}; do
254 [[ ${X} != "en" ]] && xpi_unpack "${P/-bin/}-${X}.xpi"
255 done
256 if [[ ${linguas} != "" && ${linguas} != "en" ]]; then
257 einfo "Selected language packs (first will be default): ${linguas}"
258 fi
259 }
260
261 src_install() {
262 declare MOZILLA_FIVE_HOME=/opt/${MY_PN}
263
264 # Install icon and .desktop for menu entry
265 newicon "${S}"/chrome/icons/default/default48.png ${PN}-icon.png
266 domenu "${FILESDIR}"/${PN}.desktop
267
268 # Add StartupNotify=true bug 237317
269 if use startup-notification; then
270 echo "StartupNotify=true" >> "${D}"/usr/share/applications/${PN}.desktop
271 fi
272
273 # Install firefox in /opt
274 dodir ${MOZILLA_FIVE_HOME%/*}
275 mv "${S}" "${D}"${MOZILLA_FIVE_HOME}
276
277 linguas
278 for X in ${linguas}; do
279 [[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P/-bin/}-${X}"
280 done
281
282 local LANG=${linguas%% *}
283 if [[ -n ${LANG} && ${LANG} != "en" ]]; then
284 elog "Setting default locale to ${LANG}"
285 sed -e "s:general.useragent.locale\", \"en-US\":general.useragent.locale\", \"${LANG}\":" \
286 -i "${D}${MOZILLA_FIVE_HOME}"/defaults/pref/${MY_PN}.js \
287 -i "${D}${MOZILLA_FIVE_HOME}"/defaults/pref/${MY_PN}-l10n.js || \
288 die "sed failed to change locale"
289 fi
290
291 # Create /usr/bin/firefox-bin
292 if use amd64 ; then
293 dodir /usr/bin/
294 cat <<EOF >"${D}"/usr/bin/${PN}
295 #!/bin/sh
296 unset LD_PRELOAD
297 LD_LIBRARY_PATH="/opt/firefox/"
298 GTK_PATH=/usr/lib32/gtk-2.0/
299 exec /opt/${MY_PN}/${MY_PN} "\$@"
300 EOF
301 else
302 dodir /usr/bin/
303 cat <<EOF >"${D}"/usr/bin/${PN}
304 #!/bin/sh
305 unset LD_PRELOAD
306 LD_LIBRARY_PATH="/opt/firefox/"
307 GTK_PATH=/usr/lib32/gtk-2.0/
308 exec /opt/${MY_PN}/${MY_PN} "\$@"
309 EOF
310 fi
311 fperms 0755 /usr/bin/${PN}
312
313 # revdep-rebuild entry
314 insinto /etc/revdep-rebuild
315 doins "${FILESDIR}"/10${PN} || die
316
317 rm -rf "${D}"${MOZILLA_FIVE_HOME}/plugins
318 dosym /usr/"$(get_libdir)"/nsbrowser/plugins ${MOZILLA_FIVE_HOME}/plugins || die
319
320 # This is a copy of 32bit libnotify.so.1 from app-emulation/emul-linux-x86-gtklibs-20110129.
321 # http://bugs.gentoo.org/show_bug.cgi?id=360443.
322 exeinto /opt/firefox
323 doexe "${WORKDIR}"/libnotify.so.1 || die
324 }
325
326 pkg_postinst() {
327 if use x86; then
328 if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
329 || ! has_version 'net-misc/curl'; then
330 einfo
331 einfo "For using the crashreporter, you need gnome-base/gconf,"
332 einfo "gnome-base/orbit and net-misc/curl emerged."
333 einfo
334 fi
335 if has_version 'net-misc/curl[nss]'; then
336 einfo
337 einfo "Crashreporter won't be able to send reports"
338 einfo "if you have curl emerged with the nss USE-flag"
339 einfo
340 fi
341 else
342 einfo
343 einfo "NB: You just installed a 32-bit ${MY_P}"
344 einfo
345 einfo "Crashreporter won't work on amd64"
346 einfo
347 fi
348 }
349
350 pkg_postrm() {
351 update_mozilla_launcher_symlinks
352 }