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: Fri, 19 Oct 2018 02:13:49
Message-Id: 1539915210.bf97ff2161b55af21a23ec63aa5a1083afb07f4d.floppym@gentoo
1 commit: bf97ff2161b55af21a23ec63aa5a1083afb07f4d
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 19 02:13:30 2018 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 19 02:13:30 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf97ff21
7
8 www-client/chromium: stable channel bump (70.0.3538.67)
9
10 Package-Manager: Portage-2.3.51_p1, Repoman-2.3.11_p26
11 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
12
13 www-client/chromium/Manifest | 3 +-
14 www-client/chromium/chromium-70.0.3538.45.ebuild | 695 ---------------------
15 ...3538.54.ebuild => chromium-70.0.3538.67.ebuild} | 0
16 3 files changed, 1 insertion(+), 697 deletions(-)
17
18 diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
19 index f9246fe25f2..bd639a25d4c 100644
20 --- a/www-client/chromium/Manifest
21 +++ b/www-client/chromium/Manifest
22 @@ -1,5 +1,4 @@
23 DIST chromium-69.0.3497.100.tar.xz 617374764 BLAKE2B 45805e7a743982c167974cbe223b126dad83cca2eca6c78b6fe707431b2df45cb30271c0ee5002839c84f661260063852a1e1a913d26a073a87fb20e7b4d964e SHA512 bc9dd4a63eb9a8c369bd360f7fd0fb9b72addfa553e9a9d8adbfafe7ec4af39ec1fb3dd6523af1f17cb141aaf017ca4b6abc357c4a595ff627e88c58e87e8f6f
24 -DIST chromium-70.0.3538.45.tar.xz 622986816 BLAKE2B f21d7755251e62c52dd8ea7a7e3300b77c8ca361671632e778becd68ff205c4d84386b7feab12aeb1f18082a79dca4d69a414294c2055bbb29ef448a27c783e0 SHA512 a5f87fd765e7cb9b07ffa3b04aed2d5a7f94c213de6b9d0abcb3e1e8e640e3b70e44d233c2865b418a021285fd1e797db49e3e9dd1cc9ac24f815419d57132a1
25 -DIST chromium-70.0.3538.54.tar.xz 623081708 BLAKE2B 795bb43b3f36f9caedd72959446398b3129de7428fa055427aca8df962cb10f450ebaa32ae9bb538fd2d6842c198cab6e8eb9a4f7d2f7c74c5d6abfd75740669 SHA512 c20ee15f6f0856940ac6696de6fe258c528719101c10ef8f04773355e9c60a41eba5c3ace75f5be368c9b8107a3c5053bf56727aa3626ad012f8cd5371eb7d0e
26 +DIST chromium-70.0.3538.67.tar.xz 623057648 BLAKE2B fd6667d8ca82721ca4cb70b39f66c88f1e10f82a5f9b8beadabd56882f9e4e32e249b25f4484a323f8efc9d940f2afb1c73b76cea0803ce18c138adfc8bdc3c0 SHA512 923dd574dce15627678d1601d34e37285ac438bb61ee252ecd15bdec3e5f76066897848addeedd3c61f2c5e550a284d14e0af3d02ae5666c9f6eb047c9d4441f
27 DIST chromium-71.0.3559.6.tar.xz 626881656 BLAKE2B 4712e7bb9c7018ed4ace7f8d7d7c313e26c6a156c937084f5553e18bd38edd98536b09e867718ed1e9e561c3f39ddc6de4802b780e33d72f1329f636fa356250 SHA512 12ba43ee94aa185d13035c01755b0166082fe4831f1787e755de11a9b6121c0384eb04352f0582659a23908acc4544db359a30e0f22715d69f357c8a1baa3aac
28 DIST chromium-71.0.3573.0.tar.xz 626729588 BLAKE2B 5fc5b030f8bfef2721234026ba5411896795132592db2c4732f98b08d74b31ed2fe9b59efc78754b5f72d5908f1d5ccb1054abdead51c53235c1118fa91b2cbf SHA512 27a8dd60dc319b33d954440b1e8aac382a4fe6afaca88e63175b72c6040c5bb5653d01ecabd8e8ebd99d954781299fa3bf44518c0fc396d9d56a97bdb1291503
29
30 diff --git a/www-client/chromium/chromium-70.0.3538.45.ebuild b/www-client/chromium/chromium-70.0.3538.45.ebuild
31 deleted file mode 100644
32 index 536322cbe16..00000000000
33 --- a/www-client/chromium/chromium-70.0.3538.45.ebuild
34 +++ /dev/null
35 @@ -1,695 +0,0 @@
36 -# Copyright 1999-2018 Gentoo Authors
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI="6"
40 -PYTHON_COMPAT=( python2_7 )
41 -
42 -CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
43 - 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
44 - sv sw ta te th tr uk vi zh-CN zh-TW"
45 -
46 -inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
47 -
48 -DESCRIPTION="Open-source version of Google Chrome web browser"
49 -HOMEPAGE="http://chromium.org/"
50 -SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz"
51 -
52 -LICENSE="BSD"
53 -SLOT="0"
54 -KEYWORDS="~amd64 ~x86"
55 -IUSE="component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
56 -RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
57 -
58 -COMMON_DEPEND="
59 - app-accessibility/at-spi2-atk:2
60 - app-arch/bzip2:=
61 - cups? ( >=net-print/cups-1.3.11:= )
62 - dev-libs/atk
63 - dev-libs/expat:=
64 - dev-libs/glib:2
65 - system-icu? ( >=dev-libs/icu-59:= )
66 - >=dev-libs/libxml2-2.9.4-r3:=[icu]
67 - dev-libs/libxslt:=
68 - dev-libs/nspr:=
69 - >=dev-libs/nss-3.26:=
70 - >=dev-libs/re2-0.2016.05.01:=
71 - gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
72 - >=media-libs/alsa-lib-1.0.19:=
73 - media-libs/fontconfig:=
74 - media-libs/freetype:=
75 - >=media-libs/harfbuzz-1.8.8:=[icu(-)]
76 - media-libs/libjpeg-turbo:=
77 - media-libs/libpng:=
78 - system-libvpx? ( media-libs/libvpx:=[postproc,svc] )
79 - >=media-libs/openh264-1.6.0:=
80 - pulseaudio? ( media-sound/pulseaudio:= )
81 - system-ffmpeg? (
82 - >=media-video/ffmpeg-4:=
83 - || (
84 - media-video/ffmpeg[-samba]
85 - >=net-fs/samba-4.5.10-r1[-debug(-)]
86 - )
87 - !=net-fs/samba-4.5.12-r0
88 - media-libs/opus:=
89 - )
90 - sys-apps/dbus:=
91 - sys-apps/pciutils:=
92 - virtual/udev
93 - x11-libs/cairo:=
94 - x11-libs/gdk-pixbuf:2
95 - x11-libs/gtk+:3[X]
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/libXrandr:=
104 - x11-libs/libXrender:=
105 - x11-libs/libXScrnSaver:=
106 - x11-libs/libXtst:=
107 - x11-libs/pango:=
108 - app-arch/snappy:=
109 - media-libs/flac:=
110 - >=media-libs/libwebp-0.4.0:=
111 - sys-libs/zlib:=[minizip]
112 - kerberos? ( virtual/krb5 )
113 -"
114 -# For nvidia-drivers blocker, see bug #413637 .
115 -RDEPEND="${COMMON_DEPEND}
116 - !<www-plugins/chrome-binary-plugins-57
117 - x11-misc/xdg-utils
118 - virtual/opengl
119 - virtual/ttf-fonts
120 - selinux? ( sec-policy/selinux-chromium )
121 - tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
122 - widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
123 -"
124 -# dev-vcs/git - https://bugs.gentoo.org/593476
125 -# sys-apps/sandbox - https://crbug.com/586444
126 -DEPEND="${COMMON_DEPEND}
127 - >=app-arch/gzip-1.7
128 - !arm? (
129 - dev-lang/yasm
130 - )
131 - dev-lang/perl
132 - dev-util/gn
133 - >=dev-util/gperf-3.0.3
134 - >=dev-util/ninja-1.7.2
135 - >=net-libs/nodejs-7.6.0[inspector]
136 - sys-apps/hwids[usb(+)]
137 - >=sys-devel/bison-2.4.3
138 - sys-devel/flex
139 - >=sys-devel/clang-5
140 - virtual/pkgconfig
141 - dev-vcs/git
142 -"
143 -
144 -if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
145 - EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
146 -fi
147 -
148 -DISABLE_AUTOFORMATTING="yes"
149 -DOC_CONTENTS="
150 -Some web pages may require additional fonts to display properly.
151 -Try installing some of the following packages if some characters
152 -are not displayed properly:
153 -- media-fonts/arphicfonts
154 -- media-fonts/droid
155 -- media-fonts/ipamonafont
156 -- media-fonts/noto
157 -- media-fonts/ja-ipafonts
158 -- media-fonts/takao-fonts
159 -- media-fonts/wqy-microhei
160 -- media-fonts/wqy-zenhei
161 -
162 -To fix broken icons on the Downloads page, you should install an icon
163 -theme that covers the appropriate MIME types, and configure this as your
164 -GTK+ icon theme.
165 -"
166 -
167 -PATCHES=(
168 - "${FILESDIR}/chromium-compiler-r4.patch"
169 - "${FILESDIR}/chromium-widevine-r2.patch"
170 - "${FILESDIR}/chromium-webrtc-r0.patch"
171 - "${FILESDIR}/chromium-memcpy-r0.patch"
172 - "${FILESDIR}/chromium-math.h-r0.patch"
173 - "${FILESDIR}/chromium-stdint.patch"
174 - "${FILESDIR}/chromium-pdfium-stdlib-r0.patch"
175 -)
176 -
177 -pre_build_checks() {
178 - #if [[ ${MERGE_TYPE} != binary ]]; then
179 - # local -x CPP="$(tc-getCXX) -E"
180 - # if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then
181 - # # bugs: #601654
182 - # die "At least clang 3.9.1 is required"
183 - # fi
184 - # if tc-is-gcc && ! version_is_at_least 5.0 "$(gcc-version)"; then
185 - # # bugs: #535730, #525374, #518668, #600288, #627356
186 - # die "At least gcc 5.0 is required"
187 - # fi
188 - #fi
189 -
190 - # Check build requirements, bug #541816 and bug #471810 .
191 - CHECKREQS_MEMORY="3G"
192 - CHECKREQS_DISK_BUILD="5G"
193 - eshopts_push -s extglob
194 - if is-flagq '-g?(gdb)?([1-9])'; then
195 - CHECKREQS_DISK_BUILD="25G"
196 - if ! use component-build; then
197 - CHECKREQS_MEMORY="16G"
198 - fi
199 - fi
200 - eshopts_pop
201 - check-reqs_pkg_setup
202 -}
203 -
204 -pkg_pretend() {
205 - pre_build_checks
206 -}
207 -
208 -pkg_setup() {
209 - pre_build_checks
210 -
211 - chromium_suid_sandbox_check_kernel_config
212 -}
213 -
214 -src_prepare() {
215 - # Calling this here supports resumption via FEATURES=keepwork
216 - python_setup
217 -
218 - default
219 -
220 - mkdir -p third_party/node/linux/node-linux-x64/bin || die
221 - ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
222 -
223 - local keeplibs=(
224 - base/third_party/dmg_fp
225 - base/third_party/dynamic_annotations
226 - base/third_party/icu
227 - base/third_party/nspr
228 - base/third_party/superfasthash
229 - base/third_party/symbolize
230 - base/third_party/valgrind
231 - base/third_party/xdg_mime
232 - base/third_party/xdg_user_dirs
233 - buildtools/third_party/libc++
234 - buildtools/third_party/libc++abi
235 - chrome/third_party/mozilla_security_manager
236 - courgette/third_party
237 - net/third_party/http2
238 - net/third_party/mozilla_security_manager
239 - net/third_party/nss
240 - net/third_party/quic
241 - net/third_party/spdy
242 - net/third_party/uri_template
243 - third_party/WebKit
244 - third_party/abseil-cpp
245 - third_party/analytics
246 - third_party/angle
247 - third_party/angle/src/common/third_party/base
248 - third_party/angle/src/common/third_party/smhasher
249 - third_party/angle/src/third_party/compiler
250 - third_party/angle/src/third_party/libXNVCtrl
251 - third_party/angle/src/third_party/trace_event
252 - third_party/angle/third_party/glslang
253 - third_party/angle/third_party/spirv-headers
254 - third_party/angle/third_party/spirv-tools
255 - third_party/angle/third_party/vulkan-headers
256 - third_party/angle/third_party/vulkan-loader
257 - third_party/angle/third_party/vulkan-tools
258 - third_party/angle/third_party/vulkan-validation-layers
259 - third_party/apple_apsl
260 - third_party/blink
261 - third_party/boringssl
262 - third_party/boringssl/src/third_party/fiat
263 - third_party/breakpad
264 - third_party/breakpad/breakpad/src/third_party/curl
265 - third_party/brotli
266 - third_party/cacheinvalidation
267 - third_party/catapult
268 - third_party/catapult/common/py_vulcanize/third_party/rcssmin
269 - third_party/catapult/common/py_vulcanize/third_party/rjsmin
270 - third_party/catapult/third_party/beautifulsoup4
271 - third_party/catapult/third_party/html5lib-python
272 - third_party/catapult/third_party/polymer
273 - third_party/catapult/third_party/six
274 - third_party/catapult/tracing/third_party/d3
275 - third_party/catapult/tracing/third_party/gl-matrix
276 - third_party/catapult/tracing/third_party/jszip
277 - third_party/catapult/tracing/third_party/mannwhitneyu
278 - third_party/catapult/tracing/third_party/oboe
279 - third_party/catapult/tracing/third_party/pako
280 - third_party/ced
281 - third_party/cld_3
282 - third_party/crashpad
283 - third_party/crashpad/crashpad/third_party/zlib
284 - third_party/crc32c
285 - third_party/cros_system_api
286 - third_party/devscripts
287 - third_party/dom_distiller_js
288 - third_party/fips181
289 - third_party/flatbuffers
290 - third_party/flot
291 - third_party/freetype
292 - third_party/glslang-angle
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/googletest
297 - third_party/hunspell
298 - third_party/iccjpeg
299 - third_party/inspector_protocol
300 - third_party/jinja2
301 - third_party/jstemplate
302 - third_party/khronos
303 - third_party/leveldatabase
304 - third_party/libXNVCtrl
305 - third_party/libaddressinput
306 - third_party/libaom
307 - third_party/libaom/source/libaom/third_party/vector
308 - third_party/libaom/source/libaom/third_party/x86inc
309 - third_party/libjingle
310 - third_party/libphonenumber
311 - third_party/libsecret
312 - third_party/libsrtp
313 - third_party/libsync
314 - third_party/libudev
315 - third_party/libwebm
316 - third_party/libxml/chromium
317 - third_party/libyuv
318 - third_party/llvm
319 - third_party/lss
320 - third_party/lzma_sdk
321 - third_party/markupsafe
322 - third_party/mesa
323 - third_party/metrics_proto
324 - third_party/modp_b64
325 - third_party/node
326 - third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
327 - third_party/openmax_dl
328 - third_party/ots
329 - third_party/pdfium
330 - third_party/pdfium/third_party/agg23
331 - third_party/pdfium/third_party/base
332 - third_party/pdfium/third_party/bigint
333 - third_party/pdfium/third_party/freetype
334 - third_party/pdfium/third_party/lcms
335 - third_party/pdfium/third_party/libopenjpeg20
336 - third_party/pdfium/third_party/libpng16
337 - third_party/pdfium/third_party/libtiff
338 - third_party/pdfium/third_party/skia_shared
339 - third_party/perfetto
340 - third_party/ply
341 - third_party/polymer
342 - third_party/protobuf
343 - third_party/protobuf/third_party/six
344 - third_party/pyjson5
345 - third_party/qcms
346 - third_party/rnnoise
347 - third_party/s2cellid
348 - third_party/sfntly
349 - third_party/simplejson
350 - third_party/skia
351 - third_party/skia/third_party/gif
352 - third_party/skia/third_party/skcms
353 - third_party/skia/third_party/vulkan
354 - third_party/smhasher
355 - third_party/spirv-headers
356 - third_party/spirv-tools-angle
357 - third_party/sqlite
358 - third_party/swiftshader
359 - third_party/swiftshader/third_party/llvm-subzero
360 - third_party/swiftshader/third_party/subzero
361 - third_party/unrar
362 - third_party/usrsctp
363 - third_party/vulkan
364 - third_party/vulkan-validation-layers
365 - third_party/web-animations-js
366 - third_party/webdriver
367 - third_party/webrtc
368 - third_party/webrtc/common_audio/third_party/fft4g
369 - third_party/webrtc/common_audio/third_party/spl_sqrt_floor
370 - third_party/webrtc/modules/third_party/fft
371 - third_party/webrtc/modules/third_party/g711
372 - third_party/webrtc/modules/third_party/g722
373 - third_party/webrtc/rtc_base/third_party/base64
374 - third_party/webrtc/rtc_base/third_party/sigslot
375 - third_party/widevine
376 - third_party/woff2
377 - third_party/zlib/google
378 - url/third_party/mozilla
379 - v8/src/third_party/valgrind
380 - v8/src/third_party/utf8-decoder
381 - v8/third_party/inspector_protocol
382 - v8/third_party/v8
383 -
384 - # gyp -> gn leftovers
385 - base/third_party/libevent
386 - third_party/adobe
387 - third_party/speech-dispatcher
388 - third_party/usb_ids
389 - third_party/xdg-utils
390 - third_party/yasm/run_yasm.py
391 - )
392 - if ! use system-ffmpeg; then
393 - keeplibs+=( third_party/ffmpeg third_party/opus )
394 - fi
395 - if ! use system-icu; then
396 - keeplibs+=( third_party/icu )
397 - fi
398 - if ! use system-libvpx; then
399 - keeplibs+=( third_party/libvpx )
400 - keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc )
401 - fi
402 - if use tcmalloc; then
403 - keeplibs+=( third_party/tcmalloc )
404 - fi
405 -
406 - # Remove most bundled libraries. Some are still needed.
407 - build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
408 -}
409 -
410 -src_configure() {
411 - # Calling this here supports resumption via FEATURES=keepwork
412 - python_setup
413 -
414 - local myconf_gn=""
415 -
416 - # Make sure the build system will use the right tools, bug #340795.
417 - tc-export AR CC CXX NM
418 -
419 - if ! tc-is-clang; then
420 - # Force clang since gcc is pretty broken at the moment.
421 - CC=${CHOST}-clang
422 - CXX=${CHOST}-clang++
423 - strip-unsupported-flags
424 - fi
425 -
426 - if tc-is-clang; then
427 - myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
428 - else
429 - myconf_gn+=" is_clang=false"
430 - fi
431 -
432 - # Define a custom toolchain for GN
433 - myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
434 -
435 - if tc-is-cross-compiler; then
436 - tc-export BUILD_{AR,CC,CXX,NM}
437 - myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
438 - myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
439 - else
440 - myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
441 - fi
442 -
443 - # GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
444 - myconf_gn+=" is_debug=false"
445 -
446 - # Component build isn't generally intended for use by end users. It's mostly useful
447 - # for development and debugging.
448 - myconf_gn+=" is_component_build=$(usex component-build true false)"
449 -
450 - # https://chromium.googlesource.com/chromium/src/+/lkcr/docs/jumbo.md
451 - myconf_gn+=" use_jumbo_build=$(usex jumbo-build true false)"
452 -
453 - myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
454 -
455 - # Disable nacl, we can't build without pnacl (http://crbug.com/269560).
456 - myconf_gn+=" enable_nacl=false"
457 -
458 - # Use system-provided libraries.
459 - # TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
460 - # TODO: use_system_hunspell (upstream changes needed).
461 - # TODO: use_system_libsrtp (bug #459932).
462 - # TODO: use_system_protobuf (bug #525560).
463 - # TODO: use_system_ssl (http://crbug.com/58087).
464 - # TODO: use_system_sqlite (http://crbug.com/22208).
465 -
466 - # libevent: https://bugs.gentoo.org/593458
467 - local gn_system_libraries=(
468 - flac
469 - fontconfig
470 - freetype
471 - # Need harfbuzz_from_pkgconfig target
472 - #harfbuzz-ng
473 - libdrm
474 - libjpeg
475 - libpng
476 - libwebp
477 - libxml
478 - libxslt
479 - openh264
480 - re2
481 - snappy
482 - yasm
483 - zlib
484 - )
485 - if use system-ffmpeg; then
486 - gn_system_libraries+=( ffmpeg opus )
487 - fi
488 - if use system-icu; then
489 - gn_system_libraries+=( icu )
490 - fi
491 - if use system-libvpx; then
492 - gn_system_libraries+=( libvpx )
493 - fi
494 - build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
495 -
496 - # See dependency logic in third_party/BUILD.gn
497 - myconf_gn+=" use_system_harfbuzz=true"
498 -
499 - # Optional dependencies.
500 - myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
501 - myconf_gn+=" enable_widevine=$(usex widevine true false)"
502 - myconf_gn+=" use_cups=$(usex cups true false)"
503 - myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
504 - myconf_gn+=" use_kerberos=$(usex kerberos true false)"
505 - myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
506 -
507 - # TODO: link_pulseaudio=true for GN.
508 -
509 - myconf_gn+=" fieldtrial_testing_like_official_build=true"
510 -
511 - # Never use bundled gold binary. Disable gold linker flags for now.
512 - # Do not use bundled clang.
513 - # Trying to use gold results in linker crash.
514 - myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false use_custom_libcxx=false"
515 -
516 - # Disable forced lld, bug 641556
517 - myconf_gn+=" use_lld=false"
518 -
519 - ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
520 - myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
521 - myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
522 -
523 - # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
524 - # Note: these are for Gentoo use ONLY. For your own distribution,
525 - # please get your own set of keys. Feel free to contact chromium@g.o
526 - # for more info.
527 - local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
528 - local google_default_client_id="329227923882.apps.googleusercontent.com"
529 - local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
530 - myconf_gn+=" google_api_key=\"${google_api_key}\""
531 - myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
532 - myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
533 -
534 - local myarch="$(tc-arch)"
535 - if [[ $myarch = amd64 ]] ; then
536 - myconf_gn+=" target_cpu=\"x64\""
537 - ffmpeg_target_arch=x64
538 - elif [[ $myarch = x86 ]] ; then
539 - myconf_gn+=" target_cpu=\"x86\""
540 - ffmpeg_target_arch=ia32
541 - elif [[ $myarch = arm64 ]] ; then
542 - myconf_gn+=" target_cpu=\"arm64\""
543 - ffmpeg_target_arch=arm64
544 - elif [[ $myarch = arm ]] ; then
545 - myconf_gn+=" target_cpu=\"arm\""
546 - ffmpeg_target_arch=$(usex neon arm-neon arm)
547 - else
548 - die "Failed to determine target arch, got '$myarch'."
549 - fi
550 -
551 - # Make sure that -Werror doesn't get added to CFLAGS by the build system.
552 - # Depending on GCC version the warnings are different and we don't want
553 - # the build to fail because of that.
554 - myconf_gn+=" treat_warnings_as_errors=false"
555 -
556 - # Disable fatal linker warnings, bug 506268.
557 - myconf_gn+=" fatal_linker_warnings=false"
558 -
559 - # Avoid CFLAGS problems, bug #352457, bug #390147.
560 - if ! use custom-cflags; then
561 - replace-flags "-Os" "-O2"
562 - strip-flags
563 -
564 - # Prevent linker from running out of address space, bug #471810 .
565 - if use x86; then
566 - filter-flags "-g*"
567 - fi
568 -
569 - # Prevent libvpx build failures. Bug 530248, 544702, 546984.
570 - if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
571 - filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
572 - fi
573 - fi
574 -
575 - # https://bugs.gentoo.org/588596
576 - #append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
577 -
578 - # Bug 491582.
579 - export TMPDIR="${WORKDIR}/temp"
580 - mkdir -p -m 755 "${TMPDIR}" || die
581 -
582 - # https://bugs.gentoo.org/654216
583 - addpredict /dev/dri/ #nowarn
584 -
585 - #if ! use system-ffmpeg; then
586 - if false; then
587 - local build_ffmpeg_args=""
588 - if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
589 - build_ffmpeg_args+=" --disable-asm"
590 - fi
591 -
592 - # Re-configure bundled ffmpeg. See bug #491378 for example reasons.
593 - einfo "Configuring bundled ffmpeg..."
594 - pushd third_party/ffmpeg > /dev/null || die
595 - chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
596 - --branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
597 - chromium/scripts/copy_config.sh || die
598 - chromium/scripts/generate_gn.py || die
599 - popd > /dev/null || die
600 - fi
601 -
602 - einfo "Configuring Chromium..."
603 - set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
604 - echo "$@"
605 - "$@" || die
606 -}
607 -
608 -src_compile() {
609 - # Calling this here supports resumption via FEATURES=keepwork
610 - python_setup
611 -
612 - #"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
613 -
614 - # Build mksnapshot and pax-mark it.
615 - local x
616 - for x in mksnapshot v8_context_snapshot_generator; do
617 - if tc-is-cross-compiler; then
618 - eninja -C out/Release "host/${x}"
619 - pax-mark m "out/Release/host/${x}"
620 - else
621 - eninja -C out/Release "${x}"
622 - pax-mark m "out/Release/${x}"
623 - fi
624 - done
625 -
626 - # Work around broken deps
627 - eninja -C out/Release gen/ui/accessibility/ax_enums.mojom.h
628 - eninja -C out/Release gen/ui/accessibility/ax_enums.mojom-shared.h
629 -
630 - # Even though ninja autodetects number of CPUs, we respect
631 - # user's options, for debugging with -j 1 or any other reason.
632 - eninja -C out/Release chrome chromedriver
633 - use suid && eninja -C out/Release chrome_sandbox
634 -
635 - pax-mark m out/Release/chrome
636 -}
637 -
638 -src_install() {
639 - local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
640 - exeinto "${CHROMIUM_HOME}"
641 - doexe out/Release/chrome
642 -
643 - if use suid; then
644 - newexe out/Release/chrome_sandbox chrome-sandbox
645 - fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
646 - fi
647 -
648 - doexe out/Release/chromedriver
649 -
650 - local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
651 - sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
652 - doexe chromium-launcher.sh
653 -
654 - # It is important that we name the target "chromium-browser",
655 - # xdg-utils expect it; bug #355517.
656 - dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
657 - # keep the old symlink around for consistency
658 - dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
659 -
660 - dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
661 -
662 - # Allow users to override command-line options, bug #357629.
663 - insinto /etc/chromium
664 - newins "${FILESDIR}/chromium.default" "default"
665 -
666 - pushd out/Release/locales > /dev/null || die
667 - chromium_remove_language_paks
668 - popd
669 -
670 - insinto "${CHROMIUM_HOME}"
671 - doins out/Release/*.bin
672 - doins out/Release/*.pak
673 - doins out/Release/*.so
674 -
675 - if ! use system-icu; then
676 - doins out/Release/icudtl.dat
677 - fi
678 -
679 - doins -r out/Release/locales
680 - doins -r out/Release/resources
681 -
682 - if [[ -d out/Release/swiftshader ]]; then
683 - insinto "${CHROMIUM_HOME}/swiftshader"
684 - doins out/Release/swiftshader/*.so
685 - fi
686 -
687 - # Install icons and desktop entry.
688 - local branding size
689 - for size in 16 22 24 32 48 64 128 256 ; do
690 - case ${size} in
691 - 16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
692 - *) branding="chrome/app/theme/chromium" ;;
693 - esac
694 - newicon -s ${size} "${branding}/product_logo_${size}.png" \
695 - chromium-browser.png
696 - done
697 -
698 - local mime_types="text/html;text/xml;application/xhtml+xml;"
699 - mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
700 - mime_types+="x-scheme-handler/ftp;" # bug #412185
701 - mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
702 - make_desktop_entry \
703 - chromium-browser \
704 - "Chromium" \
705 - chromium-browser \
706 - "Network;WebBrowser" \
707 - "MimeType=${mime_types}\nStartupWMClass=chromium-browser"
708 - sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
709 -
710 - # Install GNOME default application entry (bug #303100).
711 - insinto /usr/share/gnome-control-center/default-apps
712 - newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
713 -
714 - readme.gentoo_create_doc
715 -}
716 -
717 -pkg_preinst() {
718 - gnome2_icon_savelist
719 -}
720 -
721 -pkg_postrm() {
722 - gnome2_icon_cache_update
723 - xdg_desktop_database_update
724 -}
725 -
726 -pkg_postinst() {
727 - gnome2_icon_cache_update
728 - xdg_desktop_database_update
729 - readme.gentoo_print_elog
730 -}
731
732 diff --git a/www-client/chromium/chromium-70.0.3538.54.ebuild b/www-client/chromium/chromium-70.0.3538.67.ebuild
733 similarity index 100%
734 rename from www-client/chromium/chromium-70.0.3538.54.ebuild
735 rename to www-client/chromium/chromium-70.0.3538.67.ebuild