Dev channel bump. Remove old.
authorPaweł Hajdan <phajdan.jr@gentoo.org>
Fri, 17 Apr 2015 15:11:45 +0000 (15:11 +0000)
committerPaweł Hajdan <phajdan.jr@gentoo.org>
Fri, 17 Apr 2015 15:11:45 +0000 (15:11 +0000)
Package-Manager: portage-2.2.14/cvs/Linux i686
Manifest-Sign-Key: 0x4F1A2555EA71991D!

www-client/chromium/ChangeLog
www-client/chromium/Manifest
www-client/chromium/chromium-41.0.2272.118.ebuild [deleted file]
www-client/chromium/chromium-42.0.2311.60.ebuild [deleted file]
www-client/chromium/chromium-44.0.2369.0.ebuild [moved from www-client/chromium/chromium-42.0.2311.50.ebuild with 95% similarity]

index 04d7353c3d1f5b7f1f7d2149c272c4d051173081..e21d9f1a9fd8aa139da30e831af5f8e3057982bf 100644 (file)
@@ -1,6 +1,13 @@
 # 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.1225 2015/04/17 09:50:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1226 2015/04/17 15:11:13 phajdan.jr Exp $
+
+*chromium-44.0.2369.0 (17 Apr 2015)
+
+  17 Apr 2015; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  -chromium-41.0.2272.118.ebuild, -chromium-42.0.2311.50.ebuild,
+  -chromium-42.0.2311.60.ebuild, +chromium-44.0.2369.0.ebuild:
+  Dev channel bump. Remove old.
 
   17 Apr 2015; Agostino Sarubbo <ago@gentoo.org> chromium-42.0.2311.90.ebuild:
   Stable for x86, wrt bug #546728
index 3885c214922c937b4b262caa0d5c9371a68468b9..0f991234a7d5e927c3b5315308a48a691a5fa1f6 100644 (file)
@@ -14,36 +14,32 @@ AUX chromium-system-libvpx-r0.patch 337 SHA256 26246a4a4d5b4d362c85433c9c4d1483a
 AUX chromium-widevine.patch 1461 SHA256 b352ea3512368fd77b6d342a043645a61204907c3c0c564b31ac7a7aeaa6e7a5 SHA512 da5948c28b0446879502eb0b1490bf06d1ffc8d93fe4bb769f50835b357af7691d474083262b5b5d89ee46ab295e9cab475a8e81833c45f9cfdcecf024f250c4 WHIRLPOOL df860509f7a845f13edf8794340ed5496ffc31662237d73a29404337a629309db6bc442ed4aca9a5844349878a60082f05670ac28cad487c78d7778aa413fbd2
 AUX chromium.default 148 SHA256 bdac1d32025d53158f96c8ad5bd71a58abdcf02f3a8759a43154e97e812fcdd1 SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739 WHIRLPOOL 2e51e864134426668cc73fc5081c35288677d8ce855b07dfbd3413397f9c43148a6d6096a9b7a617511388f87623a3ce7f3387103202db53876a74bccb9dbe6c
 AUX dot-gclient 174 SHA256 0ae6d69323d1d286de7ef1fa62c330536ada7280bda7564fefb5d071384ed324 SHA512 ea858464ee8732536633259ed3d11990822e8b8493c07b83218856a127320ba21b9cfc184f7e7a899739bc5f938fbca25224e559fb7db8558cb86fccc743a685 WHIRLPOOL 72a5a9af7955e653151090b555c6a67a261ff807871fdda16d7c3fabf4b52449ac9caae466ba51a17d2efed74a68adc32687599ea4287cc033e75f787d874b55
