From: Mike Gilbert Date: Mon, 26 Jan 2015 15:43:37 +0000 (+0000) Subject: Beta channel bump. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=70cd8eb39ea2867e35789bac6f241ec57629f289;p=gentoo.git Beta channel bump. Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x0BBEEA1FEA4843A4 --- diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index 220444adbf1a..42223f27f5eb 100644 --- a/www-client/chromium/ChangeLog +++ b/www-client/chromium/ChangeLog @@ -1,6 +1,12 @@ # 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.1188 2015/01/23 21:07:47 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1189 2015/01/26 15:43:32 floppym Exp $ + +*chromium-41.0.2272.16 (26 Jan 2015) + + 26 Jan 2015; Mike Gilbert +chromium-41.0.2272.16.ebuild, + -chromium-41.0.2272.12.ebuild, -chromium-41.0.2272.3.ebuild: + Beta channel bump. 23 Jan 2015; Mike Gilbert -chromium-39.0.2171.65.ebuild, -chromium-39.0.2171.99.ebuild, -chromium-40.0.2214.85-r1.ebuild, diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 25b342bd8fbe..e5b6dd838743 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -12,19 +12,18 @@ AUX chromium.default 148 SHA256 bdac1d32025d53158f96c8ad5bd71a58abdcf02f3a8759a4 AUX dot-gclient 174 SHA256 0ae6d69323d1d286de7ef1fa62c330536ada7280bda7564fefb5d071384ed324 SHA512 ea858464ee8732536633259ed3d11990822e8b8493c07b83218856a127320ba21b9cfc184f7e7a899739bc5f938fbca25224e559fb7db8558cb86fccc743a685 WHIRLPOOL 72a5a9af7955e653151090b555c6a67a261ff807871fdda16d7c3fabf4b52449ac9caae466ba51a17d2efed74a68adc32687599ea4287cc033e75f787d874b55 DIST chromium-40.0.2214.91.tar.xz 284982556 SHA256 f72fda9ff1ea256ab911610ee532eadf8303137d431f2481d01d3d60e5e64149 SHA512 fc95eb1d6975710f5641a039503830f57f5c9c874e18d55d8e0b88bae190b1cfbc073a18fc4634cd3543b74e1dad924a9565b1ac9d160c792f9b1957e2ce6d33 WHIRLPOOL cf2662c656a047e7c687a2c96e309f3cff2705d7c01a07edcef8e264dc61686db53e219348057b5c33ede3af06da26cf050dac1afaf6c0e6d47fa6c2ce2e130d DIST chromium-41.0.2272.12-lite.tar.xz 237786236 SHA256 7093674377a99a4c8f64e18521a3973bdb74cc5ae75463a355a5bc44c783ddf4 SHA512 77be9cf563ccc690364d11d6be0b8cc7ca4baf3a74f996f8e2dadee236ab25daf06b7c8409ecafea6595e1bdf5c50eaeec09496164740495d398664ea6b36a3e WHIRLPOOL ac45b98be51db3539e511a53c162b81da72da4f2449354c867bae14c5c90dc3f62fe898604cb06782c54a50d786525bb82d94a546fde9d53d4bcceb13ea3002c -DIST chromium-41.0.2272.3-lite.tar.xz 237751776 SHA256 fc3d64ab45b3c3ff6b714add779529f6e26902319872d4faa7679331ab00f36a SHA512 dd3f822b1fe231a7361e9c9ecbd4c72ab7d8d85b1b9570ea895ac221bd4bcfcb127d62dab6be42d1b3b1e4ba1ed12d97b6bea160831bd1a8768b2d8f63007b69 WHIRLPOOL 489433daf6fda378c8d6f7081a16dc6af66460fe6a323d081219ba0d695fc29c7359d598f145244b8191ae09668268ef6ae2ea685130bb4e785dc01cd2f3a051 +DIST chromium-41.0.2272.16-lite.tar.xz 237800940 SHA256 f90eaac9d316829f78069cc28f679bff31187026ba12e9910110829127743141 SHA512 b112dd131a0fedad761057b9e103f866ee72c8a199c2e489f1615f23eccb1502b7c54a59c8c2226d62f3f3dc9d9273b9546956a83d13e66e8005797e46ed63a2 WHIRLPOOL c5279b7cd15a73216f1de61fe960fc99dcae9c966ed01f08af3d8c3e7d4daa3e8882c16b6770b74f14c7e28f2d0d246b0230488de58d27d022c27d62db0eb6a6 EBUILD chromium-40.0.2214.91.ebuild 18987 SHA256 412de225f4ce8ab5fded91bf7b748c3b94b361f31784e6567f3ba7ba097d87e6 SHA512 a8bd787d7d5d66b7ff236a7add9fcb34c4b44e3cf6b4f46df7f04ed4c5bfccbe18b59e3f4fd5fa3aa5652bfb824fc804fa160ed8a4195486c29d09f2f9fba193 WHIRLPOOL b5cb389332aab54e7dc945b75343701689a8d8974dac704bd2a267560732a317a8e6753aa96847d6eac5730a879386a109fe5d50a3f4a1a405df773cc2808ce1 EBUILD chromium-41.0.2272.12-r1.ebuild 19164 SHA256 171ca6b38f8e8038cd73f1facaab4a0ca007da7179b331eb1f6873e5a72ce5f3 SHA512 6f807aad0dff0fd33e2cd7f9753efe94687770d6756db2e2f1703fcf35d90610df64fa5aa9dd0530e1f53036923bbdda4f587e980f2e727e23743fbdceae35a7 WHIRLPOOL bea2e52f145ccd554a33bcf3980f866888271eaa024ea2806e70f53cdb3127162ec00c2c9dbfaf2d6af26c8a06417e32cf557bfce94ba91330441d41a494b265 -EBUILD chromium-41.0.2272.12.ebuild 19119 SHA256 8f5c2adb02b9ff5dd7610ce047977356a3c7ea7a9c0e6fb8f411f535bbb76d8d SHA512 ab7d0b1935448a28aefa09ed73ec9b261a6241baba79f3e0fbc2f761c4ed05331ee9d8954c5b7e1e8c041b8513d2814def147c5200c2df740c1ea1d42c6ae675 WHIRLPOOL 2d4a527c04dbf163f3162cef47e9917b15b0ba154442976ce5254c834006b29d5844044cef22a98dfc4c2c0a945f14d91bf24944af165f9d7ae6c6a98a08a495 -EBUILD chromium-41.0.2272.3.ebuild 19118 SHA256 e7c3df9195c09a418046ba2e1e960d6c6d2b2c28cee653258668311e4d52d1b7 SHA512 77a7bd5764c5aede76ded536f527cc35b9a7634eef7a8954a9d1810edcedadd407c44749eddf036ce32cb710a60727038f825cd0f2a8ac44cbc510c7e96d0542 WHIRLPOOL ba43bfccc6e7a7c0a387e8357b3974466ddc60da8c4ca6acb2844c363ed1212a52129be78125c5f8040b3f8b7a971c6ccdd717466e9d320af6ea28fd89273980 -MISC ChangeLog 2659 SHA256 fe8e7fb2cb5dcfed21893e12f78a7b92b87d63699e737885c2e20afc6b7e9074 SHA512 71717c360fd35527369cba010be4afd1ebc1b7fa89f70c53ba860340c8fc289214adcb9be355b13aa21bc158231265187f8cc2e01a97dc78b3ce255ab6ca45d1 WHIRLPOOL a35b9783bb7a1acb58b5723d3c6df4cf2edb31983a090136b737f37517ccc78f4dff387865f67d213507b71ca77c8113981f5424bd7c447d754f09a4a03bb1f7 +EBUILD chromium-41.0.2272.16.ebuild 19158 SHA256 66f7216d5e4b2fbb17922c3e150fe2882a127a309ae9ad571fdcaca798250f3b SHA512 9bd0735fb1f21f55ddf82964ccebc2a2adf50b0568f08963ce038d57b5b6cf9c4c5c8f5835b7c18af3edb03914d36b988b5e70909f50d36068d7108727fc85ac WHIRLPOOL 2cbe4cc20c3eefb93c0cee9176556e75d2ca59515acceef3e763ee04452f7792b782176bb75ba79e76adc6c8ec2384a580e7bd4b35126280948ea8bcd12bdbe1 +MISC ChangeLog 2862 SHA256 0c499e47a9d1917600bc8bdacc4855cf17e01afadc34267014196e16485f5897 SHA512 dd9182bb4de0db7b910228a875d75358587f1f29f37ffb55b45a64b2abc863dcfa1b3520ded1d48ac3c98179006014017e80faa176ddc2cff8ab3de457e479b7 WHIRLPOOL c754c8aafda4717ec90f95e3ee771b7fa2d683100ac578db6798a411efb648d09f1dde501c1c7d48d6a5aff2fce1f868b3ef635f72d0d90a45639381de42d1f3 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b MISC ChangeLog-2014 123105 SHA256 f67108708d3d21b4acfca327aca42ceb4cc31201772dff496babfacb50acc4eb SHA512 bf6464e7e6ccdee81a4c26949176ebfb705f99e85a0120eea77f52b862fa3b8142abb006462f31e5a9053777836d4d9fdb69926d2b01b49463553740aecdbc43 WHIRLPOOL 114181b4c8e700a56bdf76b4de2e94998436b1b27df9182348ab88afd352085938686359369ffa4af929936e9ad88305efc97e22afd3b4c50b0dcf9669286fea MISC metadata.xml 610 SHA256 fab56e56102853f58a4078b6812b4af31aed0069921ce51200d40c88d813b9ac SHA512 37dcf9426553269dd961565bfb3ff23793b19a5ba12d1909f6392a9514cdaae39c4a8d4d450a7be757425a0deb67f63e81ace513716bf9960f2e64fd373c8986 WHIRLPOOL a2f576b167d68fbf0ca658ecd7ef957ae41823493624b903198505a506ccec27ffbccd4db3a609d7ad2e72b98ad81ff79b2ddd60137821cbf155af4b8b650cd5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iF4EAREIAAYFAlTCuCQACgkQC77qH+pIQ6SmPQEAh+iZHuZbXbvJ/51kRXLcSzLJ -cpe4ZElA13lRwdLJGV4BAKySTwPKooSNxFmRaCG/KoD45f9+5H/4eubi6fr3NjFv -=QrKl +iF4EAREIAAYFAlTGYKgACgkQC77qH+pIQ6SGRwEAjNpFzaWKiqYWjpLbHcCAUppQ ++g8oiYHLCMme7dLZWyQA/0+enbpCi4wv5fLqORUlM+daD6nJF7RUazuRpz7KgaP1 +=Lo/G -----END PGP SIGNATURE----- diff --git a/www-client/chromium/chromium-41.0.2272.12.ebuild b/www-client/chromium/chromium-41.0.2272.16.ebuild similarity index 99% rename from www-client/chromium/chromium-41.0.2272.12.ebuild rename to www-client/chromium/chromium-41.0.2272.16.ebuild index fe155d6f20a4..f4f37804c6d3 100644 --- a/www-client/chromium/chromium-41.0.2272.12.ebuild +++ b/www-client/chromium/chromium-41.0.2272.16.ebuild @@ -1,6 +1,6 @@ # 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.12.ebuild,v 1.1 2015/01/21 20:50:17 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-41.0.2272.16.ebuild,v 1.1 2015/01/26 15:43:32 floppym Exp $ EAPI="5" PYTHON_COMPAT=( python{2_6,2_7} ) @@ -185,6 +185,7 @@ src_prepare() { # fi epatch "${FILESDIR}/${PN}-system-jinja-r7.patch" + epatch "${FILESDIR}/${PN}-cups-r0.patch" epatch_user diff --git a/www-client/chromium/chromium-41.0.2272.3.ebuild b/www-client/chromium/chromium-41.0.2272.3.ebuild deleted file mode 100644 index 5f2a0084a25d..000000000000 --- a/www-client/chromium/chromium-41.0.2272.3.ebuild +++ /dev/null @@ -1,619 +0,0 @@ -# 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.3.ebuild,v 1.3 2015/01/18 13:39:18 phajdan.jr 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}-lite.tar.xz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="bindist cups gnome gnome-keyring hidpi kerberos neon pic pulseaudio selinux +tcmalloc" -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" -# For nvidia-drivers blocker, see bug #413637 . -RDEPEND+=" - !=www-client/chromium-9999 - ! "${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 - - # 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 -}