Stable channel bump.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

3 files changed, 652 insertions, 15 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 09a2b8cf79eb..c2060d307618 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.1215 2015/04/02 07:04:17 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1216 2015/04/06 16:24:09 floppym Exp $
+
+*chromium-41.0.2272.118 (06 Apr 2015)
+
+  06 Apr 2015; Mike Gilbert <floppym@gentoo.org> +chromium-41.0.2272.118.ebuild:
+  Stable channel bump.
 
 *chromium-43.0.2351.3 (02 Apr 2015)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 836b2f74009d..c6d99d25ef61 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -13,34 +13,26 @@ AUX chromium-system-jinja-r7.patch 1611 SHA256 ff06a869615dd10ed3b26946b6a3113b3
 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-41.0.2272.76.tar.xz 301532460 SHA256 31e2ae88ad4604e79dbcf7258f66106bd51e88413ebda6a1b1d181967535cd8a SHA512 5a616183817fda9b0c403a648f6265f0ce2743e61af6bc0a848a7471a40ecf777693e527388259dcea86340f98b6021366bef7a0ce33717b063d2eaf1fa94bc0 WHIRLPOOL a7d7bfc320f3528fcd4934629f53e10252a217f3c8b9966621bd5adf6c2ba25a5a0ffe0ba1a87f49990671386aa0926e1b0eea696a6ec8c6ef2efb45e002e3e2
 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-43.0.2342.2.tar.xz 307953856 SHA256 d7353f22c298d095e84493b6e5c31091b3f80e4acbdd7cb8572907797ff29dee SHA512 ae66ed9e520adc0dd1e85c454daf074123d7f0297a8c4ddd5ecaa374eeb58f67173fc90b89996981a7b0cb3e80dafc050a57f84cad8599bef07121cef57180ea WHIRLPOOL 9a1bde81d48aa9a967db222ab7c8fe9c42b1e2cb868a25be590e847276f006670542aa60275885ef9b9721c24a2de3b163164aa1a7abd00bad761557d3b1e438
 DIST chromium-43.0.2351.3.tar.xz 309259204 SHA256 ae126df4b09ba97020994f4398c051e51604705c9468a2bd571e917af7bb5715 SHA512 d4fe0204a52d4dfac8a1ccedb3c83a635ebb68f85a937c658ae9cce85f425a2f53e18f46ba7e104d2561c532d22982840d98c7ffe07abb7017d933b82ef3133c WHIRLPOOL 71ede23afe5b353d88ce7e8328236b106dcc9cb6a91122f645b0dd7abcbfff87d43258bd3c7c729ef2031d4f82a0a57ea009d4fe2baad92f6ed598b9338da179
+EBUILD chromium-41.0.2272.118.ebuild 20144 SHA256 9d871dbe10a9e5727cf978081a84dbd5eac5fc4b218216d37eb43cf98c6f3ceb SHA512 becb3c966e379ef5773bb88e3ee03ee99e3bc1b71d907a1d62900a6a59baba1e924512d05840bbaccc69d1da58ddcad47146dee0753c85b929f22ad6f713e6f4 WHIRLPOOL 3b5032e68b109d4a5efd3c62a1614f8eabc1f95d6ec110bf80c10a225097f5c7a4940357691daba6f0c9e4c40d021466cfb3d3cbc8c20bd4d206438bbdf32969
 EBUILD chromium-41.0.2272.76.ebuild 20137 SHA256 3bade947aee25e6f0935867f384399b55c0385b2044fd7ca6ddc8dd924dc63ad SHA512 e934b80809f410b6538e998cf03713378030c06611b29965673f1257c1013921860e342818812f90f73a902a53c6bcc2e7c57b419662f1017fbaa2b8dfecd9dd WHIRLPOOL 3479d4c37cbb8e23929040e173e0615c6566757a51ee6f3937b67cfdb8d68630b3b6cc97b873bc4c655f7669096902c0ab53ddf2861f47ff463aa1878f84b2e6
 EBUILD chromium-42.0.2311.50.ebuild 20379 SHA256 0d075f30938cc0e975f4924738a869f8e5cf5866f1d5b291640ab80ff09177f6 SHA512 dea529a133c4586a0f79ae56fe9aaa3ae684d2cfe08715e6e98c2ad12f9c7e7171e49c33e249623a0404c7b663ec6e767b5c3a5e55461ea7dc2d03b3322e69f2 WHIRLPOOL 455f64e5521670263b25d4f69f55c910488c1d1e55d7432eb9c3286d498b330bc4620e7d00d3453d87551fb1505bedbc4c98d2a0b07b5498dd33c7f3de330809
 EBUILD chromium-42.0.2311.60.ebuild 20376 SHA256 9f2db0b466982a4a3ad6b0989b5e37317370e37011d5bcddc3d44eff2429cbe6 SHA512 905e144eada76c210c665985d46a2f7da3f323686c4ed345468b87f9d91d9bff15fcbe3e5265a470d31dcbc091cb1a71ae430ea9613159224210c168a82494cc WHIRLPOOL 80fad07aaf208849bbeb996603cf7ff03c7b08d1a56f44a1d31369dc233b8bb4a0b1dc957a8c6e20931e1ce9e2ce3d85d8bd65a80448814b067329e0d690eb5a
 EBUILD chromium-43.0.2342.2.ebuild 20102 SHA256 993d1f874c70293fed51fdb8cc93087ac429b1acb182e86a449214a4c1f29668 SHA512 3c5e0b5d1394efe0bd3fa4cd8760694cf8627c172b03d70989f94023e82aac55e541979cc5d8ce49c83f0e49761cf684217b13bac7d4d19b3c8537c69d88177f WHIRLPOOL 3885f0b489ec8fa377c978c30e455071b6dfc506460e9676eb7bc3558011eae26b018c80da5a32118970e817f2ddaaefbfa78f5c43088d8d7dc126e8440a4000
 EBUILD chromium-43.0.2351.3.ebuild 20145 SHA256 3023fae9ebb9415f43fd2d9d0703ba93f28d991d44dafca0e828848312ab2e05 SHA512 8df590f0ac7a76d29ecd6dd231ff2699e47cbd0b22782eb47825d6c53fe1c58df889ce1f3eb8364919c8f3f44304197b5d5149e264fa628c53ef91994c5bbf1d WHIRLPOOL 16ed4a33508f7a0b3cf7983696f969070800790db1f5bd963679e3ba508b6dccd43d255dad103abb3d7a6c68802594ddbe08120468730b975930e9a6945e8f49