-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
+DIST chromium-44.0.2369.0.tar.xz 310689268 SHA256 3b5b9c1fe704a9b4e9a43051abcd2d07dae29902bfeec70370279696c1873b73 SHA512 c04ae4faad147852517f564b122f5975bd30d7e9b2159d68380a9f823b4ca84a325a660eb6e6b1d66e2b84e70a85e5fdce16cd409cd9702228d537753948051c WHIRLPOOL 915560d693d95af3fd1e280183c38a45c131075f3b0b67b15098b33216a902c347212a980d0e24ab917711739c54e1d5ef8e8edf8118517d9b1d50b526f3f444
 EBUILD chromium-42.0.2311.90.ebuild 20364 SHA256 6ccc9c445c9446d5147ea7772838d9e4a69bf3674510848d051e36772c9dd505 SHA512 167704c433d178dedd5ded071013693ddfe32e6e317b71c1690a876ad4a12dbbf069270bfae4c8c48e33bfaefb2ece6939d1d92ba71e584adc5665ba8d0a4195 WHIRLPOOL e47026459dafa35483742bc0457ac4c932434d32f577dcef80ca1a693cc8594988363469386f126ad4005b1d1f392edc42d3efa1a616f299675546382d659959
 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 9275 SHA256 17267e2ce89fc3a0de3b0c465012e5d5ed75ded39d03b9761ac94b33883e6664 SHA512 7a4fa07d136a88d243689084a349c8ae7ef726626ca213384517873705f958ab3d5f88c1e99ab2b2fa7bb8a1c1d72109fc38bf8b2b6ff188501c08127d828f6c WHIRLPOOL 292652da9a8c0241044eadf5228ea91e0d94284c706b3c37477c1089f20b74cd4faa94d6269175c2600490cde77954ce562df47f3c388c194a1dc25fdfaf225f
+EBUILD chromium-44.0.2369.0.ebuild 20171 SHA256 c71e215f7e51d8dc0b2e454bf0ad0079202427cb94d6e76801ceea0af185d087 SHA512 52be74c5cf6c97bd8633ed389982a4e7e5c54374323f0d214a09cd9ef36d51dd8469ac50de43136bce076251e05e56954aad4710991ad1e563a4ad12c7c0fc3d WHIRLPOOL ba846bc48b238b3b8fd9f8fdd31001bc324e2981aa4292607e793b8ae48b00502f689809e5029e2a6cbbd404977a7ad33a64d292f71bb7a10562b2067e0db26e
+MISC ChangeLog 9535 SHA256 231a6b203436d8c6611dee803b981642bacff831db0cdbcf2268475896754883 SHA512 bba86709699d96cdeb2b34d02883e27e65564a3a9db8091b7819deacc4910689788645e3c25098abf990d114c087412f1384f1437b911b68c0e667d015bfc650 WHIRLPOOL 41ef04ddc0f0f9ad2b60c75f62dc5298e909b7d12ba859a396d96ec7c39f657d72a1adf8ccdff2b9a927b7f185b4f18c775722bb756450eaaf7e26eadfeca660
 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
 
