From: Mike Gilbert Date: Wed, 4 Mar 2015 14:45:41 +0000 (+0000) Subject: Stable channel bump. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=948a33cee7605b0d613e98124800a060bd03e155;p=gentoo.git Stable channel bump. Package-Manager: portage-2.2.17/cvs/Linux x86_64 Manifest-Sign-Key: 0x0BBEEA1FEA4843A4 --- diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index f61cd0184812..750e41a26f92 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.1204 2015/03/01 03:47:00 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1205 2015/03/04 14:45:39 floppym Exp $ + +*chromium-41.0.2272.76 (04 Mar 2015) + + 04 Mar 2015; Mike Gilbert +chromium-41.0.2272.76.ebuild: + Stable channel bump. *chromium-41.0.2272.74 (01 Mar 2015) diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 0f6c604d3855..d64c8d930c92 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -15,21 +15,23 @@ AUX dot-gclient 174 SHA256 0ae6d69323d1d286de7ef1fa62c330536ada7280bda7564fefb5d DIST chromium-40.0.2214.111-lite.tar.xz 227550468 SHA256 d9d3180d9f9a7137be979bb550dc76034f7670630c3c907a4f0e64ec0b9aec04 SHA512 d035e450804a63414b5e21d8e1b66c458dbebea9bfd5398db1100a66dbe2345bb3f0663c4a157b2856a51ec4feac90e8e68b292bc2e3bc2f24f25c39f591fc75 WHIRLPOOL 8b1c70b2416121f1c733616bcf378606f6ba5ad562fd8e2a9b57044f9660821218795a7a3684cc381e499c5156fb1cf1f5ec8c79a6dc207e7d04d0ba7cdcdab5 DIST chromium-41.0.2272.64-lite.tar.xz 238333660 SHA256 b367a725bd14d7a784af66de8410f9e4a49bda9c78abe29ca44af2ab055456b9 SHA512 966f830d10645b8b28a4a74a7706e162055874f51ea09c2ee1332c5631b2b7837a4be91d185067d0d5c1206fbdfba615f859b9f9698b39b780fa2cf156d05fdf WHIRLPOOL 36d88dbf778aab818f7a9839e391402dd01e84ff5d8c388bb8e764a0bf34bb569a630708bc2dae35e5a54e25f693bbc9666c36698b630a2c57f4a0f3bb396f46 DIST chromium-41.0.2272.74-lite.tar.xz 238372188 SHA256 cfe547e9d4d8ed2baf22cebab9dd96f5af717ff08883585b82534a922b8817e3 SHA512 436b345428a84bfd0c9db4f3d03fb2c99bb0db5f80e00a07883dca6a3844095ad2de4c6d8f24e12765c7b9edfd5431a42b554282ab44c29fa52e61008b270f04 WHIRLPOOL 8db747b76b657005616c7733f74bdc2b23720dc7ff02cc7ac0bf91e9f9d1af4be153783f1dd26159328365fc96e5ae609d229cafe09de994d704622865348ca8 +DIST chromium-41.0.2272.76.tar.xz 301532460 SHA256 31e2ae88ad4604e79dbcf7258f66106bd51e88413ebda6a1b1d181967535cd8a SHA512 5a616183817fda9b0c403a648f6265f0ce2743e61af6bc0a848a7471a40ecf777693e527388259dcea86340f98b6021366bef7a0ce33717b063d2eaf1fa94bc0 WHIRLPOOL a7d7bfc320f3528fcd4934629f53e10252a217f3c8b9966621bd5adf6c2ba25a5a0ffe0ba1a87f49990671386aa0926e1b0eea696a6ec8c6ef2efb45e002e3e2 DIST chromium-42.0.2305.3.tar.xz 303412472 SHA256 76e77bf1cd5afe83fda397538bbd7ea010309e65055bcbbada8ca3d343476300 SHA512 adacf02727ff940e264e022c025dd31d1e9e9bba8575bd518abdc8b3b834926975d394bd856cd3a59d95fc0f6fb4e170087146f24cd8fa8e336272c504063be5 WHIRLPOOL bd2b7eef30c0e3bffbd1f1d63c15915f55031b5bd73b87b368583b979bacac4a3b4a683566eda39ddf3fe4f7bae65bbcafc8af0a3c8f611a9823df5e1e06acf1 DIST chromium-42.0.2311.4.tar.xz 305751788 SHA256 5137b2bc9967e2adcc97c421e2c3f2b46dc4cace54e30ad42b6aef7ff769cae0 SHA512 18c992c4413f656a456897abd6f162381b193469b0f70df1bcb05e8970864cff991ca24e6030069fc50d1ea4afed90fde6bd41e2d6243e13a1078f1124c5ce97 WHIRLPOOL d7df46727cb035785c5c86b93798de8c8292dfed70ff4474556d3e4bdd582b4bc683e6755cb5c3031bf34943f1975e155778ee6a3e27701065edad5cf93b445c EBUILD chromium-40.0.2214.111.ebuild 19983 SHA256 b30381dec27c4d0bb0750d9c431502fdc114b08367dd5441fe5ddef12d671f60 SHA512 6538895fa624f02ddf2ca588a269e549162cc6249add68221f8cd429172e3dd62b553a0d2cb345762db0e9166bf59c0d4e5c45b6247fd52864649acad657fce5 WHIRLPOOL 7eb623213ce6054b2eed473a3469adaa69a433b48dcbe29a48d65bad72ae5e10476ed0140605cce27e96b08a6ccb803a7ad031ebfa11bcf1b626b78921206dbf EBUILD chromium-41.0.2272.64.ebuild 20148 SHA256 b65e0728b744bbe7bde80582b67767e1040fb4dc062e35e39c5f7a303f3b7eb7 SHA512 8acfa50bf5817273c770fd630481b34b97245d7241d845a78c76772622d2b6b09c1da1c6fdcc1dfcea97d2fac89c6e0976a868627b3d2a1d02c6f736b5dff6a9 WHIRLPOOL 8806dbfa15aa16b54635b4243545f851266f964cd3450644b38c3946df8dc18396abe3e2e5fa489250a41cd7d90088f639e1e55f5c993ceba66db2cf32adbee4 EBUILD chromium-41.0.2272.74.ebuild 20148 SHA256 ab12a4ab24f9978970c49f7cb902546b605c1eceb7849d0e4d9b4c0c5692ed15 SHA512 24f17187fa4d363048d9dca7f88ac66cb38fb18b3aedbbf813f30235e220cecd9dfabb9d7488f3aff62304f604c0c87106a3df2b8f79c9499f88d18903c6bba4 WHIRLPOOL a20550c2c79b0bb8753bf63655ed40b822924ceb4c35681fe19728461bd93d18dc9c71a9718354308f0780cd5353952c0dc8c8b4359689e049402457ad12d0ef +EBUILD chromium-41.0.2272.76.ebuild 20143 SHA256 37b7da83ce25e8bd82fccc344db57d13aae935536e951d291f519d3c78847794 SHA512 b223442f5e693f201d10582b79bdfcd18c631e8fb3b27d589c2acd3d25ceec1bdfd51b56e6a323f36604e31242e342d23d62c8582f49031ce662b67e6c0dd24c WHIRLPOOL 06e4f2e24b0546280c0bac0d92852c00a766c952d291eb9bf9b56796ab25c83098fc6db6db58d3b4f5be69cc3b04fff9a667186687ad7be835c2c6d6efd8e3da EBUILD chromium-42.0.2305.3.ebuild 20153 SHA256 a88f3b06b748e88e39992949fa243927b212df6dcea93bb4d548b2807a6840a9 SHA512 3d9545d982c98aa4ab95fc8d5622e0d6f6bde3c3daee4f9a97f8524390c9a0f5fbefdbcc8a40ed1a635be9921305e27d5995d7384465a89a55511b1d8ab0dce7 WHIRLPOOL 14443992c932472da9f5c990b85e5f4d19b0dcbc02ff276268bab269933e389f9987c4a952a25f198961d4ddafbfbab6004c2e3284fdc92ce5a8388543491d14 EBUILD chromium-42.0.2311.4.ebuild 20163 SHA256 7ccfe4bcc079511b0dedf2f7c2ad289df0cd1ac8008dd0377c7e439a33d8e4da SHA512 c4bc55a800d5a185822fb2973156d76b322165a8dd7d3462c6f4b818bf805a0c35e2d420d7fc70a7c6d740843fb026cda0d62aab447914ea6784ca709b7d5a9e WHIRLPOOL 9409306247d059988e45e70a4c29b0d13cbe988007ebb1974cb656abc9dffe27da9b522ded2013000b2c2137f5ace66fd0784785711a2a08b503adb0a97f66b8 -MISC ChangeLog 5777 SHA256 2339dd9c8537e9cdef16ecc9460774de21bb5354981ac3f2aa53a766626a78da SHA512 1b8987ef22770bbed1e133811ef2225e5cd534e6f738273f765b794afc10096572123b9ce72df3055408c1d5fb95b563284d1280c0d389ebe99f5750ab69a8e1 WHIRLPOOL f040b7ef0dd56e9e4765ac1c7d04926b560248ebca01f6c7a80b7d0ef393067661feb125dc253888e9e3b3f1ad8ffb2cdfde8f4ecc452d0e9ebafb08706b89d4 +MISC ChangeLog 5919 SHA256 077d0111a4c0e53ed75c293a392dbea96ec7d75840a1a95a4c0d1027e8a2d2e2 SHA512 9328a5eb713320aeaa057e6112e67645da566a60daaa3144482f59d2e83b2e395d3f37f5046e9dc17d6a8c612a541e5689b3f16a8a62753d016af0a100af86e0 WHIRLPOOL 080164df80dcf1c5792e8b3444bb6afcbe773d7881d89f62b7eca8a017ca7059c7e16c79d07ca11ddce6837b911e507c4469853040d95bcf044456cbfb671978 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b MISC ChangeLog-2014 123105 SHA256 f67108708d3d21b4acfca327aca42ceb4cc31201772dff496babfacb50acc4eb SHA512 bf6464e7e6ccdee81a4c26949176ebfb705f99e85a0120eea77f52b862fa3b8142abb006462f31e5a9053777836d4d9fdb69926d2b01b49463553740aecdbc43 WHIRLPOOL 114181b4c8e700a56bdf76b4de2e94998436b1b27df9182348ab88afd352085938686359369ffa4af929936e9ad88305efc97e22afd3b4c50b0dcf9669286fea MISC metadata.xml 711 SHA256 1e18c739e77946b63028931cb8b11f10deb618965e33cff6f653607f7464983d SHA512 284d32a4db3451ffd522fd6db99cdd7d4130fe186a7a5b746d238f3d7d6677f0a49613cc95b52bad2d26f02877b0b8668a5eaf6f98c8e56a8967b045c23fd77b WHIRLPOOL f035f1168195c7858659ee32e33d4f1aaecf6e761ae756291c2dbcf8deddac6ffafab6b1c8d984eeb4b08efd28a36a0acdf9294918141328f6d68313f3fa2235 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iF4EAREIAAYFAlTyi7gACgkQC77qH+pIQ6T+uQD/XBHcDnMEJv241If7xp5rEm5Y -CXSQO4RFPetosgW15WUA/RKJZvUFFjrP9vNiMUy42NLo/Cr0hyDYcZhvaqYwP2tw -=+8Wx +iF4EAREIAAYFAlT3GpQACgkQC77qH+pIQ6Tv5AEAj8iCZgTaI4uWF9J88By0L91Z +S7/6u/mzT5+7GhQDZD8A/i9JKDfscM6GH4ULG0QjLDbgTfrwA1Q+7CcfyA5SS17k +=H3NK -----END PGP SIGNATURE----- diff --git a/www-client/chromium/chromium-41.0.2272.76.ebuild b/www-client/chromium/chromium-41.0.2272.76.ebuild new file mode 100644 index 000000000000..65feb5ad8106 --- /dev/null +++ b/www-client/chromium/chromium-41.0.2272.76.ebuild @@ -0,0 +1,640 @@ +# 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-41.0.2272.76.ebuild,v 1.1 2015/03/04 14:45:39 floppym Exp $ + +EAPI="5" +PYTHON_COMPAT=( python{2_6,2_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 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:= + 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/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/mt19937ar' \ + 'third_party/npapi' \ + 'third_party/openmax_dl' \ + 'third_party/opus' \ + 'third_party/ots' \ + 'third_party/pdfium' \ + 'third_party/pdfium/third_party/bigint' \ + 'third_party/pdfium/third_party/freetype' \ + 'third_party/pdfium/third_party/logging.h' \ + 'third_party/pdfium/third_party/macros.h' \ + 'third_party/pdfium/third_party/numerics' \ + 'third_party/pdfium/third_party/template_util.h' \ + '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/tlslite' \ + '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/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" + + # Never use bundled gold binary. Disable gold linker flags for now. + # Do not use bundled clang. + myconf+=" + -Dclang=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 + doexe out/Release/libpdf.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 +}