Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/
Date: Thu, 13 Oct 2016 15:57:38
Message-Id: 1476374232.bd2ee3935b64477065de277448655b8872daf4dd.floppym@gentoo
1 commit: bd2ee3935b64477065de277448655b8872daf4dd
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Thu Oct 13 15:57:12 2016 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Thu Oct 13 15:57:12 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd2ee393
7
8 www-client/chromium: stable channel bump (54.0.2840.59)
9
10 Package-Manager: portage-2.3.2
11
12 www-client/chromium/Manifest | 3 +-
13 www-client/chromium/chromium-53.0.2785.116.ebuild | 722 ---------------------
14 ...2840.34.ebuild => chromium-54.0.2840.59.ebuild} | 0
15 3 files changed, 1 insertion(+), 724 deletions(-)
16
17 diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
18 index 9752988..cd8d22a 100644
19 --- a/www-client/chromium/Manifest
20 +++ b/www-client/chromium/Manifest
21 @@ -1,6 +1,5 @@
22 -DIST chromium-53.0.2785.116.tar.xz 460903264 SHA256 7a87629504346f64122ca7754574d187a4c1bf5736dea672ff3e247a0af16062 SHA512 3a88b5b61642c4b947ae9cd9faa6d9d75fecfd6058982e705d36f1da2e94b902fb6d0af5289e00bbd0e5e7d096d5f5a788132c6e4374978620d6f7a1e2fb00da WHIRLPOOL fa067c68b217d494e16dfc78d63482a31006234ebae1c686426f011afde41a58d6939e3c5ee3a340ee099d5d88016f425b97e9f68957bb60d9b846d471702ac3
23 DIST chromium-53.0.2785.143.tar.xz 460878628 SHA256 c52a58b79bfb27bb87e4a0a6ff213001485fbc747657b290f75d39ddce07dcc3 SHA512 d51ee1bd60d9ac0ae2dfa66b7ba10cae479002f32995d169c181e7ef1170953069531ec786e8031d3fc4777f002b213471213b4ed3e6f1e89f851547305456b9 WHIRLPOOL a9e75f905d7529aa0ed2ff3af9a7273c1b53dcb4c8a393d0fb34361b4cfa46e6e3691abf6fedc36dd6c375ab43038f76c981678d1988054d3fdb04b33b79d4a8
24 -DIST chromium-54.0.2840.34.tar.xz 479636320 SHA256 b46c26a9e773b2c620acd2f96d69408f14a279aefaedfefed002ecf898a1ecf2 SHA512 23732e02ed30eaf36a4a4ee7bbb1af72c4202e061444004b515f0c49a578907719de3588f6d1e8dbb756cffa0220b677c920dc2f5ad6e8ec70a82168c094c99d WHIRLPOOL 822b41231a41aaeb8fc45ddc927c731535640a844ad25256a3f3daa86916c7cd9a5b79b30324c22efff03ef16a033b77d93df24f1ebf64df9373f77a8669fb41
25 DIST chromium-54.0.2840.50.tar.xz 479717252 SHA256 9b0b58f3af8353751e93fb6759660bd18de853fd3caabf88cbd48047e1c6cc38 SHA512 338dc37a994346877e180b9c7c9537a9f6a116f152f62a489dcb8d51e061e7262eba2585e63d368cf503b15d987e24b7ff4b4acc284e887b06c4cb3238b13543 WHIRLPOOL 0fccf4ca53b4289bc02e0bcd8d8e47fa9d1bff34545c85eeb8a0809067389cad1c395687388909069839ae921c47eebfa5b4fda4af13d0015d28d42e249c9728
26 +DIST chromium-54.0.2840.59.tar.xz 479763932 SHA256 df89c284b0109566acc6a5a1a84d94a5ab0509cc3a86a31299a50328991edcde SHA512 f0b615a2e7dd667c8959f8ce501035a69e7ce852f04ae3023677d933025a56cbc7e1c5f4e85f6e790236ac61cfbd5df7290ed5da74292ee40ebbd89e75fb159f WHIRLPOOL a719ddf51cce89bb445bed1cfa694bf5c49a67455b1ed495363920303ba4337ae81d660c7fa613653f84e1cefb934d54640ea6727b95e0ab4451517d3db83299
27 DIST chromium-55.0.2868.3.tar.xz 505338268 SHA256 bec801332cdfb784d06a08da3936f5b9719e5b6a3bbaee88c3829651799077d1 SHA512 918c53f7380f889450b0e97e085f8d28af0ef4c25a5dd7b1ae0b2467ccc564747915c64d3bc6f64d31798ea4ef76f7a5cd7f64c06830ed9775756a495d9bb319 WHIRLPOOL df1fc03ebbc0ce4697e5aae6199c970d55b3cfdf78a00e18e47206dfc4f1995b3bae34216ea1d1023f7619febc87e9bfe738d015cee24123be386d6d41bec572
28 DIST chromium-55.0.2873.0.tar.xz 505121804 SHA256 7f0a502e18951215693567ab668c2a0b4031bd8a1b3d10f8c9d1711079f56c1a SHA512 352349314b6f7565dbef9425152efee1546c116346b6ec2094b9c7ccf30d7caa2b2b2a4b8aa97deb66e25e692741bd63675d3c1f95ee99e1e7345406509c0ad3 WHIRLPOOL de4c5f31ecbe072c5cf5718a889f383ec49d5100fb4dfbeda456e78c6665d80e3f85044efc6d56c6d575579992d90bfddbe23c16530b1cf5c570c5ce2cd3d0ac
29
30 diff --git a/www-client/chromium/chromium-53.0.2785.116.ebuild b/www-client/chromium/chromium-53.0.2785.116.ebuild
31 deleted file mode 100644
32 index 9290132..00000000
33 --- a/www-client/chromium/chromium-53.0.2785.116.ebuild
34 +++ /dev/null
35 @@ -1,722 +0,0 @@
36 -# Copyright 1999-2016 Gentoo Foundation
37 -# Distributed under the terms of the GNU General Public License v2
38 -# $Id$
39 -
40 -EAPI="5"
41 -PYTHON_COMPAT=( python2_7 )
42 -
43 -CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
44 - 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
45 - sv sw ta te th tr uk vi zh-CN zh-TW"
46 -
47 -inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib multiprocessing pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator virtualx xdg-utils
48 -
49 -DESCRIPTION="Open-source version of Google Chrome web browser"
50 -HOMEPAGE="http://chromium.org/"
51 -SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz"
52 -
53 -LICENSE="BSD"
54 -SLOT="0"
55 -KEYWORDS="amd64 ~arm ~arm64 x86"
56 -IUSE="cups gn gnome gnome-keyring gtk3 +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc widevine"
57 -RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
58 -
59 -# TODO: bootstrapped gn binary hangs when using tcmalloc with portage's sandbox.
60 -REQUIRED_USE="gn? ( gnome gnome-keyring !tcmalloc )"
61 -
62 -# Native Client binaries are compiled with different set of flags, bug #452066.
63 -QA_FLAGS_IGNORED=".*\.nexe"
64 -
65 -# Native Client binaries may be stripped by the build system, which uses the
66 -# right tools for it, bug #469144 .
67 -QA_PRESTRIPPED=".*\.nexe"
68 -
69 -RDEPEND="
70 - app-arch/bzip2:=
71 - cups? ( >=net-print/cups-1.3.11:= )
72 - >=dev-libs/elfutils-0.149
73 - dev-libs/expat:=
74 - dev-libs/glib:=
75 - >=dev-libs/jsoncpp-0.5.0-r1:=
76 - dev-libs/nspr:=
77 - >=dev-libs/nss-3.14.3:=
78 - gnome? ( >=gnome-base/gconf-2.24.0:= )
79 - gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
80 - >=media-libs/alsa-lib-1.0.19:=
81 - media-libs/fontconfig:=
82 - media-libs/freetype:=
83 - media-libs/libexif:=
84 - media-libs/speex:=
85 - pulseaudio? ( media-sound/pulseaudio:= )
86 - system-ffmpeg? ( >=media-video/ffmpeg-2.7.2:= )
87 - sys-apps/dbus:=
88 - sys-apps/pciutils:=
89 - >=sys-libs/libcap-2.22:=
90 - virtual/udev
91 - x11-libs/cairo:=
92 - x11-libs/gdk-pixbuf:=
93 - gtk3? ( x11-libs/gtk+:3= )
94 - !gtk3? ( x11-libs/gtk+:2= )
95 - x11-libs/libdrm
96 - x11-libs/libX11:=
97 - x11-libs/libXcomposite:=
98 - x11-libs/libXcursor:=
99 - x11-libs/libXdamage:=
100 - x11-libs/libXext:=
101 - x11-libs/libXfixes:=
102 - >=x11-libs/libXi-1.6.0:=
103 - x11-libs/libXinerama:=
104 - x11-libs/libXrandr:=
105 - x11-libs/libXrender:=
106 - x11-libs/libXScrnSaver:=
107 - x11-libs/libXtst:=
108 - x11-libs/pango:=
109 - kerberos? ( virtual/krb5 )
110 - !gn? (
111 - >=app-accessibility/speech-dispatcher-0.8:=
112 - app-arch/snappy:=
113 - >=dev-libs/libevent-1.4.13:=
114 - dev-libs/libxml2:=[icu]
115 - dev-libs/libxslt:=
116 - media-libs/flac:=
117 - >=media-libs/harfbuzz-0.9.41:=[icu(+)]
118 - >=media-libs/libwebp-0.4.0:=
119 - sys-libs/zlib:=[minizip]
120 - )"
121 -DEPEND="${RDEPEND}
122 - >=app-arch/gzip-1.7
123 - !arm? (
124 - dev-lang/yasm
125 - )
126 - dev-lang/perl
127 - dev-perl/JSON
128 - >=dev-util/gperf-3.0.3
129 - dev-util/ninja
130 - sys-apps/hwids[usb(+)]
131 - >=sys-devel/bison-2.4.3
132 - sys-devel/flex
133 - virtual/pkgconfig"
134 -
135 -# For nvidia-drivers blocker, see bug #413637 .
136 -RDEPEND+="
137 - !=www-client/chromium-9999
138 - !<www-plugins/chrome-binary-plugins-37
139 - x11-misc/xdg-utils
140 - virtual/opengl
141 - virtual/ttf-fonts
142 - selinux? ( sec-policy/selinux-chromium )
143 - tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
144 - widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )"
145 -
146 -# Python dependencies. The DEPEND part needs to be kept in sync
147 -# with python_check_deps.
148 -DEPEND+=" $(python_gen_any_dep '
149 - dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
150 - >=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]
151 - dev-python/html5lib[${PYTHON_USEDEP}]
152 - dev-python/jinja[${PYTHON_USEDEP}]
153 - dev-python/ply[${PYTHON_USEDEP}]
154 - dev-python/simplejson[${PYTHON_USEDEP}]
155 -')"
156 -python_check_deps() {
157 - has_version --host-root "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" &&
158 - has_version --host-root ">=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]" &&
159 - has_version --host-root "dev-python/html5lib[${PYTHON_USEDEP}]" &&
160 - has_version --host-root "dev-python/jinja[${PYTHON_USEDEP}]" &&
161 - has_version --host-root "dev-python/ply[${PYTHON_USEDEP}]" &&
162 - has_version --host-root "dev-python/simplejson[${PYTHON_USEDEP}]"
163 -}
164 -
165 -if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
166 - EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
167 -fi
168 -
169 -DISABLE_AUTOFORMATTING="yes"
170 -DOC_CONTENTS="
171 -Some web pages may require additional fonts to display properly.
172 -Try installing some of the following packages if some characters
173 -are not displayed properly:
174 -- media-fonts/arphicfonts
175 -- media-fonts/bitstream-cyberbit
176 -- media-fonts/droid
177 -- media-fonts/ipamonafont
178 -- media-fonts/ja-ipafonts
179 -- media-fonts/takao-fonts
180 -- media-fonts/wqy-microhei
181 -- media-fonts/wqy-zenhei
182 -
183 -Depending on your desktop environment, you may need
184 -to install additional packages to get icons on the Downloads page.
185 -
186 -For KDE, the required package is kde-frameworks/oxygen-icons.
187 -
188 -For other desktop environments, try one of the following:
189 -- x11-themes/gnome-icon-theme
190 -- x11-themes/tango-icon-theme
191 -"
192 -
193 -pkg_pretend() {
194 - if [[ $(tc-getCC) == *gcc* ]] && \
195 - [[ $(gcc-major-version)$(gcc-minor-version) -lt 48 ]]; then
196 - die 'At least gcc 4.8 is required, see bugs: #535730, #525374, #518668.'
197 - fi
198 -
199 - # Check build requirements, bug #541816 and bug #471810 .
200 - CHECKREQS_MEMORY="3G"
201 - CHECKREQS_DISK_BUILD="5G"
202 - eshopts_push -s extglob
203 - if is-flagq '-g?(gdb)?([1-9])'; then
204 - CHECKREQS_DISK_BUILD="25G"
205 - fi
206 - eshopts_pop
207 - check-reqs_pkg_pretend
208 -}
209 -
210 -pkg_setup() {
211 - if [[ "${SLOT}" == "0" ]]; then
212 - CHROMIUM_SUFFIX=""
213 - else
214 - CHROMIUM_SUFFIX="-${SLOT}"
215 - fi
216 - CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
217 -
218 - # Make sure the build system will use the right python, bug #344367.
219 - python-any-r1_pkg_setup
220 -
221 - chromium_suid_sandbox_check_kernel_config
222 -}
223 -
224 -src_prepare() {
225 - epatch "${FILESDIR}/${PN}-system-ffmpeg-r2.patch"
226 - epatch "${FILESDIR}/${PN}-system-jinja-r11.patch"
227 - epatch "${FILESDIR}/${PN}-widevine-r1.patch"
228 - epatch "${FILESDIR}/${PN}-last-commit-position-r0.patch"
229 - epatch "${FILESDIR}/${PN}-system-zlib-r0.patch"
230 -
231 - epatch_user
232 -
233 - local conditional_bundled_libraries=""
234 - if ! use system-ffmpeg; then
235 - conditional_bundled_libraries+=" third_party/ffmpeg"
236 - fi
237 - if use gn; then
238 - conditional_bundled_libraries+="
239 - base/third_party/libevent
240 - third_party/adobe
241 - third_party/speech-dispatcher
242 - third_party/usb_ids
243 - third_party/xdg-utils
244 - third_party/yasm/run_yasm.py
245 - "
246 - fi
247 -
248 - # Remove most bundled libraries. Some are still needed.
249 - build/linux/unbundle/remove_bundled_libraries.py \
250 - ${conditional_bundled_libraries} \
251 - 'base/third_party/dmg_fp' \
252 - 'base/third_party/dynamic_annotations' \
253 - 'base/third_party/icu' \
254 - 'base/third_party/nspr' \
255 - 'base/third_party/superfasthash' \
256 - 'base/third_party/symbolize' \
257 - 'base/third_party/valgrind' \
258 - 'base/third_party/xdg_mime' \
259 - 'base/third_party/xdg_user_dirs' \
260 - 'breakpad/src/third_party/curl' \
261 - 'chrome/third_party/mozilla_security_manager' \
262 - 'courgette/third_party' \
263 - 'net/third_party/mozilla_security_manager' \
264 - 'net/third_party/nss' \
265 - 'third_party/WebKit' \
266 - 'third_party/analytics' \
267 - 'third_party/angle' \
268 - 'third_party/angle/src/common/third_party/numerics' \
269 - 'third_party/angle/src/third_party/compiler' \
270 - 'third_party/angle/src/third_party/libXNVCtrl' \
271 - 'third_party/angle/src/third_party/murmurhash' \
272 - 'third_party/angle/src/third_party/trace_event' \
273 - 'third_party/boringssl' \
274 - 'third_party/brotli' \
275 - 'third_party/cacheinvalidation' \
276 - 'third_party/catapult' \
277 - 'third_party/catapult/third_party/py_vulcanize' \
278 - 'third_party/catapult/third_party/py_vulcanize/third_party/rcssmin' \
279 - 'third_party/catapult/third_party/py_vulcanize/third_party/rjsmin' \
280 - 'third_party/catapult/tracing/third_party/components/polymer' \
281 - 'third_party/catapult/tracing/third_party/d3' \
282 - 'third_party/catapult/tracing/third_party/gl-matrix' \
283 - 'third_party/catapult/tracing/third_party/jszip' \
284 - 'third_party/catapult/tracing/third_party/mannwhitneyu' \
285 - 'third_party/cld_2' \
286 - 'third_party/cros_system_api' \
287 - 'third_party/cython/python_flags.py' \
288 - 'third_party/devscripts' \
289 - 'third_party/dom_distiller_js' \
290 - 'third_party/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \
291 - 'third_party/fips181' \
292 - 'third_party/flot' \
293 - 'third_party/google_input_tools' \
294 - 'third_party/google_input_tools/third_party/closure_library' \
295 - 'third_party/google_input_tools/third_party/closure_library/third_party/closure' \
296 - 'third_party/hunspell' \
297 - 'third_party/iccjpeg' \
298 - 'third_party/icu' \
299 - 'third_party/jstemplate' \
300 - 'third_party/khronos' \
301 - 'third_party/leveldatabase' \
302 - 'third_party/libXNVCtrl' \
303 - 'third_party/libaddressinput' \
304 - 'third_party/libjingle' \
305 - 'third_party/libjpeg_turbo' \
306 - 'third_party/libphonenumber' \
307 - 'third_party/libpng' \
308 - 'third_party/libsecret' \
309 - 'third_party/libsrtp' \
310 - 'third_party/libudev' \
311 - 'third_party/libusb' \
312 - 'third_party/libvpx' \
313 - 'third_party/libvpx/source/libvpx/third_party/x86inc' \
314 - 'third_party/libwebm' \
315 - 'third_party/libxml/chromium' \
316 - 'third_party/libyuv' \
317 - 'third_party/lss' \
318 - 'third_party/lzma_sdk' \
319 - 'third_party/mesa' \
320 - 'third_party/modp_b64' \
321 - 'third_party/mt19937ar' \
322 - 'third_party/openh264' \
323 - 'third_party/openmax_dl' \
324 - 'third_party/opus' \
325 - 'third_party/ots' \
326 - 'third_party/pdfium' \
327 - 'third_party/pdfium/third_party/agg23' \
328 - 'third_party/pdfium/third_party/base' \
329 - 'third_party/pdfium/third_party/bigint' \
330 - 'third_party/pdfium/third_party/freetype' \
331 - 'third_party/pdfium/third_party/lcms2-2.6' \
332 - 'third_party/pdfium/third_party/libjpeg' \
333 - 'third_party/pdfium/third_party/libopenjpeg20' \
334 - 'third_party/pdfium/third_party/libpng16' \
335 - 'third_party/pdfium/third_party/libtiff' \
336 - 'third_party/pdfium/third_party/zlib_v128' \
337 - 'third_party/polymer' \
338 - 'third_party/protobuf' \
339 - 'third_party/protobuf/third_party/six' \
340 - 'third_party/qcms' \
341 - 'third_party/re2' \
342 - 'third_party/sfntly' \
343 - 'third_party/skia' \
344 - 'third_party/smhasher' \
345 - 'third_party/sqlite' \
346 - 'third_party/tcmalloc' \
347 - 'third_party/usrsctp' \
348 - 'third_party/web-animations-js' \
349 - 'third_party/webdriver' \
350 - 'third_party/webrtc' \
351 - 'third_party/widevine' \
352 - 'third_party/woff2' \
353 - 'third_party/x86inc' \
354 - 'third_party/zlib/google' \
355 - 'url/third_party/mozilla' \
356 - 'v8/src/third_party/fdlibm' \
357 - 'v8/src/third_party/valgrind' \
358 - --do-remove || die
359 -}
360 -
361 -src_configure() {
362 - local myconf_gyp=""
363 - local myconf_gn=""
364 -
365 - # GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
366 - myconf_gn+=" is_debug=false"
367 -
368 - # Never tell the build system to "enable" SSE2, it has a few unexpected
369 - # additions, bug #336871.
370 - myconf_gyp+=" -Ddisable_sse2=1"
371 -
372 - # Disable nacl, we can't build without pnacl (http://crbug.com/269560).
373 - myconf_gyp+=" -Ddisable_nacl=1"
374 - myconf_gn+=" enable_nacl=false"
375 -
376 - # Make it possible to remove third_party/adobe.
377 - echo > "${T}/flapper_version.h" || die
378 - myconf_gyp+=" -Dflapper_version_h_file=${T}/flapper_version.h"
379 -
380 - # Use system-provided libraries.
381 - # TODO: use_system_hunspell (upstream changes needed).
382 - # TODO: use_system_icu (bug #576370).
383 - # TODO: use_system_libjpeg (bug #584518).
384 - # TODO: use_system_libpng (bug #578212).
385 - # TODO: use_system_libsrtp (bug #459932).
386 - # TODO: use_system_libusb (http://crbug.com/266149).
387 - # TODO: use_system_libvpx (http://crbug.com/494939).
388 - # TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077).
389 - # TODO: use_system_protobuf (bug #525560).
390 - # TODO: use_system_re2 (bug #571156).
391 - # TODO: use_system_ssl (http://crbug.com/58087).
392 - # TODO: use_system_sqlite (http://crbug.com/22208).
393 - myconf_gyp+="
394 - -Duse_system_bzip2=1
395 - -Duse_system_ffmpeg=$(usex system-ffmpeg 1 0)
396 - -Duse_system_flac=1
397 - -Duse_system_harfbuzz=1
398 - -Duse_system_jsoncpp=1
399 - -Duse_system_libevent=1
400 - -Duse_system_libwebp=1
401 - -Duse_system_libxml=1
402 - -Duse_system_libxslt=1
403 - -Duse_system_minizip=1
404 - -Duse_system_nspr=1
405 - -Duse_system_snappy=1
406 - -Duse_system_speex=1
407 - -Duse_system_xdg_utils=1
408 - -Duse_system_zlib=1"
409 -
410 - local gn_system_libraries="
411 - flac
412 - harfbuzz-ng
413 - libevent
414 - libwebp
415 - libxml
416 - libxslt
417 - snappy
418 - yasm
419 - zlib"
420 - if use system-ffmpeg; then
421 - gn_system_libraries+=" ffmpeg"
422 - fi
423 - build/linux/unbundle/replace_gn_files.py --system-libraries ${gn_system_libraries} || die
424 -
425 - # Needed for system icu - we don't need additional data files.
426 - # myconf_gyp+=" -Dicu_use_data_file_flag=0"
427 -
428 - # TODO: patch gyp so that this arm conditional is not needed.
429 - if ! use arm; then
430 - myconf_gyp+="
431 - -Duse_system_yasm=1"
432 - fi
433 -
434 - # Optional dependencies.
435 - # TODO: linux_link_kerberos, bug #381289.
436 - myconf_gyp+="
437 - $(gyp_use cups)
438 - $(gyp_use gnome use_gconf)
439 - $(gyp_use gnome-keyring use_gnome_keyring)
440 - $(gyp_use gnome-keyring linux_link_gnome_keyring)
441 - $(gyp_use gtk3)
442 - $(gyp_use hangouts enable_hangout_services_extension)
443 - $(gyp_use kerberos)
444 - $(gyp_use pulseaudio)
445 - $(gyp_use tcmalloc use_allocator tcmalloc none)
446 - $(gyp_use widevine enable_widevine)"
447 -
448 - # TODO: support USE=gnome-keyring for GN
449 - myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
450 - myconf_gn+=" enable_widevine=$(usex widevine true false)"
451 - myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
452 - myconf_gn+=" use_cups=$(usex cups true false)"
453 - myconf_gn+=" use_gconf=$(usex gnome true false)"
454 - myconf_gn+=" use_gtk3=$(usex gtk3 true false)"
455 - myconf_gn+=" use_kerberos=$(usex kerberos true false)"
456 - myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
457 -
458 - # Use explicit library dependencies instead of dlopen.
459 - # This makes breakages easier to detect by revdep-rebuild.
460 - myconf_gyp+="
461 - -Dlinux_link_gsettings=1
462 - -Dlinux_link_libpci=1
463 - -Dlinux_link_libspeechd=1
464 - -Dlibspeechd_h_prefix=speech-dispatcher/"
465 -
466 - # TODO: link_pulseaudio=true for GN.
467 -
468 - # TODO: use the file at run time instead of effectively compiling it in.
469 - myconf_gyp+="
470 - -Dusb_ids_path=/usr/share/misc/usb.ids"
471 -
472 - myconf_gyp+=" -Dfieldtrial_testing_like_official_build=1"
473 - myconf_gn+=" fieldtrial_testing_like_official_build=true"
474 -
475 - if [[ $(tc-getCC) == *clang* ]]; then
476 - myconf_gyp+=" -Dclang=1"
477 - myconf_gn+=" is_clang=true clang_base_path=\"/usr\" clang_use_chrome_plugins=false"
478 - else
479 - myconf_gyp+=" -Dclang=0"
480 - myconf_gn+=" is_clang=false"
481 - fi
482 -
483 - # Never use bundled gold binary. Disable gold linker flags for now.
484 - # Do not use bundled clang.
485 - myconf_gyp+="
486 - -Dclang_use_chrome_plugins=0
487 - -Dhost_clang=0
488 - -Dlinux_use_bundled_binutils=0
489 - -Dlinux_use_bundled_gold=0
490 - -Dlinux_use_gold_flags=0
491 - -Dsysroot="
492 - myconf_gn+=" use_sysroot=false"
493 -
494 - ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
495 - myconf_gyp+=" -Dproprietary_codecs=1 -Dffmpeg_branding=${ffmpeg_branding}"
496 - myconf_gn+=" proprietary_codecs=true ffmpeg_branding=\"${ffmpeg_branding}\""
497 -
498 - # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
499 - # Note: these are for Gentoo use ONLY. For your own distribution,
500 - # please get your own set of keys. Feel free to contact chromium@g.o
501 - # for more info.
502 - local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
503 - local google_default_client_id="329227923882.apps.googleusercontent.com"
504 - local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
505 - myconf_gyp+=" -Dgoogle_api_key=${google_api_key}
506 - -Dgoogle_default_client_id=${google_default_client_id}
507 - -Dgoogle_default_client_secret=${google_default_client_secret}"
508 - myconf_gn+=" google_api_key=\"${google_api_key}\""
509 - myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
510 - myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
511 -
512 - local myarch="$(tc-arch)"
513 - if [[ $myarch = amd64 ]] ; then
514 - target_arch=x64
515 - ffmpeg_target_arch=x64
516 - elif [[ $myarch = x86 ]] ; then
517 - target_arch=ia32
518 - ffmpeg_target_arch=ia32
519 - elif [[ $myarch = arm64 ]] ; then
520 - target_arch=arm64
521 - ffmpeg_target_arch=arm64
522 - elif [[ $myarch = arm ]] ; then
523 - target_arch=arm
524 - ffmpeg_target_arch=$(usex neon arm-neon arm)
525 - # TODO: re-enable NaCl (NativeClient).
526 - local CTARGET=${CTARGET:-${CHOST}}
527 - if [[ $(tc-is-softfloat) == "no" ]]; then
528 -
529 - myconf_gyp+=" -Darm_float_abi=hard"
530 - fi
531 - filter-flags "-mfpu=*"
532 - use neon || myconf_gyp+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}"
533 -
534 - if [[ ${CTARGET} == armv[78]* ]]; then
535 - myconf_gyp+=" -Darmv7=1"
536 - else
537 - myconf_gyp+=" -Darmv7=0"
538 - fi
539 - myconf_gyp+=" -Dsysroot=
540 - $(gyp_use neon arm_neon)
541 - -Ddisable_nacl=1"
542 - else
543 - die "Failed to determine target arch, got '$myarch'."
544 - fi
545 -
546 - myconf_gyp+=" -Dtarget_arch=${target_arch}"
547 -
548 - # Make sure that -Werror doesn't get added to CFLAGS by the build system.
549 - # Depending on GCC version the warnings are different and we don't want
550 - # the build to fail because of that.
551 - myconf_gyp+=" -Dwerror="
552 - myconf_gn+=" treat_warnings_as_errors=false"
553 -
554 - # Disable fatal linker warnings, bug 506268.
555 - myconf_gyp+=" -Ddisable_fatal_linker_warnings=1"
556 - myconf_gn+=" fatal_linker_warnings=false"
557 -
558 - # Avoid CFLAGS problems, bug #352457, bug #390147.
559 - if ! use custom-cflags; then
560 - replace-flags "-Os" "-O2"
561 - strip-flags
562 -
563 - # Prevent linker from running out of address space, bug #471810 .
564 - if use x86; then
565 - filter-flags "-g*"
566 - fi
567 -
568 - # Prevent libvpx build failures. Bug 530248, 544702, 546984.
569 - if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
570 - filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
571 - fi
572 - fi
573 -
574 - # Make sure the build system will use the right tools, bug #340795.
575 - tc-export AR CC CXX NM
576 -
577 - # Tools for building programs to be executed on the build system, bug #410883.
578 - if tc-is-cross-compiler; then
579 - export AR_host=$(tc-getBUILD_AR)
580 - export CC_host=$(tc-getBUILD_CC)
581 - export CXX_host=$(tc-getBUILD_CXX)
582 - export NM_host=$(tc-getBUILD_NM)
583 - fi
584 -
585 - # Bug 491582.
586 - export TMPDIR="${WORKDIR}/temp"
587 - mkdir -p -m 755 "${TMPDIR}" || die
588 -
589 - if ! use system-ffmpeg; then
590 - local build_ffmpeg_args=""
591 - if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
592 - build_ffmpeg_args+=" --disable-asm"
593 - fi
594 -
595 - # Re-configure bundled ffmpeg. See bug #491378 for example reasons.
596 - einfo "Configuring bundled ffmpeg..."
597 - pushd third_party/ffmpeg > /dev/null || die
598 - chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
599 - --branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
600 - chromium/scripts/copy_config.sh || die
601 - chromium/scripts/generate_gyp.py || die
602 - popd > /dev/null || die
603 - fi
604 -
605 - third_party/libaddressinput/chromium/tools/update-strings.py || die
606 -
607 - touch chrome/test/data/webui/i18n_process_css_test.html || die
608 -
609 - einfo "Configuring Chromium..."
610 - if use gn; then
611 - tools/gn/bootstrap/bootstrap.py -v --gn-gen-args "${myconf_gn}" || die
612 - out/Release/gn gen --args="${myconf_gn}" out/Release || die
613 - else
614 - build/linux/unbundle/replace_gyp_files.py ${myconf_gyp} || die
615 - egyp_chromium ${myconf_gyp} || die
616 - fi
617 -}
618 -
619 -eninja() {
620 - if [[ -z ${NINJAOPTS+set} ]]; then
621 - local jobs=$(makeopts_jobs)
622 - local loadavg=$(makeopts_loadavg)
623 -
624 - if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
625 - NINJAOPTS+=" -j ${jobs}"
626 - fi
627 - if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
628 - NINJAOPTS+=" -l ${loadavg}"
629 - fi
630 - fi
631 - set -- ninja -v ${NINJAOPTS} "$@"
632 - echo "$@"
633 - "$@"
634 -}
635 -
636 -src_compile() {
637 - local ninja_targets="chrome chrome_sandbox chromedriver"
638 -
639 - # Build mksnapshot and pax-mark it.
640 - eninja -C out/Release mksnapshot || die
641 - pax-mark m out/Release/mksnapshot
642 -
643 - # Even though ninja autodetects number of CPUs, we respect
644 - # user's options, for debugging with -j 1 or any other reason.
645 - eninja -C out/Release ${ninja_targets} || die
646 -
647 - pax-mark m out/Release/chrome
648 -}
649 -
650 -src_install() {
651 - exeinto "${CHROMIUM_HOME}"
652 - doexe out/Release/chrome || die
653 -
654 - newexe out/Release/chrome_sandbox chrome-sandbox || die
655 - fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
656 -
657 - doexe out/Release/chromedriver || die
658 - use widevine && doexe out/Release/libwidevinecdmadapter.so
659 -
660 - # if ! use arm; then
661 - # doexe out/Release/nacl_helper{,_bootstrap} || die
662 - # insinto "${CHROMIUM_HOME}"
663 - # doins out/Release/nacl_irt_*.nexe || die
664 - # doins out/Release/libppGoogleNaClPluginChrome.so || die
665 - # fi
666 -
667 - local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
668 - if [[ -n ${CHROMIUM_SUFFIX} ]]; then
669 - sedargs+=(
670 - -e "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g"
671 - -e "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g"
672 - -e "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:"
673 - )
674 - fi
675 - sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
676 - doexe chromium-launcher.sh
677 -
678 - # It is important that we name the target "chromium-browser",
679 - # xdg-utils expect it; bug #355517.
680 - dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
681 - # keep the old symlink around for consistency
682 - dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
683 -
684 - dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver${CHROMIUM_SUFFIX} || die
685 -
686 - # Allow users to override command-line options, bug #357629.
687 - dodir /etc/chromium || die
688 - insinto /etc/chromium
689 - newins "${FILESDIR}/chromium.default" "default" || die
690 -
691 - pushd out/Release/locales > /dev/null || die
692 - chromium_remove_language_paks
693 - popd
694 -
695 - insinto "${CHROMIUM_HOME}"
696 - doins out/Release/*.bin || die
697 - doins out/Release/*.pak || die
698 -
699 - doins out/Release/icudtl.dat || die
700 -
701 - doins -r out/Release/locales || die
702 - doins -r out/Release/resources || die
703 -
704 - newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
705 - newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
706 -
707 - # Install icons and desktop entry.
708 - local branding size
709 - for size in 16 22 24 32 48 64 128 256 ; do
710 - case ${size} in
711 - 16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
712 - *) branding="chrome/app/theme/chromium" ;;
713 - esac
714 - newicon -s ${size} "${branding}/product_logo_${size}.png" \
715 - chromium-browser${CHROMIUM_SUFFIX}.png
716 - done
717 -
718 - local mime_types="text/html;text/xml;application/xhtml+xml;"
719 - mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
720 - mime_types+="x-scheme-handler/ftp;" # bug #412185
721 - mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
722 - make_desktop_entry \
723 - chromium-browser${CHROMIUM_SUFFIX} \
724 - "Chromium${CHROMIUM_SUFFIX}" \
725 - chromium-browser${CHROMIUM_SUFFIX} \
726 - "Network;WebBrowser" \
727 - "MimeType=${mime_types}\nStartupWMClass=chromium-browser"
728 - sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
729 -
730 - # Install GNOME default application entry (bug #303100).
731 - if use gnome; then
732 - dodir /usr/share/gnome-control-center/default-apps || die
733 - insinto /usr/share/gnome-control-center/default-apps
734 - newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
735 - if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
736 - sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
737 - "${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
738 - fi
739 - fi
740 -
741 - readme.gentoo_create_doc
742 -}
743 -
744 -pkg_preinst() {
745 - gnome2_icon_savelist
746 -}
747 -
748 -pkg_postrm() {
749 - gnome2_icon_cache_update
750 - xdg_desktop_database_update
751 -}
752 -
753 -pkg_postinst() {
754 - gnome2_icon_cache_update
755 - xdg_desktop_database_update
756 - readme.gentoo_print_elog
757 -}
758
759 diff --git a/www-client/chromium/chromium-54.0.2840.34.ebuild b/www-client/chromium/chromium-54.0.2840.59.ebuild
760 similarity index 100%
761 rename from www-client/chromium/chromium-54.0.2840.34.ebuild
762 rename to www-client/chromium/chromium-54.0.2840.59.ebuild