-iQIcBAEBCAAGBQJVMNeCAAoJELp701BxlEWfrcYQAI0C4zG1h+iE37MUXnBy5io8
-3lnHdv2j6oIsqoD+/tmV80wkTF+g7c3H0hY7YGcLvQCv+jsRtBrS2jFIpyYfTrNd
-PnImF0mo0mv1yMv/mccZ9QPW+rIj2MiNWdwBV/FkIG4grEbzTrdwJA4+/Un6QqlL
-LKJzyR2ldwA6vMBx7L8670g6pNHxq7QKAwuSByIytU6cN8yZrK/Wq3fGqEu8dv4g
-CRIW/4NUv9PkzIa32G4M6Oz+ZxS+0TY04Al4OHMTyCm64u6FCt0Cd4JKIjRJwOiD
-Oahu6v6V0vN+exkzJvSkgzqfv6NwGnekfLsP0tvFHWi3B2LXZXeOyvH2rQR9w+xd
-fSBcBy9YcJuSIPTYi/LW/0FPBFgwqSIEc/9p2UpA5jRXu4E3GPOgIYx/XPm6rLoL
-qeRC3PJoO5cBkHV5OnHcQfIDos6f+CvRaitgwM3XxfNQc/Hx2OmRI2UWEYxqSzjc
-CY2uYhHJxCv3MAD6TZpJM0nfzfTirGoVeEZK/azPxTcs/3Kre8OvyJvHMdzAV5FR
-idEJqlj9wKLVqlBqA/o13N4FrgRe1TpIXNfbu1J3b8uNZGFYOHzPZ1gzbfO2vMoB
-Sqs5o2qYbxGqXP67eX04DgeWlTTqNL+cVFdneEFN59zGcYwobavPmCNRjYoQiI/s
-0DTP1NQ4WN4bTUdzgQ+C
-=6D52
+iQIcBAEBCAAGBQJVMSKpAAoJEE8aJVXqcZkdGGEP/0Lw1Ural1rsFqFvCDKmKcMw
+jvQ5ldXGkPAlZeJOciMGDX0o81snIBYLv594e3rLJq30VykT9eT/CdskqOnXIsq4
+HPwA3H3TVAnFtNUJK0FsUYEsezEgGo9kLarzCfF0NaI4p0tXjGGg70zQqSJj9BXa
+K+EYPD3GLyeyMmfskdvO0wH1xT6LJx28u83GDMVoswAvrvN25Q7fbiSg0Ze4bhCR
+mlV7MRRk6Ha606UPbCCPtUdhhBK2SDvA/6UHnoq6w4MrnrnVHdo8ODjZGfqlooL5
+LwxGRH0KexGjz8ZX/zcyWWqs6HukqKd5LGqlnTPsQs0op03RR7+ehElT4jNxlJqy
+GtWSzrt1hI1Bc6CVB6WxOWuf1WhNLgT7xsvsWU7Tw6bR0SLzrqhGsqkuC+m6Fs1F
+2dz3UOm5+MmfsHJSxGyLj6j4kGBg3Dg94k7LKN56P9mHlH7TPl/Kp++kkkzZsUcb
+RsodbZNaswJ8FbNzSyf+TlagHJShn5A1ZvuM5uYY0sMZTEGGalu4INwvklkQbRRl
+5VvA8azgrU2kvUF/e10PH9aDNvZaD9RMoKUvFQwpCG7DoOVaymLuytiamy+HaTDQ
+D+eKT/F/P3jCE0zC9Nuuaqy4Fs4t141/Ff+jYOlEj5iQRMQkoni/0csU7hxKXHMw
+ywy5WAp+kJA99eD1V5Vg
+=xDJM
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-41.0.2272.118.ebuild b/www-client/chromium/chromium-41.0.2272.118.ebuild
deleted file mode 100644 (file)
index 89cef60..0000000
+++ /dev/null
@@ -1,640 +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.118.ebuild,v 1.4 2015/04/08 18:30:30 mgorny 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 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
-       !<www-plugins/chrome-binary-plugins-37
-       x11-misc/xdg-utils
-       virtual/opengl
-       virtual/ttf-fonts
-       selinux? ( sec-policy/selinux-chromium )
-       tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )"
-
-# Python dependencies. The DEPEND part needs to be kept in sync
-# with python_check_deps.
-DEPEND+=" $(python_gen_any_dep '
-       dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
-       dev-python/jinja[${PYTHON_USEDEP}]
-       dev-python/ply[${PYTHON_USEDEP}]
-       dev-python/simplejson[${PYTHON_USEDEP}]
-')"
-python_check_deps() {
-       has_version "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" && \
-               has_version "dev-python/jinja[${PYTHON_USEDEP}]" && \
-               has_version "dev-python/ply[${PYTHON_USEDEP}]" && \
-               has_version "dev-python/simplejson[${PYTHON_USEDEP}]"
-}
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-       EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/bitstream-cyberbit
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-Depending on your desktop environment, you may need
-to install additional packages to get icons on the Downloads page.
-
-For KDE, the required package is kde-base/oxygen-icons.
-
-For other desktop environments, try one of the following:
-- x11-themes/gnome-icon-theme
-- x11-themes/tango-icon-theme
-"
-
-pkg_pretend() {
-       if [[ $(tc-getCC)$ == *gcc* ]] && \
-               [[ $(gcc-major-version)$(gcc-minor-version) -lt 48 ]]; then
-               die 'At least gcc 4.8 is required, see bugs: #535730, #525374, #518668.'
-       fi
-}
-
-pkg_setup() {
-       if [[ "${SLOT}" == "0" ]]; then
-               CHROMIUM_SUFFIX=""
-       else
-               CHROMIUM_SUFFIX="-${SLOT}"
-       fi
-       CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
-
-       # Make sure the build system will use the right python, bug #344367.
-       python-any-r1_pkg_setup
-
-       chromium_suid_sandbox_check_kernel_config
-
-       if use bindist; then
-               elog "bindist enabled: H.264 video support will be disabled."
-       else
-               elog "bindist disabled: Resulting binaries may not be legal to re-distribute."
-       fi
-}
-
-src_prepare() {
-       # if ! use arm; then
-       #       mkdir -p out/Release/gen/sdk/toolchain || die
-       #       # Do not preserve SELinux context, bug #460892 .
-       #       cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
-       #               out/Release/gen/sdk/toolchain/linux_x86_newlib || die
-       #       touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
-       # fi
-
-       epatch "${FILESDIR}/${PN}-system-jinja-r7.patch"
-       epatch "${FILESDIR}/${PN}-cups-r0.patch"
-
-       if use widevine; then
-               local WIDEVINE_VERSION="$(< "${ROOT}/usr/$(get_libdir)/chromium-browser/widevine.version")"
-               [[ -z $WIDEVINE_VERSION ]] && die "Could not determine Widevine version."
-               sed -e "s/@WIDEVINE_VERSION@/${WIDEVINE_VERSION}/" "${FILESDIR}/${PN}-widevine.patch" > "${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
-}
diff --git a/www-client/chromium/chromium-42.0.2311.60.ebuild b/www-client/chromium/chromium-42.0.2311.60.ebuild
deleted file mode 100644 (file)
index 19151f1..0000000
+++ /dev/null
@@ -1,654 +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-42.0.2311.60.ebuild,v 1.2 2015/04/08 18:30:30 mgorny 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
-       !<www-plugins/chrome-binary-plugins-37
-       x11-misc/xdg-utils
-       virtual/opengl
-       virtual/ttf-fonts
-       selinux? ( sec-policy/selinux-chromium )
-       tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )"
-
-# Python dependencies. The DEPEND part needs to be kept in sync
-# with python_check_deps.
-DEPEND+=" $(python_gen_any_dep '
-       dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
-       dev-python/jinja[${PYTHON_USEDEP}]
-       dev-python/ply[${PYTHON_USEDEP}]
-       dev-python/simplejson[${PYTHON_USEDEP}]
-')"
-python_check_deps() {
-       has_version "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" && \
-               has_version "dev-python/jinja[${PYTHON_USEDEP}]" && \
-               has_version "dev-python/ply[${PYTHON_USEDEP}]" && \
-               has_version "dev-python/simplejson[${PYTHON_USEDEP}]"
-}
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-       EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/bitstream-cyberbit
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-Depending on your desktop environment, you may need
-to install additional packages to get icons on the Downloads page.
-
-For KDE, the required package is kde-base/oxygen-icons.
-
-For other desktop environments, try one of the following:
-- x11-themes/gnome-icon-theme
-- x11-themes/tango-icon-theme
-"
-
-pkg_pretend() {
-       if [[ $(tc-getCC)$ == *gcc* ]] && \
-               [[ $(gcc-major-version)$(gcc-minor-version) -lt 48 ]]; then
-               die 'At least gcc 4.8 is required, see bugs: #535730, #525374, #518668.'
-       fi
-
-       # Check build requirements, bug #541816 .
-       CHECKREQS_DISK_BUILD="5G"
-       eshopts_push -s extglob
-       if is-flagq '-g?(gdb)?([1-9])'; then
-               CHECKREQS_DISK_BUILD="25G"
-       fi
-       eshopts_pop
-       check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-       if [[ "${SLOT}" == "0" ]]; then
-               CHROMIUM_SUFFIX=""
-       else
-               CHROMIUM_SUFFIX="-${SLOT}"
-       fi
-       CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
-
-       # Make sure the build system will use the right python, bug #344367.
-       python-any-r1_pkg_setup
-
-       chromium_suid_sandbox_check_kernel_config
-
-       if use bindist; then
-               elog "bindist enabled: H.264 video support will be disabled."
-       else
-               elog "bindist disabled: Resulting binaries may not be legal to re-distribute."
-       fi
-}
-
-src_prepare() {
-       # if ! use arm; then
-       #       mkdir -p out/Release/gen/sdk/toolchain || die
-       #       # Do not preserve SELinux context, bug #460892 .
-       #       cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
-       #               out/Release/gen/sdk/toolchain/linux_x86_newlib || die
-       #       touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
-       # fi
-
-       epatch "${FILESDIR}/${PN}-system-jinja-r7.patch"
-       epatch "${FILESDIR}/${PN}-libsecret-r0.patch"
-
-       if use widevine; then
-               local WIDEVINE_VERSION="$(< "${ROOT}/usr/$(get_libdir)/chromium-browser/widevine.version")"
-               [[ -z $WIDEVINE_VERSION ]] && die "Could not determine Widevine version."
-               sed -e "s/@WIDEVINE_VERSION@/${WIDEVINE_VERSION}/" "${FILESDIR}/${PN}-widevine.patch" > "${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
-}
similarity index 95%
rename from www-client/chromium/chromium-42.0.2311.50.ebuild
rename to www-client/chromium/chromium-44.0.2369.0.ebuild
index 237e2fae39fab82302254f20aa178df1c89aef4b..53aff0d2fd17818de3722df51e60ec2ce8c22290 100644 (file)
@@ -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-42.0.2311.50.ebuild,v 1.2 2015/04/08 18:30:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-44.0.2369.0.ebuild,v 1.1 2015/04/17 15:11:13 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
@@ -19,8 +19,8 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 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 )"
+IUSE="cups gnome gnome-keyring hidpi kerberos neon pic proprietary-codecs pulseaudio selinux +tcmalloc widevine"
+RESTRICT="proprietary-codecs? ( bindist )"
 
 # Native Client binaries are compiled with different set of flags, bug #452066.
 QA_FLAGS_IGNORED=".*\.nexe"
