Dev channel bump.

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

6 files changed, 778 insertions, 15 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 359ac463bef3..530f6df3e0e1 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1107 2014/07/19 08:56:48 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1108 2014/07/21 16:22:08 phajdan.jr Exp $
+
+*chromium-38.0.2096.0 (21 Jul 2014)
+
+  21 Jul 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +chromium-38.0.2096.0.ebuild, +files/chromium-libaddressinput-r0.patch,
+  +files/chromium-nacl-r0.patch, +files/chromium-pnacl-r0.patch:
+  Dev channel bump.
 
   19 Jul 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   chromium-37.0.2062.20.ebuild:
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 12bffb1804ea..f4d25e1171bd 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -20,6 +20,9 @@ AUX chromium-gnome-keyring-r0.patch 881 SHA256 60bc75e6308d7348d1749e491a04918cc
 AUX chromium-gpsd-r0.patch 592 SHA256 9af056bd99e5176af6f5d8acb7d54241731b64fb3fa517fe1a698b35e21692d1 SHA512 72a668dbd5b343a34a1938c2a6f1147d14a149b9a4a981487e9ca8fa6d912791a6c11e29178c3abe1e691c0e1bf6e435a390eb89aa63bda72d592ab3b0a55b1c WHIRLPOOL 7f04535d674498e2f2d572b6feb5ee4a183ffcf9671f308947e5c4a7370399bc8388d53705f7ca23dd6038bb12c81af0fe0b8b1f3cb7d90465b255e4d3c8b7d9
 AUX chromium-launcher-r2.sh 940 SHA256 842e121bbfa33513ca964744f0ba8401401946e672cd6a0a95bc80a28212e87e SHA512 64ec5e0a4f524bd6164fe33a022419d6cf54822754b172e85ea003c47f9bfe6ed996353af707a4e16369a68d2f2e7d51f186397a48da42f13eb3dccb7e4ae4f8 WHIRLPOOL 4a2284957bb462ded600f14b1aaa7e29389181cda149b9090cb7b6fe8303dc5692519da6281769925b2122578ba2ea0ef8a1563077a62d7cdf7ca243c165805a
 AUX chromium-launcher-r3.sh 1199 SHA256 9bceb14a6c171754b77bcc7e6095285fcb58a9ca10e2e4a9c9e13dc561fc0c01 SHA512 f1909314ae74985c85740d26c9bfab694f3202de8ccc392a1c4ec5c8760db21b6cc46146c78a9abebd09e6d24f37e19466f0c4d2d61815400b48d859f8ce154d WHIRLPOOL faa7eb72a4a5902299925ab4c13308299fccfbdf34a417ce89fa800cfcd6ebf0a3a456db1e8625e205be445d4ad2718db6cf6d581b266bb9227fb03506a67220
