Dev channel bump.

Package-Manager: portage-2.2.14/cvs/Linux i686
Manifest-Sign-Key: 0x4F1A2555EA71991D!

3 files changed, 649 insertions, 17 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index c5b978816c4f..97e55e19ce19 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1251 2015/06/04 19:06:10 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1252 2015/06/08 20:32:00 phajdan.jr Exp $
+
+*chromium-45.0.2421.0 (08 Jun 2015)
+
+  08 Jun 2015; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +chromium-45.0.2421.0.ebuild:
+  Dev channel bump.
 
   04 Jun 2015; Michael Palimaka <kensington@gentoo.org>
   chromium-43.0.2357.65.ebuild, chromium-43.0.2357.73.ebuild,
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index a9da38c926b2..6088f6ef1080 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -19,30 +19,31 @@ DIST chromium-43.0.2357.73.tar.xz 309192528 SHA256 489c66bc6e5d0f07df5b446af0903
 DIST chromium-44.0.2403.18.tar.xz 307086188 SHA256 a5abaf7c2527ca4f629c35230543e6d2e2c40026825b1380ec35447211644a4d SHA512 505f40dc341779d7be00fcf6ae5901a0b83a65d37d60c4deddcc1af30b349a0d6d931abab7c9c504c4de6e4d9b9bb46bc45c2d28638c729e7731a23e91f7e27a WHIRLPOOL 613dacd01449cbb15b80a9068878fe0006d88ceaee2ae99b0a6245a9b2aa5a51b4e09424fe54ece6e34244e6f0605a28ee051c02bfc5003982ef745981edc779
 DIST chromium-44.0.2403.4.tar.xz 311973572 SHA256 450a2599f1392d8bf5b0263d655bfbe5092a0dcfa1c784760728fd32a656a5ff SHA512 aa4f33beacfd796cecffc32dc60b28242b2969a8d4ccb46870d96d271f03f26561388de18398ec58fad6e0fc451cd4cea1bd6d42085aa605f9ca6bc2cc9b66f7 WHIRLPOOL 46b746ecdf56c02c92c312809e8a3ae80fc7f2ad8d0fef012ad77b5c948b051cf5f608ec701619928c075f013a94021659d529d5fe322dfc82f8240f6218d4bf
 DIST chromium-45.0.2414.0.tar.xz 309668080 SHA256 2cc0ea9d876a818807e9a112f4dccbc56513b59cb1cdb543387e73d661852212 SHA512 68524700cffbead95282957bc27598b250d8b2a3a4c34c919216ce7c9bbd35fb2551789a712365ae0de6d95e68ae45956dadf64a1e761f2165bc8f486e9a7eab WHIRLPOOL 754d0721e9705e1d963a9343f01c9d69be12cee7da0a71b239875ddd84c0196676a0c7b3441d18ed6df7952d0b7f9efad934fd9eb97b11ff74a438074fb3abaa
