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

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