From a59521b4d7ccb53645a2ebe496d9bbc91828ad79 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Thu, 16 Apr 2015 19:00:53 +0000 Subject: [PATCH] Stable channel bump. Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0x0BBEEA1FEA4843A4 --- www-client/chromium/ChangeLog | 7 +- www-client/chromium/Manifest | 20 +- .../chromium/chromium-42.0.2311.90.ebuild | 654 ++++++++++++++++++ 3 files changed, 666 insertions(+), 15 deletions(-) create mode 100644 www-client/chromium/chromium-42.0.2311.90.ebuild diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index 42d8d6eac519..cb1463c6b795 100644 --- a/www-client/chromium/ChangeLog +++ b/www-client/chromium/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for www-client/chromium # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1222 2015/04/15 14:46:20 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1223 2015/04/16 19:00:51 floppym Exp $ + +*chromium-42.0.2311.90 (16 Apr 2015) + + 16 Apr 2015; Mike Gilbert +chromium-42.0.2311.90.ebuild: + Stable channel bump. *chromium-43.0.2357.18 (15 Apr 2015) diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 0f3fddf8316f..5023e61bbc5c 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -17,31 +17,23 @@ AUX dot-gclient 174 SHA256 0ae6d69323d1d286de7ef1fa62c330536ada7280bda7564fefb5d DIST chromium-41.0.2272.118.tar.xz 301445804 SHA256 c043d2eca41acaabd4f7068a5d9a21835dac2ca7705dd865d376c8a732ec8c3c SHA512 be3f1ecf903cf479b2576932574cfbbdca2161b5263a6ced7fa8b11a4c2194d43df6bff34a1e630be0044c2d7e5550036d8c2feeae0373d7a39a13aeb0886fdb WHIRLPOOL f364a2677e78de5210453f621bdf3e6a1e2ab4c43468c034f30176974aef0b81abf7b12660660f72784ece7eae28a9b8b01d6c67f7af16a89dd49fcd6c915cbc DIST chromium-42.0.2311.50.tar.xz 306054284 SHA256 ad87ec1ed650fe9f6eb8cb8eb276cf6be96aa70911753bca1f2e36e6fa28294f SHA512 f70b6a36619cce10118d487178426c0b5f00d76870ed626e37c7a047bb7788391b43084e9fcb10ce6427186955e9e572da9ed13ce220c469b92160793d1f454a WHIRLPOOL 80c2ea673403322ee22e1fac7cd64799bb105b166ca593795910002840c2ba3d0091099dd67cc8c4604beb256195f3ae191d0a19a9e5f5537407b06d4e493efc DIST chromium-42.0.2311.60.tar.xz 306422228 SHA256 11381e5a3ae9be3d5af79fef7857cdae6873967c1b86b7e1f97eb545f0898288 SHA512 404ed607969b7082109ff2d84464d688da4095c0b7b989e005c117357cd219f504e97b27d74994e34725639f43579c9d6309985283afcb7bf732d467a393d360 WHIRLPOOL 3ed605365517c76389dee09d8df07f6819d29ca8ff283d8eaf395cd789758b9b82cdad3d0beefac0b10ba040d2b8a6de8a4232293ead90582b41d8c00c6b7193 +DIST chromium-42.0.2311.90.tar.xz 306502344 SHA256 60b0eb38c1c3d0cc998dae70b7333e53b715cff2847c1652e03d1723300db4c9 SHA512 abfa97ad66b944609c7dc1fcb1d8944dd945968959f43cfc5d89ac542f126a1be62fc100c197af4d6ee565cd18388cd42c8c75505e53031e34bd7a2eee71b41b WHIRLPOOL b78c0e62a7690d08b8beaaa41ae89e72e2b7ce45762706e96165da87f632bf69292e7129f9a4c2b8d79abdc268b5e287e6dcedd4be22336c6e07922d539452da DIST chromium-43.0.2357.18.tar.xz 309041380 SHA256 0a9a32197cf590354030e4c2f7560a330528235cbae4247f5f704e0a9425c2c0 SHA512 140201e1a4baae03ccb92bacd31b337d5c86dfe5018c70da9e12a80dcab7953e4d913adf5e930e15d992869221090fb02d4d27fcaba5bc3a8b5a8303314e6ecb WHIRLPOOL 8b717d1b1cd8918befdfd48fd6f4918023145f4220a64c97cf5f9c0252b5a17725684a1451532fb400c948139634a3d4acee73b7d913d8670c144f554080c855 DIST chromium-43.0.2357.2.tar.xz 308940456 SHA256 8916597ecab1ec3ceca91281704a8091523930f82a6944c3ac7107fcee7578cb SHA512 cf829cc714eead990308c283fdf088a1666f2bae6dd8d3b6106d5d609d95316f6fd2c56d478f0b450298c03d84606e4b67199aacd9c5f97769794352e640aa57 WHIRLPOOL 0028e49e4d3e93d871485b9531c972d2d62dec9b655a38c7edc27c57332b3e014c34f29a51c619a7ce2a3988e0363a4d5c81212ba2d5fab40e121752a7fc5539 EBUILD chromium-41.0.2272.118.ebuild 20135 SHA256 b954bf68b9e290325081c84d42ed046979c5a80717021e025cfe7e9463640163 SHA512 0f8e897ad1734328063699a7779495ba372145b63cf23d4f0af89c506cb1592f2ad0bf4446fa106627880963e13bcaa34bfbb4358242a0ce7f8a8f5798fbfc06 WHIRLPOOL 6d312c3d237e423ab758c626c8833043111157b65b070efc3675c509093b0b77f843c956c931402ed98505f04ae93088334c3a4e68080b22dbebd89637b31d20 EBUILD chromium-42.0.2311.50.ebuild 20369 SHA256 771e54a58e53359f59c1b5c3633eb3aab77bf40d70bf7e47dfbb1a19ad92e8ac SHA512 ea2c480694f3988f7215955f24ec5b667d2947c14862f14e669c1e2f11b4ff8b5939fe8a2c36da79494b174f787a12c78742adb57af38193d36ed96f3089706d WHIRLPOOL c95f7859cf98d025e6eeb08c75b5a0c18750f3686fe64cf0d22ff8f7b32034ad3b29ac3bc093ea2de7b84279592a078576246bc9f0da69b47cfc0709944ff735 EBUILD chromium-42.0.2311.60.ebuild 20369 SHA256 45153f13bb6969accddd9a509fa6fb571ef6860a9418848019b922c3ec465372 SHA512 8e4bb62f22850579cfc69663ce9628a8503d226d0d8dd18a918c87504817f9ccc971775db7fa40e8faac84510c0aa29307cdbbd0c7fd8f253af9fd49d08c7992 WHIRLPOOL 60145025353483387fb0ad582bba58d2427b2b72c5e295b2454e4950f2173ccb5e2efd6c7c9ff862194c3b6306ab36d9e243d2f5fe7059324ccc517d3bf2ecf2 +EBUILD chromium-42.0.2311.90.ebuild 20370 SHA256 01a9b9ad879b368789c79f08df31fba37b25e686819690b65c842376829e5251 SHA512 0ab69ee42cc88b7f1049b5d8dbbfb8b959fc6049f924440b98f10fd9e2c68ec112383268d4808a630795cc43b12b93ba8aeb20972ddb617cf7ac8c067de69f12 WHIRLPOOL 16c2a096f64467a503762699a36541ceacd68ee5430dbecdab95982d641ccfae95fac3cac4410682709e84ddb84e200b2d537cc705aa9af14556679f2ce3c493 EBUILD chromium-43.0.2357.18.ebuild 20037 SHA256 61a0e04d74464f3259ed53efa5e7eb24a7ee73e2d56614e00950bcbbecdb4f45 SHA512 10c42a319e54c8aa421d6296755c5c43bf69d6ae4605628c1b3a68aa7f18c9c3a818e8d530e9a84fc2dc64e9fe941fe28ab0c5a24dc5ef6d460e6d7c88644f85 WHIRLPOOL 011f6b1e0c228dc20ec892ba58538908213b60f6aae2a4d71d374cd949e298c04d8f84d875b7f47e5db331b91c74600640d61dfba226b334d9a6414e5a51ced6 EBUILD chromium-43.0.2357.2.ebuild 20063 SHA256 d6142f4cb9c12debb787b6694ed70ceef9ddcaf3b5a9b3ef00ed29cdb802a62f SHA512 ddccac8823fd405a3a36fe532c692248f00f2ab380aec54d0b63436ad5f141a99f79d472e683180b953e12df83238afa93cab5cc07a375850c7bfab9ec56ea0d WHIRLPOOL a36054d8c120df82b44d27cba835ada0cb80fbbcadcd2e417496ccc91a815b30f5fde80d241f16fd7666e96498672f629aa75df3c40a4772fd2b89dcde7e042f -MISC ChangeLog 8921 SHA256 c6d342b53e83b8ed031b7b8a8667d5b5967294e32e7e886b5f9c76197bd96164 SHA512 fb556a8822204113cbf002feeb89de32c6c4d5eb31c4677e0bf30317e092f779bddf8727cb6f7c0601d97d1c3c23f24c23aab5b6cb72bac905a04a1dcbbea30e WHIRLPOOL 29ef99e4efe6c350026cb842631c6a1a13f2af143f0ab5d4902350f92fb4b2241220e5eb5268f42514170741e6852c51af2b64f8019f72f0e6c9e47084f2bbc5 +MISC ChangeLog 9060 SHA256 6bd582d9a760f47a07acaeb4e9f5c882b01511b54909831b40de26534b274625 SHA512 9f5e915a6a67f4da44c982c143850e008791afc3377d9785978b89b085f86dff3873b3d71eb70d20f84251da0427da7afad46575010a795edd958387e25416ab WHIRLPOOL a22a90284482f4631c8f3be3951998bc057178bf925c43a69bdf56611b9bac7b37c27362e74029461ea2f599500b440f3374e4325d7e61bedc749909f49fb692 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b MISC ChangeLog-2014 123105 SHA256 f67108708d3d21b4acfca327aca42ceb4cc31201772dff496babfacb50acc4eb SHA512 bf6464e7e6ccdee81a4c26949176ebfb705f99e85a0120eea77f52b862fa3b8142abb006462f31e5a9053777836d4d9fdb69926d2b01b49463553740aecdbc43 WHIRLPOOL 114181b4c8e700a56bdf76b4de2e94998436b1b27df9182348ab88afd352085938686359369ffa4af929936e9ad88305efc97e22afd3b4c50b0dcf9669286fea MISC metadata.xml 794 SHA256 325b937cabfd7753347c3c911fb8be689b4a7b021430fca37a92c26e7af35433 SHA512 079c7985283d160b85a8dcd53fd54538ee83b9b36fb99327f03aeff16eb3c6dcbb399a01a381094a67be901d970f3c8fa649b2ac156522df3156db2853b6566f WHIRLPOOL c110adec0f1dcb170e4ba52523109d340543d37027f4c6c9f6e6998744c2720177f03a963e7cd162512459c193e5107f0764b8e3dccf7278b008e7cb8a715b8f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJVLnnGAAoJEE8aJVXqcZkd8asP/2F9xiUf/IZzHUvdTRXQVeL+ -HJ0Mp//GQzRqxaH/AUdNixzbw8BYx+YMkvA1MLm2M13sdipGSKCrEX7XUJpcnPUi -m7vMLAkuJq2X5O3I2OLVo3X2FZYi4VGDUb+tkIMLNgvivTcxOEj6BAidZqI2x05l -dUDjZdPWoUAukdAM7mwIjBglv5F+EpmN3MqbhTDC6/kXKRXUXdIK+fvDIvsOkNX8 -CLrpUzaabGUr1DHyHwKYF5BgqKoWQwV9gx/MZDWluHFkUDowqOHEkzUb326X2y4M -K5b8BAIsmKJ+2y0jHeaVVVzj40egY+dxNWdIgKpzHviuyDuI+h7SJe9zhGCkZuhv -jeIZ4EBOjJ6WhPB/zAG1dHqMzSkqHJ9rC159L1eB4DPbHMfyckkoKkqXUd/NhtPL -WUYBmLXVwtURdIGfXd8KJdid/SBJluJ5+/4LYbtQJyE8FLkQqNMhExkjmmPrzHNZ -IAQVT8TLCzDPU9+0eQhhXoQY9pPFngmgase/HWBy3waX3FoCPE335W/IK37brh2a -qsbXwPWOLsJMq5nLebVvdx0Bbk0y4zlPbmSX9p66utoQdL8TT5E7uwPNR21c7gug -lvBgsxq5aA0vLdoK5IDPHhuZhw21/ElzKW3rS0m5sN+a+HaZD8dr8C0bNB9E5HkI -xLDHb+NzMdOfvBTqZh9x -=vbia +iF4EAREIAAYFAlUwBuQACgkQC77qH+pIQ6RoHQD/czCbH9RTmPtZsD94L0u1+p51 +szpY1EREbD3OWe+xJWYBALMvMNws2lXlhB+9z1ID4iA05aoL9Y1uYqtwClIbZF9U +=lCNF -----END PGP SIGNATURE----- diff --git a/www-client/chromium/chromium-42.0.2311.90.ebuild b/www-client/chromium/chromium-42.0.2311.90.ebuild new file mode 100644 index 000000000000..0e858eb47175 --- /dev/null +++ b/www-client/chromium/chromium-42.0.2311.90.ebuild @@ -0,0 +1,654 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-42.0.2311.90.ebuild,v 1.1 2015/04/16 19:00:51 floppym Exp $ + +EAPI="5" +PYTHON_COMPAT=( python2_7 ) + +CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he + 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 + sv sw ta te th tr uk vi zh_CN zh_TW" + +inherit check-reqs chromium eutils flag-o-matic multilib multiprocessing pax-utils \ + portability python-any-r1 readme.gentoo toolchain-funcs versionator virtualx + +DESCRIPTION="Open-source version of Google Chrome web browser" +HOMEPAGE="http://chromium.org/" +SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="bindist cups gnome gnome-keyring hidpi kerberos neon pic pulseaudio selinux +tcmalloc widevine" +RESTRICT="!bindist? ( bindist )" + +# Native Client binaries are compiled with different set of flags, bug #452066. +QA_FLAGS_IGNORED=".*\.nexe" + +# Native Client binaries may be stripped by the build system, which uses the +# right tools for it, bug #469144 . +QA_PRESTRIPPED=".*\.nexe" + +RDEPEND=">=app-accessibility/speech-dispatcher-0.8:= + app-arch/bzip2:= + app-arch/snappy:= + app-crypt/libsecret:= + cups? ( + dev-libs/libgcrypt:0= + >=net-print/cups-1.3.11:= + ) + >=dev-libs/elfutils-0.149 + dev-libs/expat:= + dev-libs/glib:= + dev-libs/icu:= + >=dev-libs/jsoncpp-0.5.0-r1:= + >=dev-libs/libevent-1.4.13:= + dev-libs/libxml2:=[icu] + dev-libs/libxslt:= + dev-libs/nspr:= + >=dev-libs/nss-3.14.3:= + dev-libs/re2:= + gnome? ( >=gnome-base/gconf-2.24.0:= ) + gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) + >=media-libs/alsa-lib-1.0.19:= + media-libs/flac:= + media-libs/fontconfig:= + media-libs/freetype:= + media-libs/harfbuzz:=[icu(+)] + media-libs/libexif:= + >=media-libs/libjpeg-turbo-1.2.0-r1:= + media-libs/libpng:0= + >=media-libs/libwebp-0.4.0:= + media-libs/speex:= + pulseaudio? ( media-sound/pulseaudio:= ) + sys-apps/dbus:= + sys-apps/pciutils:= + >=sys-libs/libcap-2.22:= + sys-libs/zlib:=[minizip] + virtual/udev + x11-libs/cairo:= + x11-libs/gdk-pixbuf:= + x11-libs/gtk+:2= + x11-libs/libdrm + x11-libs/libX11:= + x11-libs/libXcomposite:= + x11-libs/libXcursor:= + x11-libs/libXdamage:= + x11-libs/libXext:= + x11-libs/libXfixes:= + >=x11-libs/libXi-1.6.0:= + x11-libs/libXinerama:= + x11-libs/libXrandr:= + x11-libs/libXrender:= + x11-libs/libXScrnSaver:= + x11-libs/libXtst:= + x11-libs/pango:= + kerberos? ( virtual/krb5 )" +DEPEND="${RDEPEND} + !arm? ( + dev-lang/yasm + ) + dev-lang/perl + dev-perl/JSON + >=dev-util/gperf-3.0.3 + dev-util/ninja + sys-apps/hwids[usb(+)] + >=sys-devel/bison-2.4.3 + sys-devel/flex + virtual/pkgconfig + widevine? ( www-plugins/chrome-binary-plugins[widevine] )" + # We build-dep on having widevine, because the patch + # below must extract the current version. + +# For nvidia-drivers blocker, see bug #413637 . +RDEPEND+=" + !=www-client/chromium-9999 + ! "${T}/${PN}-widevine-${WIDEVINE_VERSION}.patch" + epatch "${T}/${PN}-widevine-${WIDEVINE_VERSION}.patch" + local WIDEVINE_SUPPORTED_ARCHS="x64 ia32" + local arch + for arch in $WIDEVINE_SUPPORTED_ARCHS; do + mkdir -p third_party/widevine/cdm/linux/$arch + cp "${ROOT}/usr/$(get_libdir)/chromium-browser/libwidevinecdm.so" third_party/widevine/cdm/widevine_cdm_*.h third_party/widevine/cdm/linux/$arch/ || die "Could not copy headers for Widevine." + done + fi + + epatch_user + + # Remove most bundled libraries. Some are still needed. + build/linux/unbundle/remove_bundled_libraries.py \ + 'base/third_party/dmg_fp' \ + 'base/third_party/dynamic_annotations' \ + 'base/third_party/icu' \ + 'base/third_party/nspr' \ + 'base/third_party/superfasthash' \ + 'base/third_party/symbolize' \ + 'base/third_party/valgrind' \ + 'base/third_party/xdg_mime' \ + 'base/third_party/xdg_user_dirs' \ + 'breakpad/src/third_party/curl' \ + 'chrome/third_party/mozilla_security_manager' \ + 'courgette/third_party' \ + 'crypto/third_party/nss' \ + 'net/third_party/mozilla_security_manager' \ + 'net/third_party/nss' \ + 'third_party/WebKit' \ + 'third_party/analytics' \ + 'third_party/angle' \ + 'third_party/angle/src/third_party/compiler' \ + 'third_party/brotli' \ + 'third_party/cacheinvalidation' \ + 'third_party/cld_2' \ + 'third_party/cros_system_api' \ + 'third_party/cython/python_flags.py' \ + 'third_party/dom_distiller_js' \ + 'third_party/dom_distiller_js/package/proto_gen/third_party/dom_distiller_js' \ + 'third_party/ffmpeg' \ + 'third_party/fips181' \ + 'third_party/flot' \ + 'third_party/google_input_tools' \ + 'third_party/google_input_tools/third_party/closure_library' \ + 'third_party/google_input_tools/third_party/closure_library/third_party/closure' \ + 'third_party/hunspell' \ + 'third_party/iccjpeg' \ + 'third_party/jstemplate' \ + 'third_party/khronos' \ + 'third_party/leveldatabase' \ + 'third_party/libaddressinput' \ + 'third_party/libjingle' \ + 'third_party/libphonenumber' \ + 'third_party/libsrtp' \ + 'third_party/libudev' \ + 'third_party/libusb' \ + 'third_party/libvpx' \ + 'third_party/libvpx/source/libvpx/third_party/x86inc' \ + 'third_party/libxml/chromium' \ + 'third_party/libXNVCtrl' \ + 'third_party/libyuv' \ + 'third_party/lss' \ + 'third_party/lzma_sdk' \ + 'third_party/mesa' \ + 'third_party/modp_b64' \ + 'third_party/mojo' \ + 'third_party/mt19937ar' \ + 'third_party/npapi' \ + 'third_party/openmax_dl' \ + 'third_party/opus' \ + 'third_party/ots' \ + 'third_party/pdfium' \ + 'third_party/pdfium/third_party/base' \ + 'third_party/pdfium/third_party/bigint' \ + 'third_party/pdfium/third_party/freetype' \ + 'third_party/polymer' \ + 'third_party/protobuf' \ + 'third_party/qcms' \ + 'third_party/readability' \ + 'third_party/sfntly' \ + 'third_party/skia' \ + 'third_party/smhasher' \ + 'third_party/sqlite' \ + 'third_party/tcmalloc' \ + 'third_party/trace-viewer' \ + 'third_party/trace-viewer/third_party/components/polymer' \ + 'third_party/trace-viewer/third_party/d3' \ + 'third_party/trace-viewer/third_party/gl-matrix' \ + 'third_party/trace-viewer/third_party/jszip' \ + 'third_party/trace-viewer/third_party/tvcm' \ + 'third_party/trace-viewer/third_party/tvcm/third_party/beautifulsoup/polymer_soup.py' \ + 'third_party/undoview' \ + 'third_party/usrsctp' \ + 'third_party/web-animations-js' \ + 'third_party/webdriver' \ + 'third_party/webrtc' \ + 'third_party/widevine' \ + 'third_party/x86inc' \ + 'third_party/zlib/google' \ + 'url/third_party/mozilla' \ + 'v8/src/third_party/fdlibm' \ + 'v8/src/third_party/kernel' \ + 'v8/src/third_party/valgrind' \ + --do-remove || die +} + +src_configure() { + local myconf="" + + # Never tell the build system to "enable" SSE2, it has a few unexpected + # additions, bug #336871. + myconf+=" -Ddisable_sse2=1" + + # Disable nacl, we can't build without pnacl (http://crbug.com/269560). + myconf+=" -Ddisable_nacl=1" + + # Disable glibc Native Client toolchain, we don't need it (bug #417019). + # myconf+=" -Ddisable_glibc=1" + + # TODO: also build with pnacl + # myconf+=" -Ddisable_pnacl=1" + + # It would be awkward for us to tar the toolchain and get it untarred again + # during the build. + # myconf+=" -Ddisable_newlib_untar=1" + + # Make it possible to remove third_party/adobe. + echo > "${T}/flapper_version.h" || die + myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h" + + # Use system-provided libraries. + # TODO: use_system_hunspell (upstream changes needed). + # TODO: use_system_libsrtp (bug #459932). + # TODO: use_system_libvpx (http://crbug.com/347823). + # TODO: use_system_libusb (http://crbug.com/266149). + # TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077). + # TODO: use_system_protobuf (bug #525560). + # TODO: use_system_ssl (http://crbug.com/58087). + # TODO: use_system_sqlite (http://crbug.com/22208). + myconf+=" + -Duse_system_bzip2=1 + -Duse_system_flac=1 + -Duse_system_harfbuzz=1 + -Duse_system_icu=1 + -Duse_system_jsoncpp=1 + -Duse_system_libevent=1 + -Duse_system_libjpeg=1 + -Duse_system_libpng=1 + -Duse_system_libwebp=1 + -Duse_system_libxml=1 + -Duse_system_libxslt=1 + -Duse_system_minizip=1 + -Duse_system_nspr=1 + -Duse_system_re2=1 + -Duse_system_snappy=1 + -Duse_system_speex=1 + -Duse_system_xdg_utils=1 + -Duse_system_zlib=1" + + # Needed for system icu - we don't need additional data files. + myconf+=" -Dicu_use_data_file_flag=0" + + # TODO: patch gyp so that this arm conditional is not needed. + if ! use arm; then + myconf+=" + -Duse_system_yasm=1" + fi + + # Optional dependencies. + # TODO: linux_link_kerberos, bug #381289. + myconf+=" + $(gyp_use cups) + $(gyp_use gnome use_gconf) + $(gyp_use gnome-keyring use_gnome_keyring) + $(gyp_use gnome-keyring linux_link_gnome_keyring) + $(gyp_use hidpi enable_hidpi) + $(gyp_use kerberos) + $(gyp_use pulseaudio) + $(gyp_use tcmalloc use_allocator tcmalloc none)" + + # Use explicit library dependencies instead of dlopen. + # This makes breakages easier to detect by revdep-rebuild. + myconf+=" + -Dlinux_link_gsettings=1 + -Dlinux_link_libpci=1 + -Dlinux_link_libspeechd=1 + -Dlibspeechd_h_prefix=speech-dispatcher/" + + # TODO: use the file at run time instead of effectively compiling it in. + myconf+=" + -Dusb_ids_path=/usr/share/misc/usb.ids" + + # Save space by removing DLOG and DCHECK messages (about 6% reduction). + myconf+=" + -Dlogging_like_official_build=1" + + if [[ $(tc-getCC) == *clang* ]]; then + myconf+=" -Dclang=1" + else + myconf+=" -Dclang=0" + fi + + # Never use bundled gold binary. Disable gold linker flags for now. + # Do not use bundled clang. + myconf+=" + -Dclang_use_chrome_plugins=0 + -Dhost_clang=0 + -Dlinux_use_bundled_binutils=0 + -Dlinux_use_bundled_gold=0 + -Dlinux_use_gold_flags=0" + + # Always support proprietary codecs. + myconf+=" -Dproprietary_codecs=1" + + ffmpeg_branding="Chromium" + if ! use bindist; then + # Enable H.264 support in bundled ffmpeg. + ffmpeg_branding="Chrome" + fi + myconf+=" -Dffmpeg_branding=${ffmpeg_branding}" + + # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys . + # Note: these are for Gentoo use ONLY. For your own distribution, + # please get your own set of keys. Feel free to contact chromium@gentoo.org + # for more info. + myconf+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc + -Dgoogle_default_client_id=329227923882.apps.googleusercontent.com + -Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu" + + local myarch="$(tc-arch)" + if [[ $myarch = amd64 ]] ; then + target_arch=x64 + ffmpeg_target_arch=x64 + elif [[ $myarch = x86 ]] ; then + target_arch=ia32 + ffmpeg_target_arch=ia32 + elif [[ $myarch = arm ]] ; then + target_arch=arm + ffmpeg_target_arch=$(usex neon arm-neon arm) + # TODO: re-enable NaCl (NativeClient). + local CTARGET=${CTARGET:-${CHOST}} + if [[ $(tc-is-softfloat) == "no" ]]; then + + myconf+=" -Darm_float_abi=hard" + fi + filter-flags "-mfpu=*" + use neon || myconf+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}" + + if [[ ${CTARGET} == armv[78]* ]]; then + myconf+=" -Darmv7=1" + else + myconf+=" -Darmv7=0" + fi + myconf+=" -Dsysroot= + $(gyp_use neon arm_neon) + -Ddisable_nacl=1" + else + die "Failed to determine target arch, got '$myarch'." + fi + + myconf+=" -Dtarget_arch=${target_arch}" + + # Make sure that -Werror doesn't get added to CFLAGS by the build system. + # Depending on GCC version the warnings are different and we don't want + # the build to fail because of that. + myconf+=" -Dwerror=" + + # Disable fatal linker warnings, bug 506268. + myconf+=" -Ddisable_fatal_linker_warnings=1" + + # Avoid CFLAGS problems, bug #352457, bug #390147. + if ! use custom-cflags; then + replace-flags "-Os" "-O2" + strip-flags + + # Prevent linker from running out of address space, bug #471810 . + if use x86; then + filter-flags "-g*" + fi + fi + + # Make sure the build system will use the right tools, bug #340795. + tc-export AR CC CXX RANLIB + + # Tools for building programs to be executed on the build system, bug #410883. + export AR_host=$(tc-getBUILD_AR) + export CC_host=$(tc-getBUILD_CC) + export CXX_host=$(tc-getBUILD_CXX) + export LD_host=${CXX_host} + + # Bug 491582. + export TMPDIR="${WORKDIR}/temp" + mkdir -m 755 "${TMPDIR}" || die + + local build_ffmpeg_args="" + if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then + build_ffmpeg_args+=" --disable-asm" + fi + + # Re-configure bundled ffmpeg. See bug #491378 for example reasons. + einfo "Configuring bundled ffmpeg..." + pushd third_party/ffmpeg > /dev/null || die + chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \ + --branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die + chromium/scripts/copy_config.sh || die + chromium/scripts/generate_gyp.py || die + popd > /dev/null || die + + third_party/libaddressinput/chromium/tools/update-strings.py || die + + einfo "Configuring Chromium..." + build/linux/unbundle/replace_gyp_files.py ${myconf} || die + egyp_chromium ${myconf} || die +} + +eninja() { + if [[ -z ${NINJAOPTS+set} ]]; then + local jobs=$(makeopts_jobs) + local loadavg=$(makeopts_loadavg) + + if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then + NINJAOPTS+=" -j ${jobs}" + fi + if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then + NINJAOPTS+=" -l ${loadavg}" + fi + fi + set -- ninja -v ${NINJAOPTS} "$@" + echo "$@" + "$@" +} + +src_compile() { + local ninja_targets="chrome chrome_sandbox chromedriver" + + # Build mksnapshot and pax-mark it. + eninja -C out/Release mksnapshot || die + pax-mark m out/Release/mksnapshot + + # Even though ninja autodetects number of CPUs, we respect + # user's options, for debugging with -j 1 or any other reason. + eninja -C out/Release ${ninja_targets} || die + + pax-mark m out/Release/chrome +} + +src_install() { + exeinto "${CHROMIUM_HOME}" + doexe out/Release/chrome || die + + newexe out/Release/chrome_sandbox chrome-sandbox || die + fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox" + + doexe out/Release/chromedriver || die + + # if ! use arm; then + # doexe out/Release/nacl_helper{,_bootstrap} || die + # insinto "${CHROMIUM_HOME}" + # doins out/Release/nacl_irt_*.nexe || die + # doins out/Release/libppGoogleNaClPluginChrome.so || die + # fi + + local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" ) + if [[ -n ${CHROMIUM_SUFFIX} ]]; then + sedargs+=( + -e "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" + -e "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g" + -e "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:" + ) + fi + sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die + doexe chromium-launcher.sh + + # It is important that we name the target "chromium-browser", + # xdg-utils expect it; bug #355517. + dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die + # keep the old symlink around for consistency + dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die + + dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver${CHROMIUM_SUFFIX} || die + + # Allow users to override command-line options, bug #357629. + dodir /etc/chromium || die + insinto /etc/chromium + newins "${FILESDIR}/chromium.default" "default" || die + + pushd out/Release/locales > /dev/null || die + chromium_remove_language_paks + popd + + insinto "${CHROMIUM_HOME}" + doins out/Release/*.bin || die + doins out/Release/*.pak || die + + doins -r out/Release/locales || die + doins -r out/Release/resources || die + + newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die + newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die + + doexe out/Release/libffmpegsumo.so || die + if use widevine; then + doexe out/Release/libwidevinecdmadapter.so || die + fi + + # Install icons and desktop entry. + local branding size + for size in 16 22 24 32 48 64 128 256 ; do + case ${size} in + 16|32) branding="chrome/app/theme/default_100_percent/chromium" ;; + *) branding="chrome/app/theme/chromium" ;; + esac + newicon -s ${size} "${branding}/product_logo_${size}.png" \ + chromium-browser${CHROMIUM_SUFFIX}.png + done + + local mime_types="text/html;text/xml;application/xhtml+xml;" + mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797 + mime_types+="x-scheme-handler/ftp;" # bug #412185 + mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393 + make_desktop_entry \ + chromium-browser${CHROMIUM_SUFFIX} \ + "Chromium${CHROMIUM_SUFFIX}" \ + chromium-browser${CHROMIUM_SUFFIX} \ + "Network;WebBrowser" \ + "MimeType=${mime_types}\nStartupWMClass=chromium-browser" + sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die + + # Install GNOME default application entry (bug #303100). + if use gnome; then + dodir /usr/share/gnome-control-center/default-apps || die + insinto /usr/share/gnome-control-center/default-apps + newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die + if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then + sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \ + "${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml + fi + fi + + readme.gentoo_create_doc +} + +pkg_postinst() { + fdo-mime_desktop_database_update + gnome2_icon_cache_update + readme.gentoo_print_elog +} -- 2.26.2