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

Gentoo Archives: gentoo-commits

From: "Mike Gilbert (floppym)" <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-client/google-chrome: google-chrome-16.0.912.41_beta110024.ebuild google-chrome-15.0.874.121_p109964.ebuild ChangeLog google-chrome-16.0.912.36_beta109393.ebuild google-chrome-15.0.874.120_p108895.ebuild
Date: Thu, 17 Nov 2011 02:53:04
Message-Id: 20111117025251.9DD772004C@flycatcher.gentoo.org
1 floppym 11/11/17 02:52:51
2
3 Modified: ChangeLog
4 Added: google-chrome-16.0.912.41_beta110024.ebuild
5 google-chrome-15.0.874.121_p109964.ebuild
6 Removed: google-chrome-16.0.912.36_beta109393.ebuild
7 google-chrome-15.0.874.120_p108895.ebuild
8 Log:
9 Version bumps for stable and beta channel releases.
10
11 (Portage version: 2.2.0_alpha74/cvs/Linux x86_64)
12
13 Revision Changes Path
14 1.55 www-client/google-chrome/ChangeLog
15
16 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/google-chrome/ChangeLog?rev=1.55&view=markup
17 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/google-chrome/ChangeLog?rev=1.55&content-type=text/plain
18 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/google-chrome/ChangeLog?r1=1.54&r2=1.55
19
20 Index: ChangeLog
21 ===================================================================
22 RCS file: /var/cvsroot/gentoo-x86/www-client/google-chrome/ChangeLog,v
23 retrieving revision 1.54
24 retrieving revision 1.55
25 diff -u -r1.54 -r1.55
26 --- ChangeLog 15 Nov 2011 00:58:27 -0000 1.54
27 +++ ChangeLog 17 Nov 2011 02:52:51 -0000 1.55
28 @@ -1,6 +1,16 @@
29 # ChangeLog for www-client/google-chrome
30 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
31 -# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/ChangeLog,v 1.54 2011/11/15 00:58:27 floppym Exp $
32 +# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/ChangeLog,v 1.55 2011/11/17 02:52:51 floppym Exp $
33 +
34 +*google-chrome-15.0.874.121_p109964 (17 Nov 2011)
35 +*google-chrome-16.0.912.41_beta110024 (17 Nov 2011)
36 +
37 + 17 Nov 2011; Mike Gilbert <floppym@g.o>
38 + +google-chrome-15.0.874.121_p109964.ebuild,
39 + +google-chrome-16.0.912.41_beta110024.ebuild,
40 + -google-chrome-15.0.874.120_p108895.ebuild,
41 + -google-chrome-16.0.912.36_beta109393.ebuild:
42 + Version bumps for stable and beta channel releases.
43
44 *google-chrome-17.0.938.0_alpha109848 (15 Nov 2011)
45
46
47
48
49 1.1 www-client/google-chrome/google-chrome-16.0.912.41_beta110024.ebuild
50
51 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/google-chrome/google-chrome-16.0.912.41_beta110024.ebuild?rev=1.1&view=markup
52 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/google-chrome/google-chrome-16.0.912.41_beta110024.ebuild?rev=1.1&content-type=text/plain
53
54 Index: google-chrome-16.0.912.41_beta110024.ebuild
55 ===================================================================
56 # Copyright 1999-2011 Gentoo Foundation
57 # Distributed under the terms of the GNU General Public License v2
58 # $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-16.0.912.41_beta110024.ebuild,v 1.1 2011/11/17 02:52:51 floppym Exp $
59
60 EAPI="4"
61
62 inherit eutils fdo-mime gnome2-utils multilib pax-utils
63
64 DESCRIPTION="The web browser from Google"
65 HOMEPAGE="http://www.google.com/chrome"
66
67 case ${PV} in
68 *_alpha*)
69 SLOT="unstable"
70 MY_PV=${PV/_alpha/-r}
71 ;;
72 *_beta*)
73 SLOT="beta"
74 MY_PV=${PV/_beta/-r}
75 ;;
76 *_p*)
77 SLOT="stable"
78 MY_PV=${PV/_p/-r}
79 ;;
80 *)
81 die "Invalid value for \${PV}: ${PV}"
82 ;;
83 esac
84
85 MY_PN="${PN}-${SLOT}"
86 MY_P="${MY_PN}_${MY_PV}"
87
88 SRC_BASE="http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_"
89 SRC_URI="amd64? ( ${SRC_BASE}amd64.deb ) x86? ( ${SRC_BASE}i386.deb )"
90
91 LICENSE="google-chrome"
92 KEYWORDS="-* ~amd64 ~x86"
93 IUSE="+plugins"
94 RESTRICT="mirror strip"
95
96 # en_US is ommitted on purpose from the list below. It must always be available.
97 LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he hi hr
98 hu id it ja kn ko lt lv ml mr nb nl pl pt_BR pt_PT ro ru sk sl sr sv sw ta te th
99 tr uk vi zh_CN zh_TW"
100 for lang in ${LANGS}; do
101 IUSE+=" linguas_${lang}"
102 done
103
104 RDEPEND="app-arch/bzip2
105 app-misc/ca-certificates
106 media-libs/alsa-lib
107 dev-libs/atk
108 dev-libs/dbus-glib
109 dev-libs/expat
110 dev-libs/glib:2
111 dev-libs/libxslt
112 dev-libs/nspr
113 dev-libs/nss
114 gnome-base/gconf:2
115 media-libs/fontconfig
116 media-libs/freetype
117 net-print/cups
118 media-libs/libpng:1.2
119 sys-apps/dbus
120 || ( >=sys-devel/gcc-4.4.0[-nocxx] >=sys-devel/gcc-4.4.0[cxx] )
121 sys-libs/zlib
122 x11-libs/cairo
123 x11-libs/gdk-pixbuf
124 x11-libs/gtk+:2
125 x11-libs/libXScrnSaver
126 x11-libs/libX11
127 x11-libs/libXrender
128 x11-libs/libXext
129 x11-libs/pango
130 x11-misc/xdg-utils"
131
132 # Add blockers for the other slots.
133 for x in 0 beta stable unstable; do
134 if [[ ${SLOT} != ${x} ]]; then
135 RDEPEND+=" !${CATEGORY}/${PN}:${x}"
136 fi
137 done
138
139 QA_PREBUILT="*"
140 S=${WORKDIR}
141
142 # Chromium uses different names for some langs,
143 # return Chromium name corresponding to a Gentoo lang.
144 chromium_lang() {
145 if [[ "$1" == "es_LA" ]]; then
146 echo "es_419"
147 else
148 echo "$1"
149 fi
150 }
151
152 chrome_unpack() {
153 local x
154 for x in "${@}"; do
155 if [[ ${x} == *.deb ]]; then
156 # Avoid automagic usage of deb2targz.
157 echo ">>> Unpacking ${x} to ${PWD}"
158 ar x "${DISTDIR}/${x}" || die
159 else
160 unpack "${x}"
161 fi
162 done
163 }
164
165 src_unpack() {
166 chrome_unpack ${A} ./data.tar.lzma
167 }
168
169 src_prepare() {
170 CHROME_HOME="opt/google/chrome/"
171
172 pax-mark m ${CHROME_HOME}chrome || die
173 rm -rf usr/share/menu || die
174 mv usr/share/doc/${PN} usr/share/doc/${PF} || die
175
176 # Support LINGUAS, bug #332751.
177 cd "${CHROME_HOME}locales" || die
178 local pak
179 for pak in *.pak; do
180 local pakbasename="$(basename ${pak})"
181 local pakname="${pakbasename%.pak}"
182 local langname="${pakname//-/_}"
183
184 # Do not issue warning for en_US locale. This is the fallback
185 # locale so it should always be installed.
186 if [[ "${langname}" == "en_US" ]]; then
187 continue
188 fi
189
190 local found=false
191 local lang
192 for lang in ${LANGS}; do
193 local crlang="$(chromium_lang ${lang})"
194 if [[ "${langname}" == "${crlang}" ]]; then
195 found=true
196 break
197 fi
198 done
199 if ! $found; then
200 ewarn "LINGUAS warning: no ${langname} in LANGS"
201 fi
202 done
203 local lang
204 for lang in ${LANGS}; do
205 local crlang="$(chromium_lang ${lang})"
206 local pakfile="${crlang//_/-}.pak"
207 if [ ! -f "${pakfile}" ]; then
208 ewarn "LINGUAS warning: no .pak file for ${lang} (${pakfile} not found)"
209 fi
210 if ! use linguas_${lang}; then
211 rm "${pakfile}" || die
212 fi
213 done
214
215 }
216
217 src_install() {
218 mv opt usr "${D}" || die
219
220 fperms u+s "/${CHROME_HOME}chrome-sandbox" || die
221
222 if use plugins ; then
223 local args='"$@"'
224 local plugins="/usr/$(get_libdir)/nsbrowser/plugins"
225 sed -e "s:${args}:--extra-plugin-dir=\"${plugins}\" \\0:" \
226 -i "${D}${CHROME_HOME}google-chrome" || die
227 fi
228
229 domenu "${D}${CHROME_HOME}google-chrome.desktop" || die
230 local size
231 for size in 16 22 24 32 48 64 128 256 ; do
232 insinto /usr/share/icons/hicolor/${size}x${size}/apps
233 newins "${D}${CHROME_HOME}product_logo_${size}.png" google-chrome.png
234 done
235 }
236
237 pkg_preinst() {
238 gnome2_icon_savelist
239 }
240
241 pkg_postinst() {
242 fdo-mime_desktop_database_update
243 gnome2_icon_cache_update
244 }
245
246 pkg_postrm() {
247 fdo-mime_desktop_database_update
248 gnome2_icon_cache_update
249 }
250
251
252
253 1.1 www-client/google-chrome/google-chrome-15.0.874.121_p109964.ebuild
254
255 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/google-chrome/google-chrome-15.0.874.121_p109964.ebuild?rev=1.1&view=markup
256 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/google-chrome/google-chrome-15.0.874.121_p109964.ebuild?rev=1.1&content-type=text/plain
257
258 Index: google-chrome-15.0.874.121_p109964.ebuild
259 ===================================================================
260 # Copyright 1999-2011 Gentoo Foundation
261 # Distributed under the terms of the GNU General Public License v2
262 # $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-15.0.874.121_p109964.ebuild,v 1.1 2011/11/17 02:52:51 floppym Exp $
263
264 EAPI="4"
265
266 inherit eutils fdo-mime gnome2-utils multilib pax-utils
267
268 DESCRIPTION="The web browser from Google"
269 HOMEPAGE="http://www.google.com/chrome"
270
271 case ${PV} in
272 *_alpha*)
273 SLOT="unstable"
274 MY_PV=${PV/_alpha/-r}
275 ;;
276 *_beta*)
277 SLOT="beta"
278 MY_PV=${PV/_beta/-r}
279 ;;
280 *_p*)
281 SLOT="stable"
282 MY_PV=${PV/_p/-r}
283 ;;
284 *)
285 die "Invalid value for \${PV}: ${PV}"
286 ;;
287 esac
288
289 MY_PN="${PN}-${SLOT}"
290 MY_P="${MY_PN}_${MY_PV}"
291
292 SRC_BASE="http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_"
293 SRC_URI="amd64? ( ${SRC_BASE}amd64.deb ) x86? ( ${SRC_BASE}i386.deb )"
294
295 LICENSE="google-chrome"
296 KEYWORDS="-* ~amd64 ~x86"
297 IUSE="+plugins"
298 RESTRICT="mirror strip"
299
300 # en_US is ommitted on purpose from the list below. It must always be available.
301 LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he hi hr
302 hu id it ja kn ko lt lv ml mr nb nl pl pt_BR pt_PT ro ru sk sl sr sv sw ta te th
303 tr uk vi zh_CN zh_TW"
304 for lang in ${LANGS}; do
305 IUSE+=" linguas_${lang}"
306 done
307
308 RDEPEND="app-arch/bzip2
309 app-misc/ca-certificates
310 media-libs/alsa-lib
311 dev-libs/atk
312 dev-libs/dbus-glib
313 dev-libs/expat
314 dev-libs/glib:2
315 dev-libs/libxslt
316 dev-libs/nspr
317 dev-libs/nss
318 gnome-base/gconf:2
319 media-libs/fontconfig
320 media-libs/freetype
321 net-print/cups
322 media-libs/libpng:1.2
323 sys-apps/dbus
324 || ( >=sys-devel/gcc-4.4.0[-nocxx] >=sys-devel/gcc-4.4.0[cxx] )
325 sys-libs/zlib
326 x11-libs/cairo
327 x11-libs/gdk-pixbuf
328 x11-libs/gtk+:2
329 x11-libs/libXScrnSaver
330 x11-libs/libX11
331 x11-libs/libXrender
332 x11-libs/libXext
333 x11-libs/pango
334 x11-misc/xdg-utils"
335
336 # Add blockers for the other slots.
337 for x in 0 beta stable unstable; do
338 if [[ ${SLOT} != ${x} ]]; then
339 RDEPEND+=" !${CATEGORY}/${PN}:${x}"
340 fi
341 done
342
343 QA_PREBUILT="*"
344 S=${WORKDIR}
345
346 # Chromium uses different names for some langs,
347 # return Chromium name corresponding to a Gentoo lang.
348 chromium_lang() {
349 if [[ "$1" == "es_LA" ]]; then
350 echo "es_419"
351 else
352 echo "$1"
353 fi
354 }
355
356 chrome_unpack() {
357 local x
358 for x in "${@}"; do
359 if [[ ${x} == *.deb ]]; then
360 # Avoid automagic usage of deb2targz.
361 echo ">>> Unpacking ${x} to ${PWD}"
362 ar x "${DISTDIR}/${x}" || die
363 else
364 unpack "${x}"
365 fi
366 done
367 }
368
369 src_unpack() {
370 chrome_unpack ${A} ./data.tar.lzma
371 }
372
373 src_prepare() {
374 CHROME_HOME="opt/google/chrome/"
375
376 pax-mark m ${CHROME_HOME}chrome || die
377 rm -rf usr/share/menu || die
378 mv usr/share/doc/${PN} usr/share/doc/${PF} || die
379
380 # Support LINGUAS, bug #332751.
381 cd "${CHROME_HOME}locales" || die
382 local pak
383 for pak in *.pak; do
384 local pakbasename="$(basename ${pak})"
385 local pakname="${pakbasename%.pak}"
386 local langname="${pakname//-/_}"
387
388 # Do not issue warning for en_US locale. This is the fallback
389 # locale so it should always be installed.
390 if [[ "${langname}" == "en_US" ]]; then
391 continue
392 fi
393
394 local found=false
395 local lang
396 for lang in ${LANGS}; do
397 local crlang="$(chromium_lang ${lang})"
398 if [[ "${langname}" == "${crlang}" ]]; then
399 found=true
400 break
401 fi
402 done
403 if ! $found; then
404 ewarn "LINGUAS warning: no ${langname} in LANGS"
405 fi
406 done
407 local lang
408 for lang in ${LANGS}; do
409 local crlang="$(chromium_lang ${lang})"
410 local pakfile="${crlang//_/-}.pak"
411 if [ ! -f "${pakfile}" ]; then
412 ewarn "LINGUAS warning: no .pak file for ${lang} (${pakfile} not found)"
413 fi
414 if ! use linguas_${lang}; then
415 rm "${pakfile}" || die
416 fi
417 done
418
419 }
420
421 src_install() {
422 mv opt usr "${D}" || die
423
424 fperms u+s "/${CHROME_HOME}chrome-sandbox" || die
425
426 if use plugins ; then
427 local args='"$@"'
428 local plugins="/usr/$(get_libdir)/nsbrowser/plugins"
429 sed -e "s:${args}:--extra-plugin-dir=\"${plugins}\" \\0:" \
430 -i "${D}${CHROME_HOME}google-chrome" || die
431 fi
432
433 domenu "${D}${CHROME_HOME}google-chrome.desktop" || die
434 local size
435 for size in 16 22 24 32 48 64 128 256 ; do
436 insinto /usr/share/icons/hicolor/${size}x${size}/apps
437 newins "${D}${CHROME_HOME}product_logo_${size}.png" google-chrome.png
438 done
439 }
440
441 pkg_preinst() {
442 gnome2_icon_savelist
443 }
444
445 pkg_postinst() {
446 fdo-mime_desktop_database_update
447 gnome2_icon_cache_update
448 }
449
450 pkg_postrm() {
451 fdo-mime_desktop_database_update
452 gnome2_icon_cache_update
453 }
Report Message
Find on MARC Find on Google Groups