Gentoo Archives: gentoo-commits

From: "Jory Pratt (anarchy)" <anarchy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-client/firefox-bin: ChangeLog firefox-bin-3.6.3.ebuild
Date: Mon, 05 Apr 2010 05:18:58
Message-Id: E1Nyehy-0003wF-Bm@stork.gentoo.org
1 anarchy 10/04/05 05:18:46
2
3 Modified: ChangeLog
4 Added: firefox-bin-3.6.3.ebuild
5 Log:
6 Security Bump
7 (Portage version: 2.1.8.3/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.12 www-client/firefox-bin/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/firefox-bin/ChangeLog?rev=1.12&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/firefox-bin/ChangeLog?rev=1.12&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/firefox-bin/ChangeLog?r1=1.11&r2=1.12
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v
19 retrieving revision 1.11
20 retrieving revision 1.12
21 diff -u -r1.11 -r1.12
22 --- ChangeLog 24 Mar 2010 18:04:41 -0000 1.11
23 +++ ChangeLog 5 Apr 2010 05:18:46 -0000 1.12
24 @@ -1,6 +1,11 @@
25 # ChangeLog for www-client/firefox-bin
26 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v 1.11 2010/03/24 18:04:41 armin76 Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v 1.12 2010/04/05 05:18:46 anarchy Exp $
29 +
30 +*firefox-bin-3.6.3 (05 Apr 2010)
31 +
32 + 05 Apr 2010; <anarchy@g.o> +firefox-bin-3.6.3.ebuild:
33 + Security Bump
34
35 *firefox-bin-3.6.2 (24 Mar 2010)
36
37
38
39
40 1.1 www-client/firefox-bin/firefox-bin-3.6.3.ebuild
41
42 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/firefox-bin/firefox-bin-3.6.3.ebuild?rev=1.1&view=markup
43 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/firefox-bin/firefox-bin-3.6.3.ebuild?rev=1.1&content-type=text/plain
44
45 Index: firefox-bin-3.6.3.ebuild
46 ===================================================================
47 # Copyright 1999-2010 Gentoo Foundation
48 # Distributed under the terms of the GNU General Public License v2
49 # $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-3.6.3.ebuild,v 1.1 2010/04/05 05:18:46 anarchy Exp $
50 EAPI="2"
51
52 inherit eutils mozilla-launcher multilib mozextension
53
54 LANGS="af ar be bg bn-IN ca cs cy da de el en-GB en-US eo es-AR es-ES et eu fa fi fr fy-NL ga-IE gl gu-IN he hi-IN hu id is it ja ka kk kn ko ku lt lv mk mr nb-NO nl nn-NO oc pa-IN pl pt-BR pt-PT ro ru si sk sl sq sr sv-SE ta te th uk vi zh-CN zh-TW"
55 NOSHORTLANGS="en-GB es-AR pt-BR zh-CN"
56
57 MY_PV="${PV/_rc/rc}"
58 MY_PN="${PN/-bin}"
59 MY_P="${MY_PN}-${MY_PV}"
60
61 DESCRIPTION="Firefox Web Browser"
62 REL_URI="http://releases.mozilla.org/pub/mozilla.org/${MY_PN}/releases/"
63 SRC_URI="${REL_URI}/${MY_PV}/linux-i686/en-US/${MY_P}.tar.bz2"
64 HOMEPAGE="http://www.mozilla.com/firefox"
65 RESTRICT="strip mirror"
66
67 KEYWORDS="-* ~amd64 ~x86"
68 SLOT="0"
69 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
70 IUSE="restrict-javascript startup-notification"
71
72 for X in ${LANGS} ; do
73 if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
74 SRC_URI="${SRC_URI}
75 linguas_${X/-/_}? ( ${REL_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> ${MY_P}-${X}.xpi )"
76 fi
77 IUSE="${IUSE} linguas_${X/-/_}"
78 # english is handled internally
79 if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then
80 if [ "${X}" != "en-US" ]; then
81 SRC_URI="${SRC_URI}
82 linguas_${X%%-*}? ( ${REL_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> ${MY_P}-${X}.xpi )"
83 fi
84 IUSE="${IUSE} linguas_${X%%-*}"
85 fi
86 done
87
88 DEPEND="app-arch/unzip"
89 RDEPEND="dev-libs/dbus-glib
90 x11-libs/libXrender
91 x11-libs/libXt
92 x11-libs/libXmu
93 x86? (
94 >=x11-libs/gtk+-2.2
95 >=media-libs/alsa-lib-1.0.16
96 )
97 amd64? (
98 >=app-emulation/emul-linux-x86-baselibs-20081109
99 >=app-emulation/emul-linux-x86-gtklibs-20081109
100 >=app-emulation/emul-linux-x86-soundlibs-20081109
101 )"
102
103 PDEPEND="restrict-javascript? ( www-plugins/noscript )"
104
105 S="${WORKDIR}/${MY_PN}"
106
107 pkg_setup() {
108 # This is a binary x86 package => ABI=x86
109 # Please keep this in future versions
110 # Danny van Dyk <kugelfang@g.o> 2005/03/26
111 has_multilib_profile && ABI="x86"
112 }
113
114 linguas() {
115 local LANG SLANG
116 for LANG in ${LINGUAS}; do
117 if has ${LANG} en en_US; then
118 has en ${linguas} || linguas="${linguas:+"${linguas} "}en"
119 continue
120 elif has ${LANG} ${LANGS//-/_}; then
121 has ${LANG//_/-} ${linguas} || linguas="${linguas:+"${linguas} "}${LANG//_/-}"
122 continue
123 elif [[ " ${LANGS} " == *" ${LANG}-"* ]]; then
124 for X in ${LANGS}; do
125 if [[ "${X}" == "${LANG}-"* ]] && \
126 [[ " ${NOSHORTLANGS} " != *" ${X} "* ]]; then
127 has ${X} ${linguas} || linguas="${linguas:+"${linguas} "}${X}"
128 continue 2
129 fi
130 done
131 fi
132 ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA"
133 done
134 }
135
136 src_unpack() {
137 unpack ${MY_P}.tar.bz2
138
139 linguas
140 for X in ${linguas}; do
141 [[ ${X} != "en" ]] && xpi_unpack "${MY_P}-${X}.xpi"
142 done
143 if [[ ${linguas} != "" && ${linguas} != "en" ]]; then
144 einfo "Selected language packs (first will be default): ${linguas}"
145 fi
146 }
147
148 src_install() {
149 declare MOZILLA_FIVE_HOME=/opt/${MY_PN}
150
151 # Install icon and .desktop for menu entry
152 newicon "${S}"/chrome/icons/default/default48.png ${PN}-icon.png
153 domenu "${FILESDIR}"/${PN}.desktop
154
155 # Add StartupNotify=true bug 237317
156 if use startup-notification; then
157 echo "StartupNotify=true" >> "${D}"/usr/share/applications/${PN}.desktop
158 fi
159
160 # Install firefox in /opt
161 dodir ${MOZILLA_FIVE_HOME%/*}
162 mv "${S}" "${D}"${MOZILLA_FIVE_HOME}
163
164 linguas
165 for X in ${linguas}; do
166 [[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P/-bin/}-${X}"
167 done
168
169 local LANG=${linguas%% *}
170 if [[ -n ${LANG} && ${LANG} != "en" ]]; then
171 elog "Setting default locale to ${LANG}"
172 sed -e "s:general.useragent.locale\", \"en-US\":general.useragent.locale\", \"${LANG}\":" \
173 -i "${D}${MOZILLA_FIVE_HOME}"/defaults/pref/${MY_PN}.js \
174 -i "${D}${MOZILLA_FIVE_HOME}"/defaults/pref/${MY_PN}-l10n.js || \
175 die "sed failed to change locale"
176 fi
177
178 # Create /usr/bin/firefox-bin
179 dodir /usr/bin/
180 cat <<EOF >"${D}"/usr/bin/${PN}
181 #!/bin/sh
182 unset LD_PRELOAD
183 LD_LIBRARY_PATH="/opt/firefox/"
184 exec /opt/${MY_PN}/${MY_PN} "\$@"
185 EOF
186 fperms 0755 /usr/bin/${PN}
187
188 # revdep-rebuild entry
189 insinto /etc/revdep-rebuild
190 doins "${FILESDIR}"/10${PN} || die
191
192 rm -rf "${D}"${MOZILLA_FIVE_HOME}/plugins
193 dosym /usr/"$(get_libdir)"/nsbrowser/plugins ${MOZILLA_FIVE_HOME}/plugins || die
194 }
195
196 pkg_postinst() {
197 if use x86; then
198 if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
199 || ! has_version 'net-misc/curl'; then
200 einfo
201 einfo "For using the crashreporter, you need gnome-base/gconf,"
202 einfo "gnome-base/orbit and net-misc/curl emerged."
203 einfo
204 fi
205 if has_version 'net-misc/curl' && built_with_use --missing \
206 true 'net-misc/curl' nss; then
207 einfo
208 einfo "Crashreporter won't be able to send reports"
209 einfo "if you have curl emerged with the nss USE-flag"
210 einfo
211 fi
212 else
213 einfo
214 einfo "NB: You just installed a 32-bit ${MY_P}"
215 einfo
216 einfo "Crashreporter won't work on amd64"
217 einfo
218 fi
219 update_mozilla_launcher_symlinks
220 }
221
222 pkg_postrm() {
223 update_mozilla_launcher_symlinks
224 }