+DIST chromium-45.0.2421.0.tar.xz 310110988 SHA256 53c34e85619d2c1c600af339c0c8c0dc8cb2ded49a0d7677eedb7258810788e1 SHA512 e2d0c2eb6655f6ab8a7b85013a0b1238a1f58ea55318c1d9daf75c2ba62bd31d8749249a31a9a9da05bdeafc21a9bdcc6f7f4cf8091d8ffc5c6a809a7ed67fd4 WHIRLPOOL c0c834a88f6be38caee7e649ff14a02d6b19f2336b7403e121603dce77679c2116fc17a53ed60088b98dd4aaa197829c68a50554cb77061742fff3d594600488
 EBUILD chromium-43.0.2357.65.ebuild 20187 SHA256 1e4fee43356524e291396825cceecf3748c722ff2ea392fdec909eb54183962c SHA512 3dfee723d38bbabfc0f98cbd11b057983e434d8474b08b5d29d1900718b7a7ca20781976c9e8155ad6f3ef705ee401064e980bfafb094c550377c1653c6eb2e4 WHIRLPOOL 8b0baa1e8019703976c631108cc0dac9120ea52b9e15ad6ba524f11221ae3325a221b2ee2939f374f1f85b384889401c8efdd1c98e623e881be8c9e5cfa0660f
 EBUILD chromium-43.0.2357.73.ebuild 20189 SHA256 f769f9f82bd1d1b3589b09e978d38be1f2f1b5c6c4108cf00e1891eebd18540b SHA512 3ef6c7e10899f0084f4a4b3ce3e929d8404ee842bf240b4e969b36e770f18728211692b16f222a20cdf902ae81449d830296618f4720ef456047c339c231edb3 WHIRLPOOL 946752c723b339cf646b37fa4981028c935ffabcd0c8c5315d10acfa1cb0a7a8394686fd1556f093f422be98dcf5c6e62bf40d759c56b6c29ebf3a08fecbd37f
 EBUILD chromium-44.0.2403.18.ebuild 19414 SHA256 7e353e25fcd8eb1c38301d5dd8867b63837b368e4ede5efc5482380c1dfcbb74 SHA512 a62294ea0bca837ea89efd395a1ee0e27868cac1bb0c53ebc00c654fa61f085020fa0417e87466553f2d78ee09c80edac53fca65a5eb51ffb7d96a96faebade9 WHIRLPOOL 7eefd1dbbe1ed3a94ce5f70b3debd96121ad1ad5c62a18b3e41ac170f8e58b85eae14ddf868aa38d5ace014fba8907e6476e4b842a95de906e007065a018d764
 EBUILD chromium-44.0.2403.4.ebuild 19413 SHA256 cc06547f600d10f730d68f65c2e02222eb20bc001974980741d37f8757f8c127 SHA512 b2f87df364fd2d4455088960d16d9e12091a5442c3498825d701695b863fa859a66d730205133cce3e6e128239b9127bcfcc79dfd4a44e2d44bff228b70200ad WHIRLPOOL 68bfb4746f1925730d8d4d8428bf1982cb9230bfe0a4d53edded25d2b31279383b98d5f03a8d58797f7d6067dd46273e34449742e58ee89757f7a71a5ab548b5
 EBUILD chromium-45.0.2414.0.ebuild 19470 SHA256 e70acb71fcf3e6dea0e544d7a60155248907b6d26a829cd9e19fb478a5e485a3 SHA512 07ccd9b6c0115345142c1488b9c5a6396cbe7cb88278ca6690cfdfcd33ac08faa55a09fa9cb4ae1f0c8ddb3570b3e89d757c9a17a0934b59fac925e0997c8d39 WHIRLPOOL 81654d67c44d5abb33c567f8fec1aa271d3617b93ad3da185e7404ecd5311bf90a9712800d85531bdd73820afb513588010eeda6563a2083a0255ed7448051ff
