Gentoo Archives: gentoo-commits

From: "PaweA Hajdan (phajdan.jr)" <phajdan.jr@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-client/chromium: chromium-21.0.1155.2.ebuild ChangeLog chromium-9999-r1.ebuild chromium-21.0.1145.0.ebuild
Date: Wed, 30 May 2012 09:56:59
Message-Id: 20120530095648.B7FF22004B@flycatcher.gentoo.org
1 phajdan.jr 12/05/30 09:56:48
2
3 Modified: ChangeLog chromium-9999-r1.ebuild
4 Added: chromium-21.0.1155.2.ebuild
5 Removed: chromium-21.0.1145.0.ebuild
6 Log:
7 Version bump for dev channel release. Remove old.
8
9 (Portage version: 2.1.10.49/cvs/Linux i686)
10
11 Revision Changes Path
12 1.649 www-client/chromium/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.649&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.649&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?r1=1.648&r2=1.649
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v
21 retrieving revision 1.648
22 retrieving revision 1.649
23 diff -u -r1.648 -r1.649
24 --- ChangeLog 27 May 2012 14:57:43 -0000 1.648
25 +++ ChangeLog 30 May 2012 09:56:48 -0000 1.649
26 @@ -1,6 +1,13 @@
27 # ChangeLog for www-client/chromium
28 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.648 2012/05/27 14:57:43 phajdan.jr Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.649 2012/05/30 09:56:48 phajdan.jr Exp $
31 +
32 +*chromium-21.0.1155.2 (30 May 2012)
33 +
34 + 30 May 2012; Pawel Hajdan jr <phajdan.jr@g.o>
35 + -chromium-21.0.1145.0.ebuild, +chromium-21.0.1155.2.ebuild,
36 + chromium-9999-r1.ebuild:
37 + Version bump for dev channel release. Remove old.
38
39 *chromium-21.0.1145.0-r1 (27 May 2012)
40
41
42
43
44 1.118 www-client/chromium/chromium-9999-r1.ebuild
45
46 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild?rev=1.118&view=markup
47 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild?rev=1.118&content-type=text/plain
48 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild?r1=1.117&r2=1.118
49
50 Index: chromium-9999-r1.ebuild
51 ===================================================================
52 RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v
53 retrieving revision 1.117
54 retrieving revision 1.118
55 diff -u -r1.117 -r1.118
56 --- chromium-9999-r1.ebuild 27 May 2012 14:57:43 -0000 1.117
57 +++ chromium-9999-r1.ebuild 30 May 2012 09:56:48 -0000 1.118
58 @@ -1,6 +1,6 @@
59 # Copyright 1999-2012 Gentoo Foundation
60 # Distributed under the terms of the GNU General Public License v2
61 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.117 2012/05/27 14:57:43 phajdan.jr Exp $
62 +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.118 2012/05/30 09:56:48 phajdan.jr Exp $
63
64 EAPI="4"
65 PYTHON_DEPEND="2:2.6"
66 @@ -146,7 +146,9 @@
67 python_set_active_version 2
68 python_pkg_setup
69
70 - chromium_check_kernel_config
71 + if ! use selinux; then
72 + chromium_suid_sandbox_check_kernel_config
73 + fi
74
75 if use bindist; then
76 elog "bindist enabled: H.264 video support will be disabled."
77
78
79
80 1.1 www-client/chromium/chromium-21.0.1155.2.ebuild
81
82 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-21.0.1155.2.ebuild?rev=1.1&view=markup
83 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-21.0.1155.2.ebuild?rev=1.1&content-type=text/plain
84
85 Index: chromium-21.0.1155.2.ebuild
86 ===================================================================
87 # Copyright 1999-2012 Gentoo Foundation
88 # Distributed under the terms of the GNU General Public License v2
89 # $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-21.0.1155.2.ebuild,v 1.1 2012/05/30 09:56:48 phajdan.jr Exp $
90
91 EAPI="4"
92 PYTHON_DEPEND="2:2.6"
93
94 CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
95 hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
96 sv sw ta te th tr uk vi zh_CN zh_TW"
97
98 inherit chromium eutils flag-o-matic multilib \
99 pax-utils portability python toolchain-funcs versionator virtualx
100
101 DESCRIPTION="Open-source version of Google Chrome web browser"
102 HOMEPAGE="http://chromium.org/"
103 SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.bz2"
104
105 LICENSE="BSD"
106 SLOT="0"
107 KEYWORDS="~amd64 ~x86"
108 IUSE="bindist cups gnome gnome-keyring kerberos pulseaudio selinux"
109
110 RDEPEND="app-arch/bzip2
111 cups? (
112 dev-libs/libgcrypt
113 >=net-print/cups-1.3.11
114 )
115 >=dev-lang/v8-3.10.2.1
116 dev-libs/dbus-glib
117 dev-libs/elfutils
118 >=dev-libs/icu-49.1.1-r1
119 >=dev-libs/libevent-1.4.13
120 dev-libs/libxml2[icu]
121 dev-libs/libxslt
122 >=dev-libs/nss-3.12.3
123 gnome? ( >=gnome-base/gconf-2.24.0 )
124 gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 )
125 >=media-libs/alsa-lib-1.0.19
126 media-libs/flac
127 >=media-libs/libjpeg-turbo-1.2.0-r1
128 media-libs/libpng
129 >=media-libs/libwebp-0.1.3
130 media-libs/speex
131 pulseaudio? ( media-sound/pulseaudio )
132 sys-fs/udev
133 sys-libs/zlib
134 virtual/libusb:1
135 x11-libs/gtk+:2
136 x11-libs/libXinerama
137 x11-libs/libXScrnSaver
138 x11-libs/libXtst
139 kerberos? ( virtual/krb5 )
140 selinux? ( sys-libs/libselinux )"
141 DEPEND="${RDEPEND}
142 >=dev-lang/nacl-toolchain-newlib-0_p7311
143 dev-lang/perl
144 dev-lang/yasm
145 dev-python/ply
146 dev-python/simplejson
147 >=dev-util/gperf-3.0.3
148 >=sys-devel/bison-2.4.3
149 sys-devel/flex
150 >=sys-devel/make-3.81-r2
151 virtual/pkgconfig
152 test? (
153 dev-python/pyftpdlib
154 )"
155 RDEPEND+="
156 !=www-client/chromium-9999
157 x11-misc/xdg-utils
158 virtual/ttf-fonts"
159
160 if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
161 EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
162 fi
163
164 pkg_setup() {
165 if [[ "${SLOT}" == "0" ]]; then
166 CHROMIUM_SUFFIX=""
167 else
168 CHROMIUM_SUFFIX="-${SLOT}"
169 fi
170 CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
171
172 # Make sure the build system will use the right tools, bug #340795.
173 tc-export AR CC CXX RANLIB
174
175 # Make sure the build system will use the right python, bug #344367.
176 python_set_active_version 2
177 python_pkg_setup
178
179 if ! use selinux; then
180 chromium_suid_sandbox_check_kernel_config
181 fi
182
183 if use bindist; then
184 elog "bindist enabled: H.264 video support will be disabled."
185 else
186 elog "bindist disabled: Resulting binaries may not be legal to re-distribute."
187 fi
188 }
189
190 src_prepare() {
191 ln -s /usr/$(get_libdir)/nacl-toolchain-newlib \
192 native_client/toolchain/linux_x86_newlib || die
193
194 # zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 383371.
195 sed -i '1i#define OF(x) x' \
196 third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.h || die
197
198 epatch_user
199
200 # Remove most bundled libraries. Some are still needed.
201 find third_party -type f \! -iname '*.gyp*' \
202 \! -path 'third_party/WebKit/*' \
203 \! -path 'third_party/angle/*' \
204 \! -path 'third_party/cacheinvalidation/*' \
205 \! -path 'third_party/cld/*' \
206 \! -path 'third_party/expat/*' \
207 \! -path 'third_party/ffmpeg/*' \
208 \! -path 'third_party/flac/flac.h' \
209 \! -path 'third_party/gpsd/*' \
210 \! -path 'third_party/harfbuzz/*' \
211 \! -path 'third_party/hunspell/*' \
212 \! -path 'third_party/iccjpeg/*' \
213 \! -path 'third_party/jsoncpp/*' \
214 \! -path 'third_party/khronos/*' \
215 \! -path 'third_party/launchpad_translations/*' \
216 \! -path 'third_party/leveldatabase/*' \
217 \! -path 'third_party/libjingle/*' \
218 \! -path 'third_party/libphonenumber/*' \
219 \! -path 'third_party/libsrtp/*' \
220 \! -path 'third_party/libusb/libusb.h' \
221 \! -path 'third_party/libvpx/*' \
222 \! -path 'third_party/libxml/chromium/*' \
223 \! -path 'third_party/libyuv/*' \
224 \! -path 'third_party/lss/*' \
225 \! -path 'third_party/mesa/*' \
226 \! -path 'third_party/modp_b64/*' \
227 \! -path 'third_party/mongoose/*' \
228 \! -path 'third_party/npapi/*' \
229 \! -path 'third_party/openmax/*' \
230 \! -path 'third_party/ots/*' \
231 \! -path 'third_party/protobuf/*' \
232 \! -path 'third_party/scons-2.0.1/*' \
233 \! -path 'third_party/sfntly/*' \
234 \! -path 'third_party/skia/*' \
235 \! -path 'third_party/smhasher/*' \
236 \! -path 'third_party/speex/speex.h' \
237 \! -path 'third_party/sqlite/*' \
238 \! -path 'third_party/tlslite/*' \
239 \! -path 'third_party/undoview/*' \
240 \! -path 'third_party/v8-i18n/*' \
241 \! -path 'third_party/webdriver/*' \
242 \! -path 'third_party/webgl_conformance/*' \
243 \! -path 'third_party/webrtc/*' \
244 \! -path 'third_party/zlib/contrib/minizip/*' \
245 -delete || die
246
247 local v8_bundled="$(chromium_bundled_v8_version)"
248 local v8_installed="$(chromium_installed_v8_version)"
249 elog "V8 version: bundled - ${v8_bundled}; installed - ${v8_installed}"
250
251 # Remove bundled v8.
252 find v8 -type f \! -iname '*.gyp*' -delete || die
253
254 # The implementation files include v8 headers with full path,
255 # like #include "v8/include/v8.h". Make sure the system headers
256 # will be used.
257 # TODO: find a solution that can be upstreamed.
258 rmdir v8/include || die
259 ln -s /usr/include v8/include || die
260
261 # Make sure the build system will use the right python, bug #344367.
262 # Only convert directories that need it, to save time.
263 python_convert_shebangs -q -r 2 build tools
264 }
265
266 src_configure() {
267 local myconf=""
268
269 # Never tell the build system to "enable" SSE2, it has a few unexpected
270 # additions, bug #336871.
271 myconf+=" -Ddisable_sse2=1"
272
273 # Disable tcmalloc, it causes problems with e.g. NVIDIA
274 # drivers, bug #413637.
275 myconf+=" -Dlinux_use_tcmalloc=0"
276
277 # Disable glibc Native Client toolchain, we don't need it (bug #417019).
278 myconf+=" -Ddisable_glibc=1"
279
280 # Make it possible to remove third_party/adobe.
281 echo > "${T}/flapper_version.h" || die
282 myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h"
283
284 # Use system-provided libraries.
285 # TODO: use_system_ffmpeg
286 # TODO: use_system_hunspell (upstream changes needed).
287 # TODO: use_system_ssl (http://crbug.com/58087).
288 # TODO: use_system_sqlite (http://crbug.com/22208).
289 # TODO: use_system_vpx
290 myconf+="
291 -Duse_system_bzip2=1
292 -Duse_system_flac=1
293 -Duse_system_icu=1
294 -Duse_system_libevent=1
295 -Duse_system_libjpeg=1
296 -Duse_system_libpng=1
297 -Duse_system_libusb=1
298 -Duse_system_libwebp=1
299 -Duse_system_libxml=1
300 -Duse_system_speex=1
301 -Duse_system_v8=1
302 -Duse_system_xdg_utils=1
303 -Duse_system_yasm=1
304 -Duse_system_zlib=1"
305
306 # Optional dependencies.
307 # TODO: linux_link_kerberos, bug #381289.
308 myconf+="
309 $(gyp_use cups)
310 $(gyp_use gnome use_gconf)
311 $(gyp_use gnome-keyring use_gnome_keyring)
312 $(gyp_use gnome-keyring linux_link_gnome_keyring)
313 $(gyp_use kerberos)
314 $(gyp_use pulseaudio)
315 $(gyp_use selinux selinux)"
316
317 if ! use selinux; then
318 # Enable SUID sandbox.
319 myconf+="
320 -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox
321 -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
322 fi
323
324 # Never use bundled gold binary. Disable gold linker flags for now.
325 myconf+="
326 -Dlinux_use_gold_binary=0
327 -Dlinux_use_gold_flags=0"
328
329 if ! use bindist; then
330 # Enable H.624 support in bundled ffmpeg.
331 myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=Chrome"
332 fi
333
334 local myarch="$(tc-arch)"
335 if [[ $myarch = amd64 ]] ; then
336 myconf+=" -Dtarget_arch=x64"
337 elif [[ $myarch = x86 ]] ; then
338 myconf+=" -Dtarget_arch=ia32"
339 else
340 die "Failed to determine target arch, got '$myarch'."
341 fi
342
343 # Make sure that -Werror doesn't get added to CFLAGS by the build system.
344 # Depending on GCC version the warnings are different and we don't want
345 # the build to fail because of that.
346 myconf+=" -Dwerror="
347
348 # Avoid CFLAGS problems, bug #352457, bug #390147.
349 if ! use custom-cflags; then
350 replace-flags "-Os" "-O2"
351 strip-flags
352 fi
353
354 egyp_chromium ${myconf} || die
355 }
356
357 src_compile() {
358 local test_targets
359 for x in base cacheinvalidation crypto \
360 googleurl gpu media net printing sql; do
361 test_targets+=" ${x}_unittests"
362 done
363
364 local make_targets="chrome chromedriver"
365 if ! use selinux; then
366 make_targets+=" chrome_sandbox"
367 fi
368 if use test; then
369 make_targets+=$test_targets
370 fi
371
372 # See bug #410883 for more info about the .host mess.
373 emake ${make_targets} BUILDTYPE=Release V=1 \
374 CC.host="$(tc-getCC)" CFLAGS.host="${CFLAGS}" \
375 CXX.host="$(tc-getCXX)" CXXFLAGS.host="${CXXFLAGS}" \
376 LINK.host="$(tc-getCXX)" LDFLAGS.host="${LDFLAGS}" \
377 AR.host="$(tc-getAR)" || die
378
379 pax-mark m out/Release/chrome
380 if use test; then
381 for x in $test_targets; do
382 pax-mark m out/Release/${x}
383 done
384 fi
385 }
386
387 src_test() {
388 # For more info see bug #350349.
389 local mylocale='en_US.utf8'
390 if ! locale -a | grep -q "$mylocale"; then
391 eerror "${PN} requires ${mylocale} locale for tests"
392 eerror "Please read the following guides for more information:"
393 eerror " http://www.gentoo.org/doc/en/guide-localization.xml"
394 eerror " http://www.gentoo.org/doc/en/utf-8.xml"
395 die "locale ${mylocale} is not supported"
396 fi
397
398 # For more info see bug #370957.
399 if [[ $UID -eq 0 ]]; then
400 die "Tests must be run as non-root. Please use FEATURES=userpriv."
401 fi
402
403 # ICUStringConversionsTest: bug #350347.
404 # MessagePumpLibeventTest: bug #398501.
405 LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/base_unittests virtualmake \
406 '--gtest_filter=-ICUStringConversionsTest.*:MessagePumpLibeventTest.*'
407
408 LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/cacheinvalidation_unittests virtualmake
409 LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/crypto_unittests virtualmake
410 LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/googleurl_unittests virtualmake
411 LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/gpu_unittests virtualmake
412 LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/media_unittests virtualmake
413
414 # NetUtilTest: bug #361885.
415 # DnsConfigServiceTest.GetSystemConfig: bug #394883.
416 # CertDatabaseNSSTest.ImportServerCert_SelfSigned: bug #399269.
417 LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/net_unittests virtualmake \
418 '--gtest_filter=-NetUtilTest.IDNToUnicode*:NetUtilTest.FormatUrl*:DnsConfigServiceTest.GetSystemConfig:CertDatabaseNSSTest.ImportServerCert_SelfSigned'
419
420 LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/printing_unittests virtualmake
421 LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/sql_unittests virtualmake
422 }
423
424 src_install() {
425 exeinto "${CHROMIUM_HOME}"
426 doexe out/Release/chrome || die
427
428 if ! use selinux; then
429 doexe out/Release/chrome_sandbox || die
430 fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
431 fi
432
433 doexe out/Release/chromedriver || die
434
435 doexe out/Release/nacl_helper{,_bootstrap} || die
436 insinto "${CHROMIUM_HOME}"
437 doins out/Release/nacl_irt_*.nexe || die
438 doins out/Release/libppGoogleNaClPluginChrome.so || die
439
440 newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die
441 if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
442 sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" \
443 -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
444 sed "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g" \
445 -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
446 sed "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:" \
447 -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
448 fi
449
450 # It is important that we name the target "chromium-browser",
451 # xdg-utils expect it; bug #355517.
452 dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
453 # keep the old symlink around for consistency
454 dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
455
456 # Allow users to override command-line options, bug #357629.
457 dodir /etc/chromium || die
458 insinto /etc/chromium
459 newins "${FILESDIR}/chromium.default" "default" || die
460
461 pushd out/Release/locales > /dev/null || die
462 chromium_remove_language_paks
463 popd
464
465 insinto "${CHROMIUM_HOME}"
466 doins out/Release/*.pak || die
467
468 doins -r out/Release/locales || die
469 doins -r out/Release/resources || die
470
471 newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
472 newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
473
474 doexe out/Release/libffmpegsumo.so || die
475
476 # Install icons and desktop entry.
477 for SIZE in 16 22 24 32 48 64 128 256 ; do
478 insinto /usr/share/icons/hicolor/${SIZE}x${SIZE}/apps
479 newins chrome/app/theme/chromium/product_logo_${SIZE}.png \
480 chromium-browser${CHROMIUM_SUFFIX}.png || die
481 done
482 local mime_types="text/html;text/xml;application/xhtml+xml;"
483 mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
484 mime_types+="x-scheme-handler/ftp;" # bug #412185
485 mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
486 make_desktop_entry \
487 chromium-browser${CHROMIUM_SUFFIX} \
488 "Chromium${CHROMIUM_SUFFIX}" \
489 chromium-browser${CHROMIUM_SUFFIX} \
490 "Network;WebBrowser" \
491 "MimeType=${mime_types}\nStartupWMClass=chromium-browser"
492 sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
493
494 # Install GNOME default application entry (bug #303100).
495 if use gnome; then
496 dodir /usr/share/gnome-control-center/default-apps || die
497 insinto /usr/share/gnome-control-center/default-apps
498 newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
499 if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
500 sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
501 "${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
502 fi
503 fi
504 }