Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Jeff Horelick (jdhore)" <jdhore@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-client/firefox-bin: firefox-bin-10.0.11.ebuild firefox-bin-17.0.ebuild ChangeLog
Date: Thu, 22 Nov 2012 06:51:10
Message-Id: 20121122065057.5121A20C65@flycatcher.gentoo.org
1 jdhore 12/11/22 06:50:57
2
3 Modified: ChangeLog
4 Added: firefox-bin-10.0.11.ebuild firefox-bin-17.0.ebuild
5 Log:
6 Version bump on ESR and mainline branches.
7
8 (Portage version: 2.2.0_alpha142/cvs/Linux i686, signed Manifest commit with key 23E9E900)
9
10 Revision Changes Path
11 1.126 www-client/firefox-bin/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox-bin/ChangeLog?rev=1.126&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox-bin/ChangeLog?rev=1.126&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox-bin/ChangeLog?r1=1.125&r2=1.126
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v
20 retrieving revision 1.125
21 retrieving revision 1.126
22 diff -u -r1.125 -r1.126
23 --- ChangeLog 3 Nov 2012 12:31:25 -0000 1.125
24 +++ ChangeLog 22 Nov 2012 06:50:57 -0000 1.126
25 @@ -1,6 +1,13 @@
26 # ChangeLog for www-client/firefox-bin
27 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v 1.125 2012/11/03 12:31:25 ago Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v 1.126 2012/11/22 06:50:57 jdhore Exp $
30 +
31 +*firefox-bin-17.0 (22 Nov 2012)
32 +*firefox-bin-10.0.11 (22 Nov 2012)
33 +
34 + 22 Nov 2012; Jeff Horelick <jdhore@g.o> +firefox-bin-10.0.11.ebuild,
35 + +firefox-bin-17.0.ebuild:
36 + Version bump on ESR and mainline branches.
37
38 03 Nov 2012; <ago@g.o> firefox-bin-10.0.10.ebuild:
39 Stable for amd64, wrt bug #439960
40
41
42
43 1.1 www-client/firefox-bin/firefox-bin-10.0.11.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox-bin/firefox-bin-10.0.11.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox-bin/firefox-bin-10.0.11.ebuild?rev=1.1&content-type=text/plain
47
48 Index: firefox-bin-10.0.11.ebuild
49 ===================================================================
50 # Copyright 1999-2012 Gentoo Foundation
51 # Distributed under the terms of the GNU General Public License v2
52 # $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-10.0.11.ebuild,v 1.1 2012/11/22 06:50:57 jdhore Exp $
53
54 EAPI="4"
55 MOZ_ESR="1"
56
57 # Can be updated using scripts/get_langs.sh from mozilla overlay
58 MOZ_LANGS=(af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb cy da de el en
59 en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl
60 gu-IN he hi-IN hr hu hy-AM id is it ja kk kn ko ku lg lt lv mai mk ml mr nb-NO
61 nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta ta-LK
62 te th tr uk vi zh-CN zh-TW zu)
63
64 # Convert the ebuild version to the upstream mozilla version, used by mozlinguas
65 MOZ_PV="${PV/_beta/b}" # Handle beta for SRC_URI
66 MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
67 MOZ_PN="${PN/-bin}"
68
69 if [[ ${MOZ_ESR} == 1 ]]; then
70 # ESR releases have slightly version numbers
71 MOZ_PV="${MOZ_PV}esr"
72 fi
73
74 MOZ_P="${MOZ_PN}-${MOZ_PV}"
75
76 # Upstream ftp release URI that's used by mozlinguas.eclass
77 # We don't use the http mirror because it deletes old tarballs.
78 MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
79
80 inherit eutils multilib pax-utils fdo-mime gnome2-utils mozlinguas nsplugins
81
82 DESCRIPTION="Firefox Web Browser"
83 MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases"
84 SRC_URI="${SRC_URI}
85 amd64? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
86 x86? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
87 HOMEPAGE="http://www.mozilla.com/firefox"
88 RESTRICT="strip mirror binchecks"
89
90 KEYWORDS="-* ~amd64 ~x86"
91 SLOT="0"
92 LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
93 IUSE="startup-notification"
94
95 DEPEND="app-arch/unzip"
96 RDEPEND="dev-libs/dbus-glib
97 virtual/freedesktop-icon-theme
98 x11-libs/libXrender
99 x11-libs/libXt
100 x11-libs/libXmu
101
102 >=x11-libs/gtk+-2.2:2
103 >=media-libs/alsa-lib-1.0.16
104 "
105
106 S="${WORKDIR}/${MOZ_PN}"
107
108 src_unpack() {
109 unpack ${A}
110
111 # Unpack language packs
112 mozlinguas_src_unpack
113 }
114
115 src_install() {
116 declare MOZILLA_FIVE_HOME=/opt/${MOZ_PN}
117
118 # Install icon and .desktop for menu entry
119 newicon "${S}"/chrome/icons/default/default48.png ${PN}-icon.png
120 domenu "${FILESDIR}"/${PN}.desktop
121
122 # Add StartupNotify=true bug 237317
123 if use startup-notification; then
124 echo "StartupNotify=true" >> "${D}"/usr/share/applications/${PN}.desktop
125 fi
126
127 # Install firefox in /opt
128 dodir ${MOZILLA_FIVE_HOME%/*}
129 mv "${S}" "${D}"${MOZILLA_FIVE_HOME} || die
130
131 # Fix prefs that make no sense for a system-wide install
132 insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
133 doins "${FILESDIR}"/${PN}-prefs.js || die
134
135 # Install language packs
136 mozlinguas_src_install
137
138 local LANG=${linguas%% *}
139 if [[ -n ${LANG} && ${LANG} != "en" ]]; then
140 elog "Setting default locale to ${LANG}"
141 echo "pref(\"general.useragent.locale\", \"${LANG}\");" \
142 >> "${D}${MOZILLA_FIVE_HOME}"/defaults/pref/${PN}-prefs.js || \
143 die "sed failed to change locale"
144 fi
145
146 # Create /usr/bin/firefox-bin
147 dodir /usr/bin/
148 cat <<-EOF >"${D}"/usr/bin/${PN}
149 #!/bin/sh
150 unset LD_PRELOAD
151 LD_LIBRARY_PATH="/opt/firefox/"
152 GTK_PATH=/usr/lib/gtk-2.0/
153 exec /opt/${MOZ_PN}/${MOZ_PN} "\$@"
154 EOF
155 fperms 0755 /usr/bin/${PN}
156
157 # revdep-rebuild entry
158 insinto /etc/revdep-rebuild
159 doins "${FILESDIR}"/10${PN} || die
160
161 # Plugins dir
162 share_plugins_dir
163
164 # Required in order to use plugins and even run firefox on hardened.
165 pax-mark mr "${ED}"/${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
166 }
167
168 pkg_preinst() {
169 gnome2_icon_savelist
170 }
171
172 pkg_postinst() {
173 if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
174 || ! has_version 'net-misc/curl'; then
175 einfo
176 einfo "For using the crashreporter, you need gnome-base/gconf,"
177 einfo "gnome-base/orbit and net-misc/curl emerged."
178 einfo
179 fi
180 # Drop requirement of curl not built with nss as it's not necessary anymore
181 #if has_version 'net-misc/curl[nss]'; then
182 # einfo
183 # einfo "Crashreporter won't be able to send reports"
184 # einfo "if you have curl emerged with the nss USE-flag"
185 # einfo
186 #fi
187
188 # Update mimedb for the new .desktop file
189 fdo-mime_desktop_database_update
190 gnome2_icon_cache_update
191 }
192
193 pkg_postrm() {
194 gnome2_icon_cache_update
195 }
196
197
198
199 1.1 www-client/firefox-bin/firefox-bin-17.0.ebuild
200
201 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox-bin/firefox-bin-17.0.ebuild?rev=1.1&view=markup
202 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox-bin/firefox-bin-17.0.ebuild?rev=1.1&content-type=text/plain
203
204 Index: firefox-bin-17.0.ebuild
205 ===================================================================
206 # Copyright 1999-2012 Gentoo Foundation
207 # Distributed under the terms of the GNU General Public License v2
208 # $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-17.0.ebuild,v 1.1 2012/11/22 06:50:57 jdhore Exp $
209
210 EAPI="4"
211
212 # Can be updated using scripts/get_langs.sh from mozilla overlay
213 MOZ_LANGS=(af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb cy da de el en
214 en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl
215 gu-IN he hi-IN hr hu hy-AM id is it ja kk kn ko ku lg lt lv mai mk ml mr nb-NO
216 nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta ta-LK
217 te th tr uk vi zh-CN zh-TW zu)
218
219 # Convert the ebuild version to the upstream mozilla version, used by mozlinguas
220 MOZ_PV="${PV/_beta/b}" # Handle beta for SRC_URI
221 MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
222 MOZ_PN="${PN/-bin}"
223 MOZ_P="${MOZ_PN}-${MOZ_PV}"
224
225 # Upstream ftp release URI that's used by mozlinguas.eclass
226 # We don't use the http mirror because it deletes old tarballs.
227 MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
228
229 inherit eutils multilib pax-utils fdo-mime gnome2-utils mozlinguas nsplugins
230
231 DESCRIPTION="Firefox Web Browser"
232 MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases"
233 SRC_URI="${SRC_URI}
234 amd64? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
235 x86? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
236 HOMEPAGE="http://www.mozilla.com/firefox"
237 RESTRICT="strip mirror binchecks"
238
239 KEYWORDS="-* ~amd64 ~x86"
240 SLOT="0"
241 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
242 IUSE="startup-notification"
243
244 DEPEND="app-arch/unzip"
245 RDEPEND="dev-libs/dbus-glib
246 virtual/freedesktop-icon-theme
247 x11-libs/libXrender
248 x11-libs/libXt
249 x11-libs/libXmu
250
251 >=x11-libs/gtk+-2.2:2
252 >=media-libs/alsa-lib-1.0.16
253
254 !net-libs/libproxy[spidermonkey]
255 "
256
257 S="${WORKDIR}/${MOZ_PN}"
258
259 src_unpack() {
260 unpack ${A}
261
262 # Unpack language packs
263 mozlinguas_src_unpack
264 }
265
266 src_install() {
267 declare MOZILLA_FIVE_HOME=/opt/${MOZ_PN}
268
269 # Install icon and .desktop for menu entry
270 newicon "${S}"/chrome/icons/default/default48.png ${PN}-icon.png
271 domenu "${FILESDIR}"/${PN}.desktop
272
273 # Add StartupNotify=true bug 237317
274 if use startup-notification; then
275 echo "StartupNotify=true" >> "${D}"/usr/share/applications/${PN}.desktop
276 fi
277
278 # Install firefox in /opt
279 dodir ${MOZILLA_FIVE_HOME%/*}
280 mv "${S}" "${D}"${MOZILLA_FIVE_HOME} || die
281
282 # Fix prefs that make no sense for a system-wide install
283 insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
284 doins "${FILESDIR}"/${PN}-prefs.js || die
285
286 # Install language packs
287 mozlinguas_src_install
288
289 local LANG=${linguas%% *}
290 if [[ -n ${LANG} && ${LANG} != "en" ]]; then
291 elog "Setting default locale to ${LANG}"
292 echo "pref(\"general.useragent.locale\", \"${LANG}\");" \
293 >> "${D}${MOZILLA_FIVE_HOME}"/defaults/pref/${PN}-prefs.js || \
294 die "sed failed to change locale"
295 fi
296
297 # Create /usr/bin/firefox-bin
298 dodir /usr/bin/
299 cat <<-EOF >"${D}"/usr/bin/${PN}
300 #!/bin/sh
301 unset LD_PRELOAD
302 LD_LIBRARY_PATH="/opt/firefox/"
303 GTK_PATH=/usr/lib/gtk-2.0/
304 exec /opt/${MOZ_PN}/${MOZ_PN} "\$@"
305 EOF
306 fperms 0755 /usr/bin/${PN}
307
308 # revdep-rebuild entry
309 insinto /etc/revdep-rebuild
310 doins "${FILESDIR}"/10${PN} || die
311
312 # Plugins dir
313 share_plugins_dir
314
315 # Required in order to use plugins and even run firefox on hardened.
316 pax-mark mr "${ED}"/${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
317 }
318
319 pkg_preinst() {
320 gnome2_icon_savelist
321 }
322
323 pkg_postinst() {
324 if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
325 || ! has_version 'net-misc/curl'; then
326 einfo
327 einfo "For using the crashreporter, you need gnome-base/gconf,"
328 einfo "gnome-base/orbit and net-misc/curl emerged."
329 einfo
330 fi
331 # Drop requirement of curl not built with nss as it's not necessary anymore
332 #if has_version 'net-misc/curl[nss]'; then
333 # einfo
334 # einfo "Crashreporter won't be able to send reports"
335 # einfo "if you have curl emerged with the nss USE-flag"
336 # einfo
337 #fi
338
339 # Update mimedb for the new .desktop file
340 fdo-mime_desktop_database_update
341 gnome2_icon_cache_update
342 }
343
344 pkg_postrm() {
345 gnome2_icon_cache_update
346 }
Report Message
Find on MARC Find on Google Groups