-MISC ChangeLog 7745 SHA256 30b67de1b8f13fcc888ded6379820e2c9c63d0583f50fb5f5cd18efb75c5f285 SHA512 34d0aa9fc20ff6f1f918f5baae9a4e547a1b45e253aad2b3e95d34ec2ff7ddcdf4c367f6fbd5ae70c06063f4892f2cc75ee652dbc367d6812609bdd02932574c WHIRLPOOL 87f65c2632726352054012214b136efab40b83a6fa9b82d260ab79cc5ec1175875e384ac350f7a2d708c98c55cef6c551974d96a61a82f9c4d70b5baab8095af
+MISC ChangeLog 7886 SHA256 b6a93f07adfec6a1b33322e81515b5141c54ee89fc9cf918c5ff21b3d0caa501 SHA512 67ffc86b562cf72b73f9a573af3079c877d45474af3309f69a43ddad0cf8a110d91bcf01155d8f0a6a91f673b779f5e9ac0d3cce624096260dd4d279d4663906 WHIRLPOOL 0466b7bca8e6b0b89f16115afc72364441b1e010d8890a08526f21b408fb7ab1781e9cfda87bc7cb6d841dd23e5865713e562fccb8defc110d0b48d0e2c089d7
 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
 
-iQIcBAEBCAAGBQJVHOoKAAoJEE8aJVXqcZkdtIMQANXg0B1Rpf+TI6JfTrpfmurX
-4lyb9nXHd7Qlu1ZxYmE3p7WUElcnPOliTgO3+cWIjMUDmQQ6MDloW72OE2aKH6to
-xn7SLxFn09fJtgctZysbbPiy5a7hOaFRJaSt0q2/ZCWdvqQ7BRRjXSy5Ekt8K3E5
-slKmqPsBp1w0/O1I+YLklqLcQNYu+V3NTRp3RrWnuPthW5+G5dqUFJPKZOejNtPN
-JSF4EoNgCY+N2N/ugh0cbuRyUY0uWDjkbzpdWQmwVyZr9d8DA+a8mtYz+Zmi/E/S
-k3wsP0kyIPvHA37O81uHX55p89f4ceH2UJR1xP8FMt3gs6ybst/BW39noAyrhXWp
-Bo6eBCXkbqSedZBDoczjxitKZVYZKdZ8cHChCMg5SMbMPRP8sjqGbuAiIMd/5Mth
-pSlAal99xKCOroIusdMCKcNL5H+frfqG9wU6gZIQVoX0FAvFB9W0xvn5RWNYfRpc
-ftU8AeBn3w4uhNz/DV7jOr0qH7wLtc+ClO0BwfGyLDpmx81vardJt45O/RRS5Mhb
-0fnqK0BL3fgt8oT/hVUnxEddofeEHxVhdhdK9MOtEW0dWUFiUjqSfqKw1A7YiOSS
-t0PF0CkDmXpDIVTrr8oT4U49n0hzayK+h55MwFOs2dg+5iJaPdGSGpThwQ/v9qG1
-DCOEkg6tgUcOQiZ5AYFK
-=+vjQ
+iF4EAREIAAYFAlUisy4ACgkQC77qH+pIQ6Tv3QD/Yfy4hFzfz84hUZvC4K48zrIR
+A2rMFjtmVpi0anXAQbUA/2KUHmIXNvnZ3FUPVXQYMnkLeKmtTljXyytK9xp+XJ7D
+=xF/F
 -----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
new file mode 100644
index 000000000000..71daf50a9115
--- /dev/null
+++ b/www-client/chromium/chromium-41.0.2272.118.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.118.ebuild,v 1.1 2015/04/06 16:24:09 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
+	!<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
+}