+AUX chromium-libaddressinput-r0.patch 360 SHA256 50d1c34d42c514a6ac76749944433140160c15fb5cbf099ff1139098c940bf87 SHA512 b7ce54909add9dc01ae4a306f41e549ac5177cf76aa89fdd627f5ebf0325472d1011e579183cfaf76c1de5c6a4776ff0fb11ea1b36ed81536a4d5e80e6e2d752 WHIRLPOOL f89ecdd0994bf6597448ff7c16203cdd97aba79c0634c3cd4084d791080fa94dba43087a9c7bff77d0ff0b001bae7d70140980e9b60e0815c6c194c57bc87fa8
+AUX chromium-nacl-r0.patch 5445 SHA256 cf3637b9cef53a1b44a6dce755c5e65aa1db9828f35a7cdeaa8fc83812e18aa8 SHA512 b619dc604a5140da03cf8c99896da01d40d10e8bc34a427c8b15ed9f3de89a4f2332fd73305cc91c6e4ae63ce5be97ba20bbf03ca8d340759d240342e94c635c WHIRLPOOL a36a2acbc18a67708babb245786b0cd3b0d392699a0d16e733317389fcec79ca5c77b40c5cb18404e66380e45d8f5f24d5b6b404adcb12be689b63405fed7faa
+AUX chromium-pnacl-r0.patch 673 SHA256 91c419c2485c2fa91ac555720356f93ff65370e0be6ff313b9a9b61d0520695d SHA512 ed1799a44fb6635412f941ecbc69a38300a6d559239103285a44fe685bbd266912bd810c4f2aa264c1e724a2e68924a635d769d0937deaa9af4ac1dbc61c1bee WHIRLPOOL 2674b6b936e2b1fdf6e65c2e50cc322c0c18f526169314e8fce7d928899660413df324a34850603786a57cda1415003fb0dcb52039b271dbd4b86c6e9e69bf14
 AUX chromium-system-harfbuzz-r0.patch 481 SHA256 186e8ded29d0fd2386081edb01292dbaedc4b53d48d4daaad19fbee6c2fbd4f1 SHA512 ac3ee8c0a5bc2df2ca1167c773a130aff750ee8f0e3b290da6f373f806a519d8416eae08d6240bf2bb710e77c7edc969ccc8db047e071e64df844841ed46a039 WHIRLPOOL af14fda92aec0de3a2b6415451c5698206deaf9215b6d1b4a5dd032fb24fbdd445d6f1de8038698866756f22eff0e7a275f5dce8bf1f6526646562a027f03a20
 AUX chromium-system-icu-r0.patch 828 SHA256 9bf164094ff33565f79807ab17cbd1d3f75655383fdaa01bb1a702263174cf09 SHA512 a68b302f414ad533fe8356d5de0d1fee140402677a3f3ef35a9e5d58a23594a5de2f837ee8ea723d5459fd5eee863f848222d5d4eba84886bb330e198d77ab2b WHIRLPOOL 32b8a15b1eff3e67b27c414a08d2a9df28f0d1c711af7c24abf195dedf3451bd45b596f7001f80b317bd5f08bafd4c48a17ba47c66b2fbcfabc692382745019b
 AUX chromium-system-jinja-r0.patch 644 SHA256 024b597104d6aa480f964b5c003f0d0287f97c777dd67f45d9131bb481870cf5 SHA512 7fe9374c185df16b0cbc877dbd9e2e763e515af6e1774ee3e4b577f33d6df1b90d9a5f23cf4751bb33eefd86a150963fa1b4d5c3f8bfcc277dc682ba93b209ab WHIRLPOOL badc3db0ed47360531bfebbb04b5dd0440c219ba6926ecd22220df9352fd47d096659b0b10a37a51e94f24d2a37dd355980db48e3d79aadd2e322a1338788218
@@ -38,26 +41,28 @@ DIST chromium-36.0.1985.125-testdata.tar.xz 111516748 SHA256 566530e718daee0ce0e
 DIST chromium-36.0.1985.125.tar.xz 205462088 SHA256 1782d0a5397e94313dee9e456de38bdfccf575c4e565f064a6ed7f9c509d5023 SHA512 a2c0f9b9fc91526ee053f0eca1aa2c6267b316717b8cb30bd5c50cad8891c28e1bf804838b2af035df46771d29d6815610066437d32afc504fbe39d2c48f303c WHIRLPOOL 3ee0ba43b0a3f93b4b7bededbe8443f1f9673a1c0712b7db09411ac96fe05327c835475ccb7298800b40c32dcac56573c0cf035f092ae52cf353b075c81fb16b
 DIST chromium-37.0.2062.0-lite.tar.xz 214080700 SHA256 5bfde430fd108a03afaf8bb2a013c998822d84fcbc8d2f5c259286a42fcbddb7 SHA512 712694291d2e80f4a8afd119b53ca990cb383e4a697396e1ab56b2d44bc271bef895ff5db7bf8ec88913ffa827bbe965c34445149f94ede0e798ba06a9e64637 WHIRLPOOL 69dc7826da84f554510b14a973feab06d7457e7ba40fee68c5ee25fa14552c1856da4bc0f4fac552a8ec537db407454b8aed5d0316ca38a782856fce158ccd15
 DIST chromium-37.0.2062.20-lite.tar.xz 214292380 SHA256 34abcf79964da0aa82d02edc0002743d6c7f2d4d8f2443c422864c1c27d8df9b SHA512 06fbdd0800e054c38973033b66a2bd51012ded2c3ca1f5608765717770dad76228fcf02e5e0d7534f6d119f0b75906eb20e3a31afb9729d2299c5b044870c8bc WHIRLPOOL 9b9e789ff6d8764a4e316d56d353855fd0f1fde7a97a9492b415be59e5f287227228c0f3fdfb53ba9106087b0e08cac43d2236b339c8616caad72ad0ce3ad758