@@ -33,10 +33,7 @@ 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:=
-       )
+       cups? ( >=net-print/cups-1.3.11:= )
        >=dev-libs/elfutils-0.149
        dev-libs/expat:=
        dev-libs/glib:=
@@ -59,6 +56,7 @@ RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
        >=media-libs/libjpeg-turbo-1.2.0-r1:=
        media-libs/libpng:0=
        >=media-libs/libwebp-0.4.0:=
+       >=media-libs/libvpx-1.4.0:=
        media-libs/speex:=
        pulseaudio? ( media-sound/pulseaudio:= )
        sys-apps/dbus:=
@@ -181,12 +179,6 @@ pkg_setup() {
        python-any-r1_pkg_setup
 
        chromium_suid_sandbox_check_kernel_config
-
-       if use bindist; then
-               elog "bindist enabled: H.264 video support will be disabled."
-       else
-               elog "bindist disabled: Resulting binaries may not be legal to re-distribute."
-       fi
 }
 
 src_prepare() {
@@ -200,6 +192,7 @@ src_prepare() {
 
        epatch "${FILESDIR}/${PN}-system-jinja-r7.patch"
        epatch "${FILESDIR}/${PN}-libsecret-r0.patch"
+       epatch "${FILESDIR}/${PN}-system-libvpx-r0.patch"
 
        if use widevine; then
                local WIDEVINE_VERSION="$(< "${ROOT}/usr/$(get_libdir)/chromium-browser/widevine.version")"
@@ -243,7 +236,7 @@ src_prepare() {
                '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/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \
                'third_party/ffmpeg' \
                'third_party/fips181' \
                'third_party/flot' \
@@ -261,8 +254,6 @@ src_prepare() {
                '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' \
@@ -296,6 +287,8 @@ src_prepare() {
                '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/trace-viewer/third_party/tvcm/third_party/rcssmin' \
+               'third_party/trace-viewer/third_party/tvcm/third_party/rjsmin' \
                'third_party/undoview' \
                'third_party/usrsctp' \
                'third_party/web-animations-js' \
@@ -338,7 +331,6 @@ src_configure() {
        # 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).
@@ -354,6 +346,7 @@ src_configure() {
                -Duse_system_libjpeg=1
                -Duse_system_libpng=1
                -Duse_system_libwebp=1
+               -Duse_system_libvpx=1
                -Duse_system_libxml=1
                -Duse_system_libxslt=1
                -Duse_system_minizip=1
@@ -416,15 +409,8 @@ src_configure() {
                -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}"
+       ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+       myconf+=" -Dproprietary_codecs=1 -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,