-MISC ChangeLog 13858 SHA256 38b03f5a1c4c166ebd1feded4df84356bc44e5e80ce399991a8a66059cc89865 SHA512 1fefa73c6644c24113dab76823165182b604a0466c828a2adbd3bf1e95164e7f817184f9579eb8eaa61e8f3fedfe1b518cf54864fff9ca9efeecbff0dbbabe67 WHIRLPOOL dcdccc3b627739f3ed4e6826c69adc7127d4d36b7012f972284e26f25fe1a279fdea49f010005f6980ba548709a8fc043d449e825b6cce0d900e497636d62b03
+EBUILD chromium-45.0.2421.0.ebuild 19438 SHA256 63ffdca352dddd03d24c77d2f4adf5e3d850f9a56895d66157f148ed72b5229a SHA512 500dd5d181b08d243d138bb67e9e548571fd8b84780facc827abe82f746c62676062af93e609752f7bc108ef68ba40f2a935a00dbd005fec34ef8514e4bb8896 WHIRLPOOL 1df62d5f7b84920bf21c809976a2abc06861efeea2708239a6a15a51b33447697e976fb472d660e0dd10ecea92eb5e8ba98ad063651853dc8d835f60c21af5da
+MISC ChangeLog 14003 SHA256 2e268506a13292b26451a23d34bf121e88e9afc4b8cf545ffebae7bdfbe46680 SHA512 e5861e12096202eaa42ddf17445d7cb5d96da9b0422baeb616258130827c44135dcc8ed975ed101f692edb862ef89065f0003a118d42ba8037258228badddd2a WHIRLPOOL c567c80b6997a38306934d4e52d1dc1aaebc7068a7b4e060b496cd801769e54a2f77ec76dc4bc49b4af649216c641ffd1bd7189ad074fb2da44cb15c52995715
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
 MISC ChangeLog-2014 123105 SHA256 f67108708d3d21b4acfca327aca42ceb4cc31201772dff496babfacb50acc4eb SHA512 bf6464e7e6ccdee81a4c26949176ebfb705f99e85a0120eea77f52b862fa3b8142abb006462f31e5a9053777836d4d9fdb69926d2b01b49463553740aecdbc43 WHIRLPOOL 114181b4c8e700a56bdf76b4de2e94998436b1b27df9182348ab88afd352085938686359369ffa4af929936e9ad88305efc97e22afd3b4c50b0dcf9669286fea
 MISC metadata.xml 719 SHA256 edbbfa7039ad145f0f22eeb1dba7f7b209d2a58ae8cb930e2e92772e71cb2c0a SHA512 b8cd8c96a404c4e37a9d3bf3652dc291b7bac353e6f76e7989ffd65fec774847c1c9c9bb6511d0532bd2ea72921b60931b0c5cee40a8e20022e4edecebcdf47d WHIRLPOOL 097471d7c223a4a17417ac24d04a98c6661ad758ad83456333724017592a41a505a391ea8296a8de062e9271b41649a588f9f185625e485a34a389f717664652
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJiBAEBCABMBQJVcKGlRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7FEsD/0e38MH22gbl5wxbatymWaFw4E7qEw5QhuHB8eCxNJp94CGlzPf3TRXGjbx
-kJrT/TXBcN9odrLgGjkT3snOWh+ATrb6/EVnlk8kF4HAmgX0VaN+4casL572eXh4
-j2Vj6H+CWVx2+v+ZZwJxDj4YIui3SaSPaU2W4QFyFVkQ5d9WH9IrvAUCkQB8nyEf
-rx58cdmHT/owHJgLD6Ssf0EREfrjGIdOPtDboODg/Vx6483f8j9plTDV2pHOcF1h
-BhxkJ0u7aRAqkXGqcaXKBe1WIdCMpZc/abgD7k1LGnhkyis+OApeq3W2gUdmaYI7
-rZkdkRZn9TixcxcR4fIDVfsYMNPUMJ6bjt3ReH7gkh0cN8GbiCLp6wDn9mK3l+zL
-hmXWHo1YrN0e7sZhL1T/IQgdur4f4cZjqL/oxOjIhDz/r+JFQPyiIR5bG4zRp9X6
-On3pxkPRbTwKjUwrF7EF8eOtjCFePhNBO4yWRTF2KfYiUydo/zbCogqNqGKtviws
-bAuR8Ugv2W8+WevXIF7dkegBCTGLfy1mWtUvf2yJv/NBWChDF8r+ouluZ7t9VR+s
-d0ymxES+BfpzQ2FrpPmNBgrBBhi6fViX0qr6uETlNxJWLJTcWr3C1reFQ+wtdj4I
-G4nQ3dPFkZRW1RG/5ykAe8dDQ3vNx5QFwfgdq+GFMdW0Yuwv9g==
-=Zle/
+iQIcBAEBCAAGBQJVdfvMAAoJEE8aJVXqcZkd7c4P/3yG5LXnZ193xMP0OG7LbkET
+WFCPuHhMChNgrm9nFzQjDHZwfMIyVVdz4mDWcqvIyCH6Mkn0quzTwosG1Qs0S8OO
+9CyqH4zTA4AJzxMHDXnd2R8XI02o3ociAusNVerV9po8ZABxQB8X9LRcarXwTPsH
+d8VNXxcHaDR4gbQGuHcf4QJbtQGMT4vYb0bF0fssfIB8B8OvWj0dQV7NK/KlXuwL
+EjqefK2iIt94/0+RupNAtMN2DmYwadknOiPoS41mjpparvi7Zqc/6Ekqk9257tQi
+jqTqc/WIHTF9faZrZOoYJyzZEV9muwn7PNLxgq50dZ05oMoqKX/f4tF8Pub2TmHp
+0V24TeX7Z9sogL7Lp2J31znrbAE+efBLfQUif15Zyaev6/t0dnXKHf5oZoAj6y1y
+EIJjRFPoUD2wkSVDOY47Ofp4x2oQz+ZYKlXL6enyFv1O11Sqda92xHIEmSsritg8
+sJuxhYCI4DXnM7q083aejCk2gP5gzuxneZRFvZPu3HDWLxZCBcamCSa47krdgpOC
+NrY4GJW6FbzDc4/ifX6f60eIMuZal+BNc7OUC+2D5AzwQlMYI7NFPzpQUJc3bs9G
+WRXBIlEgx/2vkoW/klHLEnABQzVh3zBgl2ZOy6v/WBWGRZU8edEunRjJ4rULE/oX
+X01XznlwiCuz/iqv2uYQ
+=UQPS
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-45.0.2421.0.ebuild b/www-client/chromium/chromium-45.0.2421.0.ebuild
new file mode 100644
index 000000000000..9dea02d1e46b
--- /dev/null
+++ b/www-client/chromium/chromium-45.0.2421.0.ebuild
@@ -0,0 +1,625 @@
+# 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-45.0.2421.0.ebuild,v 1.1 2015/06/08 20:32:00 phajdan.jr 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="cups gnome gnome-keyring hidpi kerberos neon pic +proprietary-codecs pulseaudio selinux +tcmalloc"
+RESTRICT="proprietary-codecs? ( 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? ( >=net-print/cups-1.3.11:= )
+	>=dev-libs/elfutils-0.149
+	dev-libs/expat:=
+	dev-libs/glib:=
+	>=dev-libs/jsoncpp-0.5.0-r1:=
+	>=dev-libs/libevent-1.4.13:=
+	dev-libs/libxml2:=[icu]
+	dev-libs/libxslt:=
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.14.3:=
+	dev-libs/re2:=
+	gnome? ( >=gnome-base/gconf-2.24.0:= )
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/flac:=
+	media-libs/fontconfig:=
+	media-libs/freetype:=
+	media-libs/harfbuzz:=[icu(+)]
+	media-libs/libexif:=
+	>=media-libs/libjpeg-turbo-1.2.0-r1:=
+	media-libs/libpng:0=
+	>=media-libs/libwebp-0.4.0:=
+	media-libs/speex:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	>=sys-libs/libcap-2.22:=
+	sys-libs/zlib:=[minizip]
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:=
+	x11-libs/gtk+:2=
+	x11-libs/libdrm
+	x11-libs/libX11:=
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXext:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXinerama:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libXtst:=
+	x11-libs/pango:=
+	kerberos? ( virtual/krb5 )"
+DEPEND="${RDEPEND}
+	!arm? (
+		dev-lang/yasm
+	)
+	dev-lang/perl
+	dev-perl/JSON
+	>=dev-util/gperf-3.0.3
+	dev-util/ninja
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig"
+
+# For nvidia-drivers blocker, see bug #413637 .
+RDEPEND+="
+	!=www-client/chromium-9999
+	!<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-apps/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 and bug #471810 .
+	CHECKREQS_MEMORY="3G"
+	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
+}
+
+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_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/boringssl' \
+		'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/dist/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/icu' \
+		'third_party/jstemplate' \
+		'third_party/khronos' \
+		'third_party/leveldatabase' \
+		'third_party/libXNVCtrl' \
+		'third_party/libaddressinput' \
+		'third_party/libjingle' \
+		'third_party/libphonenumber' \
+		'third_party/libsecret' \
+		'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/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/trace-viewer/third_party/tvcm/third_party/rcssmin' \
+		'third_party/trace-viewer/third_party/tvcm/third_party/rjsmin' \
+		'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/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_icu (needs http://bugs.icu-project.org/trac/ticket/11358)
+	# TODO: use_system_libsrtp (bug #459932).
+	# TODO: use_system_libusb (http://crbug.com/266149).
+	# TODO: use_system_libvpx (http://crbug.com/494939).
+	# 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_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"
+
+	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,
+	# 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
+
+		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
+		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx2
+		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
+
+	# 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
+}