+DIST chromium-38.0.2096.0-lite.tar.xz 216747852 SHA256 f623f2988db893ff83b49f86c2fe9f911e00a4c55792464c93ce8b61b286729a SHA512 f98a1132cb6ea3857630462844f83ad3b952a2d1dbc228d8bb5b1fcf888ec45f909a8bac174c316b2d4e533fa715cb98eba238cab5ad04b61da93c03cf78d3b4 WHIRLPOOL 67c5490a474b2288df01eb5cfeb0b70853721685500357b2a31da1bfbb6668884b61cb8ba6b5107fac8bd0457133091d26a2adf57d6fc776b84a072ad2a309d0
 EBUILD chromium-36.0.1985.125.ebuild 20024 SHA256 d059a8f1c1d4c8a8838d272a2a10bb60eea0a05056e4a073df100529d5714183 SHA512 593b0ca1ed6c1fbdc15b9b0c426f54df337e7031d75bf468b3a3997840309c53c0c59178ad02e0d69de3c9f4a2db19319fafd745141a94f3c8f99ab1feed3722 WHIRLPOOL 52166987d30626c9dbf68ed78c5ca35cbe8d423e2d2f80a5d5bada34f8f0793a6ddd0330be5d4a84235162358e33db045e3b1edfdc5b0de6373dac40bab8189f
 EBUILD chromium-37.0.2062.0.ebuild 17258 SHA256 ae0a289b58fa860c022b651cbf2fb09f51847de4e66242953fb8c8636019f30b SHA512 4b92164a2b135328c99352ddc45631bc9fe692c419bd839fe7691f63034e9de0dcd9620652c28d155c59ef9ecea31005d922bbd23f1e29ac0c0a5fc9cac4e0a4 WHIRLPOOL 5395cac22edf1759194aeafcded8b95b000c66ed33d8af34dab49b205eb59c426e8145b3638f3ffd24dfab57265f5dcff76714361083f8e1fe7e333641b7e369
 EBUILD chromium-37.0.2062.20.ebuild 17561 SHA256 595941df4f846ef692b4e31c45ecb3600b2d09ac16b6a44acc821106106b543c SHA512 6f365e2ee2d46621a57de37672d790cd38ac597c4484e3b606fde319d8a3985e9f6c00396736e368ccb9eb275c9b370c5234cdd744eed70246938e4caf75cbb1 WHIRLPOOL 59497b5351194e6dac17765ec072d4115b3fb37a8d834cbd29ed5f366d77238fa1a56439d1c73031e37fb2c37ea326e498ace48afcd761b0083a47f2edd8a082
