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

Gentoo Archives: gentoo-commits

From: "Raul Porcel (armin76)" <armin76@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-client/mozilla-firefox-bin: ChangeLog mozilla-firefox-bin-3.0_beta5.ebuild mozilla-firefox-bin-2.0.0.14.ebuild mozilla-firefox-bin-2.0.0.13.ebuild mozilla-firefox-bin-3.0_beta3.ebuild mozilla-firefox-bin-3.0_beta4.ebuild
Date: Sat, 19 Apr 2008 11:16:24
Message-Id: E1JnB3M-0006L2-7Y@stork.gentoo.org
1 armin76 08/04/19 11:16:20
2
3 Modified: ChangeLog mozilla-firefox-bin-3.0_beta5.ebuild
4 mozilla-firefox-bin-2.0.0.14.ebuild
5 mozilla-firefox-bin-2.0.0.13.ebuild
6 Removed: mozilla-firefox-bin-3.0_beta3.ebuild
7 mozilla-firefox-bin-3.0_beta4.ebuild
8 Log:
9 Fix linguas, bug #218147, don't use mozilla-launcher for 3.0
10 (Portage version: 2.1.5_rc4)
11
12 Revision Changes Path
13 1.132 www-client/mozilla-firefox-bin/ChangeLog
14
15 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/mozilla-firefox-bin/ChangeLog?rev=1.132&view=markup
16 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/mozilla-firefox-bin/ChangeLog?rev=1.132&content-type=text/plain
17 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/mozilla-firefox-bin/ChangeLog?r1=1.131&r2=1.132
18
19 Index: ChangeLog
20 ===================================================================
21 RCS file: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/ChangeLog,v
22 retrieving revision 1.131
23 retrieving revision 1.132
24 diff -u -r1.131 -r1.132
25 --- ChangeLog 18 Apr 2008 10:54:44 -0000 1.131
26 +++ ChangeLog 19 Apr 2008 11:16:19 -0000 1.132
27 @@ -1,6 +1,13 @@
28 # ChangeLog for www-client/mozilla-firefox-bin
29 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
30 -# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/ChangeLog,v 1.131 2008/04/18 10:54:44 armin76 Exp $
31 +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/ChangeLog,v 1.132 2008/04/19 11:16:19 armin76 Exp $
32 +
33 + 19 Apr 2008; Raúl Porcel <armin76@g.o>
34 + mozilla-firefox-bin-2.0.0.13.ebuild, mozilla-firefox-bin-2.0.0.14.ebuild,
35 + -mozilla-firefox-bin-3.0_beta3.ebuild,
36 + -mozilla-firefox-bin-3.0_beta4.ebuild,
37 + mozilla-firefox-bin-3.0_beta5.ebuild:
38 + Fix linguas, bug #218147, don't use mozilla-launcher for 3.0
39
40 18 Apr 2008; Raúl Porcel <armin76@g.o>
41 mozilla-firefox-bin-2.0.0.14.ebuild:
42
43
44
45 1.2 www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.0_beta5.ebuild
46
47 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.0_beta5.ebuild?rev=1.2&view=markup
48 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.0_beta5.ebuild?rev=1.2&content-type=text/plain
49 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.0_beta5.ebuild?r1=1.1&r2=1.2
50
51 Index: mozilla-firefox-bin-3.0_beta5.ebuild
52 ===================================================================
53 RCS file: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.0_beta5.ebuild,v
54 retrieving revision 1.1
55 retrieving revision 1.2
56 diff -u -r1.1 -r1.2
57 --- mozilla-firefox-bin-3.0_beta5.ebuild 2 Apr 2008 16:52:21 -0000 1.1
58 +++ mozilla-firefox-bin-3.0_beta5.ebuild 19 Apr 2008 11:16:19 -0000 1.2
59 @@ -1,10 +1,10 @@
60 # Copyright 1999-2008 Gentoo Foundation
61 # Distributed under the terms of the GNU General Public License v2
62 -# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.0_beta5.ebuild,v 1.1 2008/04/02 16:52:21 armin76 Exp $
63 +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.0_beta5.ebuild,v 1.2 2008/04/19 11:16:19 armin76 Exp $
64
65 -inherit eutils mozilla-launcher multilib mozextension
66 +inherit eutils multilib mozextension
67
68 -LANGS="af ar be ca cs de el en-GB es-AR es-ES eu fi fr fy-NL gu-IN he hu id it ja ka ko ku lt mk mn nb-NO nl nn-NO pa-IN pl pt-BR pt-PT ro ru sk sq sv-SE tr uk zh-CN zh-TW"
69 +LANGS="af ar be ca cs de el en en-GB es-AR es-ES eu fi fr fy-NL gu-IN he hu id it ja ka ko ku lt mk mn nb-NO nl nn-NO pa-IN pl pt-BR pt-PT ro ru sk sq sv-SE tr uk zh-CN zh-TW"
70 NOSHORTLANGS="en-GB es-AR pt-BR zh-CN"
71
72 MY_PV=${PV/_beta/b}
73 @@ -14,8 +14,8 @@
74 SRC_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${MY_PV}/linux-i686/en-US/firefox-${MY_PV}.tar.bz2"
75 HOMEPAGE="http://www.mozilla.com/firefox"
76 RESTRICT="strip"
77 -QA_EXECSTACK="opt/firefox/extensions/talkback@×××××××.org/components/libqfaservices.so"
78 -QA_TEXTRELS="opt/firefox/extensions/talkback@×××××××.org/components/libqfaservices.so"
79 +#QA_EXECSTACK="opt/firefox/extensions/talkback@×××××××.org/components/libqfaservices.so"
80 +#QA_TEXTRELS="opt/firefox/extensions/talkback@×××××××.org/components/libqfaservices.so"
81
82 KEYWORDS="-* ~amd64 ~x86"
83 SLOT="0"
84 @@ -23,8 +23,10 @@
85 IUSE="restrict-javascript"
86
87 for X in ${LANGS} ; do
88 - SRC_URI="${SRC_URI}
89 - linguas_${X/-/_}? ( http://dev.gentooexperimental.org/~armin76/dist/${MY_P/-bin}-xpi/${MY_P/-bin/}-${X}.xpi )"
90 + if [ "${X}" != "en" ]; then
91 + SRC_URI="${SRC_URI}
92 + linguas_${X/-/_}? ( http://dev.gentooexperimental.org/~armin76/dist/${MY_P/-bin}-xpi/${MY_P/-bin/}-${X}.xpi )"
93 + fi
94 IUSE="${IUSE} linguas_${X/-/_}"
95 # english is handled internally
96 if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then
97 @@ -46,9 +48,7 @@
98 >=app-emulation/emul-linux-x86-baselibs-1.0
99 >=app-emulation/emul-linux-x86-gtklibs-1.0
100 app-emulation/emul-linux-x86-compat
101 - )
102 - >=www-client/mozilla-launcher-1.41
103 - !media-libs/alsa-oss"
104 + )"
105
106 PDEPEND="restrict-javascript? ( x11-plugins/noscript )"
107
108 @@ -100,7 +100,6 @@
109
110 # Install firefox in /opt
111 dodir ${MOZILLA_FIVE_HOME%/*}
112 - touch "${S}"/extensions/talkback@×××××××.org/chrome.manifest
113 mv "${S}" "${D}"${MOZILLA_FIVE_HOME}
114
115 linguas
116 @@ -109,7 +108,7 @@
117 done
118
119 local LANG=${linguas%% *}
120 - if [[ -n ${LANG} && ${LANG} != "en" ]]; then
121 + if [[ -n ${LANG} ]]; then
122 elog "Setting default locale to ${LANG}"
123 dosed -e "s:general.useragent.locale\", \"en-US\":general.useragent.locale\", \"${LANG}\":" \
124 "${MOZILLA_FIVE_HOME}"/defaults/pref/firefox.js \
125 @@ -118,7 +117,8 @@
126 fi
127
128 # Create /usr/bin/firefox-bin
129 - install_mozilla_launcher_stub firefox-bin ${MOZILLA_FIVE_HOME}
130 + make_wrapper firefox-bin "${MOZILLA_FIVE_HOME}/firefox-bin"
131 + dosym /usr/bin/firefox-bin /usr/bin/firefox
132
133 # Install icon and .desktop for menu entry
134 doicon "${FILESDIR}"/icon/${PN}-icon.png
135 @@ -142,9 +142,4 @@
136
137 pkg_postinst() {
138 use amd64 && einfo "NB: You just installed a 32-bit firefox"
139 - update_mozilla_launcher_symlinks
140 -}
141 -
142 -pkg_postrm() {
143 - update_mozilla_launcher_symlinks
144 }
145
146
147
148 1.3 www-client/mozilla-firefox-bin/mozilla-firefox-bin-2.0.0.14.ebuild
149
150 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/mozilla-firefox-bin/mozilla-firefox-bin-2.0.0.14.ebuild?rev=1.3&view=markup
151 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/mozilla-firefox-bin/mozilla-firefox-bin-2.0.0.14.ebuild?rev=1.3&content-type=text/plain
152 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/mozilla-firefox-bin/mozilla-firefox-bin-2.0.0.14.ebuild?r1=1.2&r2=1.3
153
154 Index: mozilla-firefox-bin-2.0.0.14.ebuild
155 ===================================================================
156 RCS file: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/mozilla-firefox-bin-2.0.0.14.ebuild,v
157 retrieving revision 1.2
158 retrieving revision 1.3
159 diff -u -r1.2 -r1.3
160 --- mozilla-firefox-bin-2.0.0.14.ebuild 18 Apr 2008 10:54:44 -0000 1.2
161 +++ mozilla-firefox-bin-2.0.0.14.ebuild 19 Apr 2008 11:16:19 -0000 1.3
162 @@ -1,10 +1,10 @@
163 # Copyright 1999-2008 Gentoo Foundation
164 # Distributed under the terms of the GNU General Public License v2
165 -# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/mozilla-firefox-bin-2.0.0.14.ebuild,v 1.2 2008/04/18 10:54:44 armin76 Exp $
166 +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/mozilla-firefox-bin-2.0.0.14.ebuild,v 1.3 2008/04/19 11:16:19 armin76 Exp $
167
168 inherit eutils mozilla-launcher multilib mozextension
169
170 -LANGS="af ar be bg ca cs da de el en-GB es-AR es-ES eu fi fr fy-NL ga-IE gu-IN he hu it ja ka ko ku lt mk mn nb-NO nl nn-NO pa-IN pl pt-BR pt-PT ro ru sk sl sv-SE tr uk zh-CN zh-TW"
171 +LANGS="af ar be bg ca cs da de el en en-GB es-AR es-ES eu fi fr fy-NL ga-IE gu-IN he hu it ja ka ko ku lt mk mn nb-NO nl nn-NO pa-IN pl pt-BR pt-PT ro ru sk sl sv-SE tr uk zh-CN zh-TW"
172 NOSHORTLANGS="en-GB es-AR pt-BR zh-TW"
173
174 DESCRIPTION="Firefox Web Browser"
175 @@ -20,8 +20,10 @@
176 IUSE="restrict-javascript"
177
178 for X in ${LANGS} ; do
179 - SRC_URI="${SRC_URI}
180 - linguas_${X/-/_}? ( http://dev.gentooexperimental.org/~armin76/dist/${P/-bin}-xpi/${P/-bin/}-${X}.xpi )"
181 + if [ "${X}" != "en"]; then
182 + SRC_URI="${SRC_URI}
183 + linguas_${X/-/_}? ( http://dev.gentooexperimental.org/~armin76/dist/${P/-bin}-xpi/${P/-bin/}-${X}.xpi )"
184 + fi
185 IUSE="${IUSE} linguas_${X/-/_}"
186 # english is handled internally
187 if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then
188 @@ -105,7 +107,7 @@
189 done
190
191 local LANG=${linguas%% *}
192 - if [[ -n ${LANG} && ${LANG} != "en" ]]; then
193 + if [[ -n ${LANG} ]]; then
194 elog "Setting default locale to ${LANG}"
195 dosed -e "s:general.useragent.locale\", \"en-US\":general.useragent.locale\", \"${LANG}\":" \
196 "${MOZILLA_FIVE_HOME}"/defaults/pref/firefox.js \
197
198
199
200 1.3 www-client/mozilla-firefox-bin/mozilla-firefox-bin-2.0.0.13.ebuild
201
202 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/mozilla-firefox-bin/mozilla-firefox-bin-2.0.0.13.ebuild?rev=1.3&view=markup
203 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/mozilla-firefox-bin/mozilla-firefox-bin-2.0.0.13.ebuild?rev=1.3&content-type=text/plain
204 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/mozilla-firefox-bin/mozilla-firefox-bin-2.0.0.13.ebuild?r1=1.2&r2=1.3
205
206 Index: mozilla-firefox-bin-2.0.0.13.ebuild
207 ===================================================================
208 RCS file: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/mozilla-firefox-bin-2.0.0.13.ebuild,v
209 retrieving revision 1.2
210 retrieving revision 1.3
211 diff -u -r1.2 -r1.3
212 --- mozilla-firefox-bin-2.0.0.13.ebuild 26 Mar 2008 23:54:11 -0000 1.2
213 +++ mozilla-firefox-bin-2.0.0.13.ebuild 19 Apr 2008 11:16:19 -0000 1.3
214 @@ -1,10 +1,10 @@
215 # Copyright 1999-2008 Gentoo Foundation
216 # Distributed under the terms of the GNU General Public License v2
217 -# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/mozilla-firefox-bin-2.0.0.13.ebuild,v 1.2 2008/03/26 23:54:11 maekke Exp $
218 +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/mozilla-firefox-bin-2.0.0.13.ebuild,v 1.3 2008/04/19 11:16:19 armin76 Exp $
219
220 inherit eutils mozilla-launcher multilib mozextension
221
222 -LANGS="af ar be bg ca cs da de el en-GB es-AR es-ES eu fi fr fy-NL ga-IE gu-IN he hu it ja ka ko ku lt mk mn nb-NO nl nn-NO pa-IN pl pt-BR pt-PT ro ru sk sl sv-SE tr uk zh-CN zh-TW"
223 +LANGS="af ar be bg ca cs da de el en en-GB es-AR es-ES eu fi fr fy-NL ga-IE gu-IN he hu it ja ka ko ku lt mk mn nb-NO nl nn-NO pa-IN pl pt-BR pt-PT ro ru sk sl sv-SE tr uk zh-CN zh-TW"
224 NOSHORTLANGS="en-GB es-AR pt-BR zh-TW"
225
226 DESCRIPTION="Firefox Web Browser"
227 @@ -20,8 +20,10 @@
228 IUSE="restrict-javascript"
229
230 for X in ${LANGS} ; do
231 - SRC_URI="${SRC_URI}
232 - linguas_${X/-/_}? ( http://dev.gentooexperimental.org/~armin76/dist/${P/-bin}-xpi/${P/-bin/}-${X}.xpi )"
233 + if [ "${X}" != "en"]; then
234 + SRC_URI="${SRC_URI}
235 + linguas_${X/-/_}? ( http://dev.gentooexperimental.org/~armin76/dist/${P/-bin}-xpi/${P/-bin/}-${X}.xpi )"
236 + fi
237 IUSE="${IUSE} linguas_${X/-/_}"
238 # english is handled internally
239 if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then
240 @@ -105,7 +107,7 @@
241 done
242
243 local LANG=${linguas%% *}
244 - if [[ -n ${LANG} && ${LANG} != "en" ]]; then
245 + if [[ -n ${LANG} ]]; then
246 elog "Setting default locale to ${LANG}"
247 dosed -e "s:general.useragent.locale\", \"en-US\":general.useragent.locale\", \"${LANG}\":" \
248 "${MOZILLA_FIVE_HOME}"/defaults/pref/firefox.js \
249
250
251
252 --
253 gentoo-commits@l.g.o mailing list
Report Message
Find on MARC Find on Google Groups