-MISC ChangeLog 110748 SHA256 d8e8786d83a772ee9161cf596e3fb170fe1ecc18ee9eee026cac5571cae0362c SHA512 6cd2eee3a1b1abfed56d4894e3ea43fa8c152513a997b7289044339a1a69f9f47b79e302abb7ecb1fffd3d7129889835d8f29e2af1a818b19e834fcc176d0228 WHIRLPOOL bd9786eebca0d61062e6e72b204c453d7e5d00ff0bdb10406629da29d1159de047150929b86b817c5509b9370e0bd41daefa6598e595ee92b3c64ed63ca81c60
+EBUILD chromium-38.0.2096.0.ebuild 17659 SHA256 2bf9e600e74bfc5fb01886de80129594920b17abf064cf0cfc6440d80bda7557 SHA512 84868814a14de1e0869a26a3d67d526fdf9b6fd1a908d06dfa261f063a362571a7fc18abb5b20c30eb45624b499e8db689f4dd4d8ed6af605d393ef02f52a6a4 WHIRLPOOL 1c9877d810f97b7b33d73d1fca6e1234f791e3bc41fbf06b9af77f34e1a7a3f39d863eccebdb1a6731a4953132c134db3287c3ea06b37fb6ad912bfd10850e2a
+MISC ChangeLog 111000 SHA256 426bd85b97a796b0d9615fb655f2201e65feea274b4e6e3b8faae6b4ee97e359 SHA512 798488714be6dfdd6632d1547e845cc0773fc3aa770a95e9b2b3a709794cb0f20d5868679238251f087284e1c940e9f3d8f0059af68f1e17f10527941ef8a55f WHIRLPOOL 8f0740d6e6ddaa76dfa5f6b685704e7d1d141bb33b4ea9c67128d675e82c9296673301a184009992e48dd37edbc8bde985c02983b907dfe73c043a23d1f54a82
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
 MISC metadata.xml 518 SHA256 821944f32fcf203b2573c164aeaa52fbc69e5f651d366cdda66901633461f5ef SHA512 01d29c4ce93a8a624fc8926e7e72e8bf124b91ae6fdbf6e7179e9d6ddd6db33d73acde62541777118da1c9d197c83d6c615c247d785e76a8ab560f915abd08d5 WHIRLPOOL f9b21a0d032d1f78b6aeb78f759b9f126b1b1cc118a5edd3a08eefcb2d7b51ff406abb95323fe05b4c04468aca68dddd3d39ce7edfb9b352abc1bc3890d7e1ab
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTyh62AAoJEE8aJVXqcZkdPaoQAMhygy1nzQXv/VVSF0IyvBAS
-tqwp53UU/6Nu6+wF0/jQY/bvuh/SRFjhyOVb3xgDNytMc18Qb6dpi5vi81qvjuIO
-K3pEd1SwpB2KtrzbYD1dH+YWEVwWN6Wovkp7kDwpyjFMRm+IExpmYM0AofiXndX1
-pHq8bxmZRheC+zzqyKqxnKmekCp+KjmflI5Gj4AHFf32FbeWPevXqw2LxLKIScSM
-0pxl6YhsObSCXWtGeJZ9vAFqUG8uAVJlr+0ppPeMdCOlwIvZ3L9/c/yQ0/ZqhDJj
-6SdTd0Yhq8ZtRxbGP7o3TI8V6TzsN3cNzaWbqNbD/hrzMCG8BRP0zLbzUwBQGi/y
-NZB34Y5p5S6MyxI0wkDbBbSWOnYKZVC7AAoqMAKEc9GEbCuqPwROVQhxF37rNx/7
-S7rg3+46WLAdCCQwbEgSG6g9WBv3HWVy1Z+gw6G/xwf4y5TfGKdQ+FfTNCrEtZ4g
-+QFOx6g3s1MC2u7UAsU7JAGYvVS1fg4wLNxSwBPSBJm9JSUpG9NuH+pcVq4MYqLp
-iEKoklOD+2mvpAZYLPfdRr/IUUm2KkvN/sXnFkgs6c1qIDaPaca4cFLhlI39z5op
-Ul6Q2kciRGuHWit0FNEeua+X+iPu1mDwCpfDVPwgehSMf6t6u3zl86qtIFTlQiVk
-PhN3cn7m997k+IBkJ4LD
-=Tiho
+iQIcBAEBCAAGBQJTzT5LAAoJEE8aJVXqcZkd1X0QAJabYU6ued6QeGeTPEszg3Lb
+wyyd849z0LtM8ZR60u7qfI7qX6r8VHiUV2CRacM29r9Bu7mT9qztmGMY95TC32FF
+Vg1TnjWUAUEcyd9I6fUTanSQYncWCmO2JB1k1QEJ7w9EDsDCpsrlcJZDksNabLzj
+qDVZIV0ePjsYyWWdPCSrZb2bU9/YNB2Hss8pqB0BpEql2Y9fI102ZRvVSX5u6uJ6
+m+YJ1U56z3g7BUQD1Wj1hC/l2kH/OlY8/4WZjHrYtcKu/PbaUzKwaoNnvifY04/F
+o9Kb8MXatogf/fc7JQkhIgWfP/vZW59yDELI81AovtYkRwDbtgZG6sPD1RhEutty
+lfIHwQKPcGlMTn8k8JYr1ukUc5lCBY+4xz6qSho8m4JNv22yLGeOk9Hxt07IASZO
+iZihjWEIY7UhqgAIy3tRlI9+huBvBweXZnLOwVNh+T9ZoihDT8oMeo9Wt9inFQke
+rr0FuuRB2hpvNo/kS2jhMeb/TD8ZBfWPWrte96f3lWy8O/AGiIjMNj6zSb+Jks/7
+71VaO3ejclxFztVbvQ9bN0dqPpyG0uh1NwdDKnUZF8O+gsC/WLaVnWjH9Mh9eRBs
+CD9XefQbSboQElvrm71IDA6Hz7tbKlsUSjSTRGI9bfq/JHrVeDnGWnld9aynSFY9
+aKh9eBbQDfE1rq5TR/kI
+=6Mny
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-38.0.2096.0.ebuild b/www-client/chromium/chromium-38.0.2096.0.ebuild
new file mode 100644
index 000000000000..5af7bc9a31e8
--- /dev/null
+++ b/www-client/chromium/chromium-38.0.2096.0.ebuild
@@ -0,0 +1,590 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-38.0.2096.0.ebuild,v 1.1 2014/07/21 16:22:08 phajdan.jr Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh_CN zh_TW"
+
+inherit chromium eutils flag-o-matic multilib multiprocessing pax-utils \
+	portability python-any-r1 readme.gentoo toolchain-funcs versionator virtualx
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}-lite.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="bindist cups gnome gnome-keyring kerberos neon pic pulseaudio selinux +tcmalloc"
+
+# 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:= )
+	>=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 )
+	selinux? ( sec-policy/selinux-chromium )"
+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/ttf-fonts
+	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/simplejson[${PYTHON_USEDEP}]
+')"
+python_check_deps() {
+	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_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}-libaddressinput-r0.patch"
+	epatch "${FILESDIR}/${PN}-nacl-r0.patch"
+	epatch "${FILESDIR}/${PN}-pnacl-r0.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/angle' \
+		'third_party/brotli' \
+		'third_party/cacheinvalidation' \
+		'third_party/cld' \
+		'third_party/cros_system_api' \
+		'third_party/dom_distiller_js' \
+		'third_party/ffmpeg' \
+		'third_party/fips181' \
+		'third_party/flot' \
+		'third_party/hunspell' \
+		'third_party/iccjpeg' \
+		'third_party/icu/icu.isolate' \
+		'third_party/jinja2' \
+		'third_party/jstemplate' \
+		'third_party/khronos' \
+		'third_party/leveldatabase' \
+		'third_party/libaddressinput' \
+		'third_party/libjingle' \
+		'third_party/libphonenumber' \
+		'third_party/libsrtp' \
+		'third_party/libusb' \
+		'third_party/libvpx' \
+		'third_party/libwebm' \
+		'third_party/libxml/chromium' \
+		'third_party/libXNVCtrl' \
+		'third_party/libyuv' \
+		'third_party/lss' \
+		'third_party/lzma_sdk' \
+		'third_party/markupsafe' \
+		'third_party/mesa' \
+		'third_party/modp_b64' \
+		'third_party/mt19937ar' \
+		'third_party/npapi' \
+		'third_party/opus' \
+		'third_party/ots' \
+		'third_party/pdfium' \
+		'third_party/polymer' \
+		'third_party/ply' \
+		'third_party/protobuf' \
+		'third_party/pywebsocket' \
+		'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/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/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 #503084).
+	# 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 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
+		-Dlinux_use_bundled_binutils=0
+		-Dlinux_use_bundled_gold=0
+		-Dlinux_use_gold_flags=0"
+
+	# Always support proprietary codecs.
+	myconf+=" -Dproprietary_codecs=1"
+
+	# Set python version and libdir so that python_arch.sh can find libpython.
+	# Bug 492864.
+	myconf+="
+		-Dpython_ver=${EPYTHON#python}
+		-Dsystem_libdir=$(get_libdir)"
+
+	if ! use bindist; then
+		# Enable H.264 support in bundled ffmpeg.
+		myconf+=" -Dffmpeg_branding=Chrome"
+	fi
+
+	# 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} -- ${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/*.pak || die
+
+	doins -r out/Release/locales || die
+	doins -r out/Release/resources || die
+
+	newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
+	newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
+
+	doexe out/Release/libffmpegsumo.so || die
+	doexe out/Release/libpdf.so || die
+
+	# Install icons and desktop entry.
+	local branding size
+	for size in 16 22 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser${CHROMIUM_SUFFIX}.png
+	done
+
+	local mime_types="text/html;text/xml;application/xhtml+xml;"
+	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
+	mime_types+="x-scheme-handler/ftp;" # bug #412185
+	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
+	make_desktop_entry \
+		chromium-browser${CHROMIUM_SUFFIX} \
+		"Chromium${CHROMIUM_SUFFIX}" \
+		chromium-browser${CHROMIUM_SUFFIX} \
+		"Network;WebBrowser" \
+		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
+	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
+
+	# Install GNOME default application entry (bug #303100).
+	if use gnome; then
+		dodir /usr/share/gnome-control-center/default-apps || die
+		insinto /usr/share/gnome-control-center/default-apps
+		newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
+		if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
+			sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
+				"${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
+		fi
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+	readme.gentoo_print_elog
+}
diff --git a/www-client/chromium/files/chromium-libaddressinput-r0.patch b/www-client/chromium/files/chromium-libaddressinput-r0.patch
new file mode 100644
index 000000000000..7e9342b51c42
--- /dev/null
+++ b/www-client/chromium/files/chromium-libaddressinput-r0.patch
@@ -0,0 +1,10 @@
+--- third_party/libaddressinput/libaddressinput.gyp.orig	2014-07-21 09:32:45.801591233 +0000
++++ third_party/libaddressinput/libaddressinput.gyp	2014-07-21 09:34:41.779946012 +0000
+@@ -86,6 +86,7 @@
+         ],
+       },
+       'dependencies': [
++        '../../base/base.gyp:base',
+         '../re2/re2.gyp:re2',
+         'libaddressinput_strings',
+       ],
diff --git a/www-client/chromium/files/chromium-nacl-r0.patch b/www-client/chromium/files/chromium-nacl-r0.patch
new file mode 100644
index 000000000000..69a8e47d09a7
--- /dev/null
+++ b/www-client/chromium/files/chromium-nacl-r0.patch
@@ -0,0 +1,136 @@
+[NaCl] Build fix for disable_nacl=1 desktop chrome build.
+
+https://codereview.chromium.org/398273002
+
+Index: chrome/browser/extensions/plugin_manager.cc
+diff --git a/chrome/browser/extensions/plugin_manager.cc b/chrome/browser/extensions/plugin_manager.cc
+index b018c6d1e0cbe296e8ac93592b1f3b63f6c7e213..86bbe93ca3550ddcf984ed3515a370d6be9a6b50 100644
+--- a/chrome/browser/extensions/plugin_manager.cc
++++ b/chrome/browser/extensions/plugin_manager.cc
+@@ -21,7 +21,9 @@
+ 
+ using content::PluginService;
+ 
++#if !defined(DISABLE_NACL)
+ static const char kNaClPluginMimeType[] = "application/x-nacl";
++#endif
+ 
+ namespace extensions {
+ 
+@@ -67,6 +69,7 @@ void PluginManager::OnExtensionLoaded(content::BrowserContext* browser_context,
+     }
+   }
+ 
++#if !defined(DISABLE_NACL)
+   const NaClModuleInfo::List* nacl_modules =
+       NaClModuleInfo::GetNaClModules(extension);
+   if (nacl_modules) {
+@@ -78,6 +81,7 @@ void PluginManager::OnExtensionLoaded(content::BrowserContext* browser_context,
+     }
+     UpdatePluginListWithNaClModules();
+   }
++#endif
+ 
+   const MimeTypesHandler* handler = MimeTypesHandler::GetHandler(extension);
+   if (handler && !handler->handler_url().empty()) {
+@@ -122,6 +126,7 @@ void PluginManager::OnExtensionUnloaded(
+     }
+   }
+ 
++#if !defined(DISABLE_NACL)
+   const NaClModuleInfo::List* nacl_modules =
+       NaClModuleInfo::GetNaClModules(extension);
+   if (nacl_modules) {
+@@ -133,6 +138,7 @@ void PluginManager::OnExtensionUnloaded(
+     }
+     UpdatePluginListWithNaClModules();
+   }
++#endif
+ 
+   const MimeTypesHandler* handler = MimeTypesHandler::GetHandler(extension);
+   if (handler && !handler->handler_url().empty()) {
+@@ -148,6 +154,8 @@ void PluginManager::OnExtensionUnloaded(
+     PluginService::GetInstance()->PurgePluginListCache(profile_, false);
+ }
+ 
++#if !defined(DISABLE_NACL)
++
+ void PluginManager::RegisterNaClModule(const NaClModuleInfo& info) {
+   DCHECK(FindNaClModule(info.url) == nacl_module_list_.end());
+   nacl_module_list_.push_front(info);
+@@ -216,4 +224,6 @@ NaClModuleInfo::List::iterator PluginManager::FindNaClModule(const GURL& url) {
+   return nacl_module_list_.end();
+ }
+ 
++#endif  // !defined(DISABLE_NACL)
++
+ }  // namespace extensions
+Index: chrome/browser/extensions/plugin_manager.h
+diff --git a/chrome/browser/extensions/plugin_manager.h b/chrome/browser/extensions/plugin_manager.h
+index 56eb9f7eb51cd05ae156d79caac76d294a4cfc43..79854ab437c15e28c34aafa7d900cf517288ab93 100644
+--- a/chrome/browser/extensions/plugin_manager.h
++++ b/chrome/browser/extensions/plugin_manager.h
+@@ -35,6 +35,8 @@ class PluginManager : public BrowserContextKeyedAPI,
+  private:
+   friend class BrowserContextKeyedAPIFactory<PluginManager>;
+ 
++#if !defined(DISABLE_NACL)
++
+   // We implement some Pepper plug-ins using NaCl to take advantage of NaCl's
+   // strong sandbox. Typically, these NaCl modules are stored in extensions
+   // and registered here. Not all NaCl modules need to register for a MIME
+@@ -50,6 +52,8 @@ class PluginManager : public BrowserContextKeyedAPI,
+ 
+   extensions::NaClModuleInfo::List::iterator FindNaClModule(const GURL& url);
+ 
++#endif  // !defined(DISABLE_NACL)
++
+   // ExtensionRegistryObserver implementation.
+   virtual void OnExtensionLoaded(content::BrowserContext* browser_context,
+                                  const Extension* extension) OVERRIDE;
+Index: chrome/browser/ui/startup/bad_flags_prompt.cc
+diff --git a/chrome/browser/ui/startup/bad_flags_prompt.cc b/chrome/browser/ui/startup/bad_flags_prompt.cc
+index 4ce4ea19465e9070bea7a64f913919bcdc0dc57b..e3161d71d1d4f8a9dfe37f3499f2b7ed56081f3f 100644
+--- a/chrome/browser/ui/startup/bad_flags_prompt.cc
++++ b/chrome/browser/ui/startup/bad_flags_prompt.cc
+@@ -43,7 +43,9 @@ void ShowBadFlagsPrompt(Browser* browser) {
+     switches::kDisableSeccompFilterSandbox,
+     switches::kDisableSetuidSandbox,
+     switches::kDisableWebSecurity,
++#if !defined(DISABLE_NACL)
+     switches::kNaClDangerousNoSandboxNonSfi,
++#endif
+     switches::kNoSandbox,
+     switches::kSingleProcess,
+ 
+Index: chrome/common/extensions/chrome_manifest_handlers.cc
+diff --git a/chrome/common/extensions/chrome_manifest_handlers.cc b/chrome/common/extensions/chrome_manifest_handlers.cc
+index b08d004790fdfa14cc2b5495ffb54a74fa9ff86d..c05117d7c04a4aae2066501e820fa75b09555566 100644
+--- a/chrome/common/extensions/chrome_manifest_handlers.cc
++++ b/chrome/common/extensions/chrome_manifest_handlers.cc
+@@ -61,7 +61,9 @@ void RegisterChromeManifestHandlers() {
+ #endif
+   (new MimeTypesHandlerParser)->Register();
+   (new MinimumChromeVersionChecker)->Register();
++#if !defined(DISABLE_NACL)
+   (new NaClModulesHandler)->Register();
++#endif
+   (new OAuth2ManifestHandler)->Register();
+   (new OmniboxHandler)->Register();
+   (new OptionsPageHandler)->Register();
+Index: chrome/test/ppapi/ppapi_test.cc
+diff --git a/chrome/test/ppapi/ppapi_test.cc b/chrome/test/ppapi/ppapi_test.cc
+index 7bd3284cd51752b57d6668b2d7f53087a3e5ba58..9a951458a71585b80c17ff6d234eda62b0de1738 100644
+--- a/chrome/test/ppapi/ppapi_test.cc
++++ b/chrome/test/ppapi/ppapi_test.cc
+@@ -426,8 +426,10 @@ void PPAPIPrivateNaClPNaClTest::SetUpCommandLine(
+ 
+ void PPAPINaClPNaClNonSfiTest::SetUpCommandLine(
+     base::CommandLine* command_line) {
++#if !defined(DISABLE_NACL)
+   PPAPINaClTest::SetUpCommandLine(command_line);
+   command_line->AppendSwitch(switches::kEnableNaClNonSfiMode);
++#endif
+ }
+ 
+ std::string PPAPINaClPNaClNonSfiTest::BuildQuery(
diff --git a/www-client/chromium/files/chromium-pnacl-r0.patch b/www-client/chromium/files/chromium-pnacl-r0.patch
new file mode 100644
index 000000000000..6618aa2ae5ed
--- /dev/null
+++ b/www-client/chromium/files/chromium-pnacl-r0.patch
@@ -0,0 +1,15 @@
+--- chrome/browser/component_updater/pnacl/pnacl_component_installer.cc.orig	2014-07-21 10:19:23.550094151 +0000
++++ chrome/browser/component_updater/pnacl/pnacl_component_installer.cc	2014-07-21 10:20:23.419299929 +0000
+@@ -372,8 +372,12 @@
+ void PnaclComponentInstaller::RegisterPnaclComponent(
+     ComponentUpdateService* cus,
+     const CommandLine& command_line) {
++#if defined(DISABLE_NACL)
++  updates_disabled_ = true;
++#else
+   // Register PNaCl by default (can be disabled).
+   updates_disabled_ = command_line.HasSwitch(switches::kDisablePnaclInstall);
++#endif
+   cus_ = cus;
+   BrowserThread::PostTask(BrowserThread::FILE,
+                           FROM_HERE,