Stable channel bump.

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

3 files changed, 665 insertions, 5 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 9cd2682dc68d..b111d0954b32 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,11 @@
 # 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.1061 2014/04/24 13:09:54 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1062 2014/04/25 01:04:03 floppym Exp $
+
+*chromium-34.0.1847.132 (25 Apr 2014)
+
+  25 Apr 2014; Mike Gilbert <floppym@gentoo.org> +chromium-34.0.1847.132.ebuild:
+  Stable channel bump.
 
 *chromium-35.0.1916.69 (24 Apr 2014)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 521926647da0..61855c2eb405 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -31,6 +31,8 @@ AUX chromium.default 148 SHA256 bdac1d32025d53158f96c8ad5bd71a58abdcf02f3a8759a4
 AUX dot-gclient 174 SHA256 0ae6d69323d1d286de7ef1fa62c330536ada7280bda7564fefb5d071384ed324 SHA512 ea858464ee8732536633259ed3d11990822e8b8493c07b83218856a127320ba21b9cfc184f7e7a899739bc5f938fbca25224e559fb7db8558cb86fccc743a685 WHIRLPOOL 72a5a9af7955e653151090b555c6a67a261ff807871fdda16d7c3fabf4b52449ac9caae466ba51a17d2efed74a68adc32687599ea4287cc033e75f787d874b55
 DIST chromium-34.0.1847.116-testdata.tar.xz 108468560 SHA256 a5a021f336a8db4d9d2dbca4519c9da89af4caad3431da1c9410e309630365db SHA512 ad2b3f06ff80ba41d916f1e82f4d3be56752496de1b3cead4e0b84f875243ebc82f33f5a5848ba6f4c5a892f392271261d00af4008ffe3bbd62435cbba0f93e6 WHIRLPOOL 95246efee2648fbcbe563ed0c2bdaded35d66e3ef164331f2ded4f6c821216055111e719b4d980cc336e38e065194c54e03880fb1b1dde6224ccc158be7115ff
 DIST chromium-34.0.1847.116.tar.xz 190250900 SHA256 dd6579c170eecd8d1f366461575e9754e44200e0b9fefde20941e15cb6729711 SHA512 8f88d6da1a13318c6b0b8d310018232dbadcb1bf369cff422f5f4e497566e873e1061c47cafd4f7b4555bb5f70d994ae6af9a58264bedfd341ebb9481dff920c WHIRLPOOL 48923f844e44f926c39240ba8424910acea760f8df6f3375b226f651c7d6ffcd676302359613d2a58e875dbfcdebdf798a149694e7f076443b9f25703bca20b1
+DIST chromium-34.0.1847.132-testdata.tar.xz 108476892 SHA256 0c3c9894cd1a16bfcfc122d40d38bf1c6986087e17d22d86de9d3624c404eb32 SHA512 db8ca16ded7cde02cb257fc30bc0badd0aed30439f656c868bcdbef15cdc651d1ac623418ee0544ed73b8f55784011e0b159edd16e84fa904323cbde9dfed4da WHIRLPOOL 5eee1d121f02f49ddde826114c3edc5aeebd00cfaad35d58cb05507d32a3524b32d06722d47a7d40343b1aee1e7a6599c9b737029dbc4c39e563d9176f5bed45
+DIST chromium-34.0.1847.132.tar.xz 190164176 SHA256 e8930a43d2cff3cd98d4772f6b7a527b363fa9567afbe86a4c0574dc25886038 SHA512 49d51545548f51dfd917d3980c11b99d45ec68622f282a13346b5658674316ed6da96ca6903ed9e7b9fa7f1c90eac7a3d4766bf36cb8da52e03605771cb9c368 WHIRLPOOL da0c0da7b4e171fac31d3a9854e54b4fb845091696b9303b24d2fc614d1e8c61d39aba17cc32f9ba3364d8e41aabf4985ad73c17764fc3a155b78a4a526fff69
 DIST chromium-35.0.1916.47-testdata.tar.xz 109107096 SHA256 2bcdbbcede804266a46a53844c289c7c901893d8ef966cdb9c0a080406c6666f SHA512 f493992497810902dce8fb273b8a9222e6dd2b37b9bbdfa5529475e48b893b5d2b70bdff71aa5adbc5c9bf4365d685ac73a1ecc551647fbab24dc2702ddfb6f4 WHIRLPOOL 3ea99f80111539b30860c23a66f48d325adb5dcbc0223eb91cc1d5c27cad97e5a5e158ebd37ef8f9ac0333e26547df958e109defc444217d121b6c9a6dafa69c
 DIST chromium-35.0.1916.47.tar.xz 206217416 SHA256 90154389a49bd5acb025849d1a7fd66b16992f3d690be0f4bb4459b7bc3a085f SHA512 89b4a6c9218f3d3174b544eadf670647627c9c1d551185e662061fec0dcd00fa608ff10a7ec5891d6ad8a6c648febeabbe3ebbb641c50aea741d594d01bf83d5 WHIRLPOOL f64b78fe26c9d558cd416662ea32740aa7a38f45d05bfbcd64f56b31a857fbd85e6cc1fb24fed4c34ed0fc9aa1a4e72154323ec488fab6dc9c9e4516d5c89410
 DIST chromium-35.0.1916.69-testdata.tar.xz 109110744 SHA256 0be9d3d686ac819dfaa93cfd6ad4f94b0e41aeafcc1fca24570e6b50b9767b59 SHA512 a1c868b628571fb7902157057384d8a195bcf83491e3d77f984eb85671869a8989e64ecf818c4501bc1010d95d6420de09d807d23e71165c629cdcbe8ec12b76 WHIRLPOOL 7905131b8b195947e23bfb6684705af9712d495c3ad9f4626bd85247b5ca32a49590275000698f509831117dfc2be93864df0e6ff041edef4af5149ef197435e
@@ -38,16 +40,17 @@ DIST chromium-35.0.1916.69.tar.xz 206229124 SHA256 a45a1fce3359fff09f7e35e64eea9
 DIST chromium-36.0.1941.0-testdata.tar.xz 109180096 SHA256 4007f36ee0442cee4757ee192a4faf4058e79728332af9cb14ed995f7974d4e4 SHA512 c1ec3a0f774f8918ce6b4ae75e2eafe461322876b67566761ac28251b99fe248ba0fc9d46e6b169843bb0aef91800ee6897bb144fd3a2d83a69383ad0a814b0a WHIRLPOOL 4f757e0939db5ce43b1d231fc438d8c18777872721fce724db815fa33f1a2b5a050f95115a01d641f112fcd9059645e1f5376e1868301d1fef65167aa24d26fd
 DIST chromium-36.0.1941.0.tar.xz 204959420 SHA256 fa3a7d5d9fe2a946139d023403584a6fa94f7f57028633c6428c470a11f6308b SHA512 15e5f8866be2963bf647f75fd25222d0e1bcb0980ad997210990cf5b02beaffc8b471994d2bb6a38f983e788e16ab60582522c55dd813ceccaae62981da754d6 WHIRLPOOL 0fd4f12956911239f87f4b3ca924987b36b018d45d5c8e3405a2738ea078243a352108e62b9364e7dc236621a1969ea6a0678d3535038f2a41d172e3b397aefa
 EBUILD chromium-34.0.1847.116.ebuild 19628 SHA256 b75129f9047c79d86488703116dd05c782e9bd9157ab4b2e2fa214829d3b2a29 SHA512 3b1f2a857f433d2db5df52640b8137ef13fd362dcfc5a0bf005de0fee3924f2c10566f30479e5985d9bf85448a991323e865d8f8bb55228147c01a80da36be39 WHIRLPOOL d1fe1af969ff4292875a331f8d0abd4a2645bf1fa11ff9863c18c2f9968a8c8481667ab295a731dc1162cc738fecea3a1fed6f214f23e4298915fa666f7a0544
+EBUILD chromium-34.0.1847.132.ebuild 19634 SHA256 a336b0144b80d37ef32a531b83a0f1ae5fda1bf82622b1d35b354cf3a1d24003 SHA512 0ae1ae5a0d76eb4004cb499607991d2d83618c6c60f414ff93f476b5dbf9074fd55bda403f87efcc1625472a31b40fd6289ca35bc9d1a0c706b8f2db5f75e993 WHIRLPOOL 7344015bc462fd3d6fea8ae24cd9c7ab0b5623d98860fa32f35eda7efb6a21828bd344bc18e8e375dc1ccc629d4658431ddd4da70a293b26d8f7be1adef56796
 EBUILD chromium-35.0.1916.47.ebuild 19893 SHA256 f045d7c171b7dae76595d09924d468665e1a05803f7a357333e8f64bff6c12a4 SHA512 3468751ee83e05f85c27fca904bd7612b22bbdf1b4a4660d77f12663c6718cb504f975605697092901073f4982ad763c4100386a1fb68b633ed80c55a2529a75 WHIRLPOOL 471a6f9ee2e0b4c0b3dc9830da4b5df869d1ebd9c8359c350485149336e38c716ce611882c98ec6a926e2c1157c267aa39a3daa52d111d5174620bdc690e2eb7
 EBUILD chromium-35.0.1916.69.ebuild 19893 SHA256 85e22df48b565492b19fc43d836785fee01142f13a847711465c710b31302ad4 SHA512 17d996316ccec7176cdaa80d668f7633296e15f5db4dd8a8c42232e7da0515405a7bf69ebf4752b088e20c04272d7e8e08820973a1fa984ffaa96084810f758e WHIRLPOOL f22e70ef3d17ce220d6205f8d88f01c817a41d4c878b5f77fe3ea4e344b9309987a9ca91ae1e05dfb9e4dfbd6395adb7f33c7b51e21f97cb2dd29bada1cea402
 EBUILD chromium-36.0.1941.0.ebuild 19912 SHA256 3d7ef672f6eda3a58810dd8bf97f2e61ca9cf67b41cae3a6ffc0ff2a84a86968 SHA512 6b2438e90d6fc56d1f4cc18bd3a134105184741eaf049951366e9ffa856bcdc7cfdf1f3bc4a33c552d64000ef0db8dfd7dce6143588da204365e93707e90ffa1 WHIRLPOOL faaecde67bd834675b8fe15894d3fc24e0d3b95a2de109a00ced8ce03c5ddf771b730ca2e92a7b2b2b2232ff6c3d76ff3db8142da8b2eceb814cad01e497305b
-MISC ChangeLog 103375 SHA256 aa414c621a2754364db83374719a7df5595b0188c92ddfe1fd7296ec8eb862d4 SHA512 724eaa85fcce8524e8afaee03e210390556feeb87d034a2b5133e15ca775e70cd1ca5f70a8438fa828069adad28b4fe8b1b2361a1f51c9e1ce673bf13da19bfb WHIRLPOOL 7c6a52b0d679a32011b0b242db39252a9c031a477d2a767a1158c90f33b3924339fb2a6e728074df7a9f93faed828d67f76644a7ea6c48dc94a5861df58f472e
+MISC ChangeLog 103519 SHA256 44a1a8403426b0dee35a47c18b0e911b8b95343c9578683ab228e46322181444 SHA512 99245402b3b4271c4d60b441cec58a7d65ee84f3dced1bbfe16654b3234880b1dd680848d24238d40566b62070ef8a66aea9023e2c34401e1b89be0b5d94c882 WHIRLPOOL ee06abb03a8ec87c5723ef3200f877a4752a45699cbdda8c50f1ff094a896f4d293ca5898e22f7ee86e490c910d6c79d0d5ed516ddb8ca416c2dc4a2ac1a1647
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
 MISC metadata.xml 599 SHA256 445f23a3d80f257019d11074a593608bc3f3abd22b6985b89f533d94f7799008 SHA512 606d4ead8b6e9c4852110a5b5efe5a5d6219d2e9d546ad114f01d496f4966df0238b8c1fdec93916715887a08e7737c138b6c0a22267256616edded58914c951 WHIRLPOOL d6273eb9bdc89b4a08a572a27708128985094bd684323c2c17587e80364bc446762b325d31977bed1bdbaec31e5dc6d22c29b5bc49c9943e99e837bf529bbea5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlNZDSUACgkQC77qH+pIQ6Th+QD+Ks33zk62Z/Wjwvrerku7nomw
-9UDPZ6dHTrqthG5Ffp4BAMZr0VDn0YcrdW+XYAN4kHs8AsjB4/Qc0UukUUE/0qHG
-=dVUY
+iF4EAREIAAYFAlNZtIQACgkQC77qH+pIQ6TojwD+MbL0OvRq7wZIq/kX4MAEzqe9
+N7WbIcJ5R3d8Eaw+iPAA/jDp/ZnzYsCARM0myDK3osavOmGxVCXULRHIKJ3hb2iD
+=V/Z4
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-34.0.1847.132.ebuild b/www-client/chromium/chromium-34.0.1847.132.ebuild
new file mode 100644
index 000000000000..f9219ebf67c4
--- /dev/null
+++ b/www-client/chromium/chromium-34.0.1847.132.ebuild
@@ -0,0 +1,652 @@
+# 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-34.0.1847.132.ebuild,v 1.1 2014/04/25 01:04:03 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
+	test? ( https://commondatastorage.googleapis.com/chromium-browser-official/${P}-testdata.tar.xz )"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="aura bindist cups gnome gnome-keyring kerberos neon 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/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/gnome-keyring-2.28.2:= )
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/flac:=
+	media-libs/harfbuzz:=[icu(+)]
+	>=media-libs/libjpeg-turbo-1.2.0-r1:=
+	media-libs/libpng:0=
+	>=media-libs/libvpx-1.3.0:=
+	>=media-libs/libwebp-0.4.0:=
+	media-libs/opus:=
+	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/gtk+:2=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXinerama:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libXtst:=
+	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
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig
+	test? (
+		dev-libs/openssl:0
+	)"
+# For nvidia-drivers blocker, see bug #413637 .
+RDEPEND+="
+	!=www-client/chromium-9999
+	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/jinja-2.7[${PYTHON_USEDEP}]
+	dev-python/ply[${PYTHON_USEDEP}]
+	dev-python/simplejson[${PYTHON_USEDEP}]
+	test? ( dev-python/pyftpdlib[${PYTHON_USEDEP}] )
+')"
+python_check_deps() {
+	has_version ">=dev-python/jinja-2.7[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/ply[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/simplejson[${PYTHON_USEDEP}]" && \
+		{ ! use test || has_version "dev-python/pyftpdlib[${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}-system-jinja-r4.patch"
+	epatch "${FILESDIR}/${PN}-gn-r1.patch"
+	epatch "${FILESDIR}/${PN}-depot-tools-r0.patch"
+	epatch "${FILESDIR}/${PN}-cups-r0.patch"
+	epatch "${FILESDIR}/${PN}-arm-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/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' \
+		'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/ffmpeg' \
+		'third_party/flot' \
+		'third_party/hunspell' \
+		'third_party/iccjpeg' \
+		'third_party/icu' \
+		'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/libwebm' \
+		'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/nss.isolate' \
+		'third_party/ots' \
+		'third_party/polymer' \
+		'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/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 (resolve startup crash).
+	# TODO: use_system_libsrtp (bug #459932).
+	# TODO: use_system_libusb (http://crbug.com/266149).
+	# 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_libvpx=1
+		-Duse_system_libwebp=1
+		-Duse_system_libxml=1
+		-Duse_system_libxslt=1
+		-Duse_system_minizip=1
+		-Duse_system_nspr=1
+		-Duse_system_openssl=1
+		-Duse_system_opus=1
+		-Duse_system_re2=1
+		-Duse_system_snappy=1
+		-Duse_system_speex=1
+		-Duse_system_xdg_utils=1
+		-Duse_system_zlib=1"
+
+	# 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 aura)
+		$(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 linux_use_tcmalloc)"
+
+	# 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.
+	myconf+="
+		-Dlinux_use_gold_binary=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="
+
+	# 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
+
+	# 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.sh linux ${ffmpeg_target_arch} "${PWD}" config-only || die
+	chromium/scripts/copy_config.sh || die
+	popd > /dev/null || 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() {
+	# TODO: add media_unittests after fixing compile (bug #462546).
+	local test_targets=""
+	for x in base cacheinvalidation content crypto \
+		gpu net printing sql; do
+		test_targets+=" ${x}_unittests"
+	done
+
+	local ninja_targets="chrome chrome_sandbox chromedriver"
+	if use test; then
+		ninja_targets+=" $test_targets"
+	fi
+
+	# Build mksnapshot and pax-mark it.
+	eninja -C out/Release mksnapshot.${target_arch} || die
+	pax-mark m out/Release/mksnapshot.${target_arch}
+
+	# 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
+	if use test; then
+		for x in $test_targets; do
+			pax-mark m out/Release/${x}
+		done
+	fi
+}
+
+src_test() {
+	# For more info see bug #350349.
+	local LC_ALL="en_US.utf8"
+
+	if ! locale -a | grep -q "${LC_ALL}"; then
+		eerror "${PN} requires ${LC_ALL} locale for tests"
+		eerror "Please read the following guides for more information:"
+		eerror "  http://www.gentoo.org/doc/en/guide-localization.xml"
+		eerror "  http://www.gentoo.org/doc/en/utf-8.xml"
+		die "locale ${LC_ALL} is not supported"
+	fi
+
+	# If we have the right locale, export it to the environment
+	export LC_ALL
+
+	# For more info see bug #370957.
+	if [[ $UID -eq 0 ]]; then
+		die "Tests must be run as non-root. Please use FEATURES=userpriv."
+	fi
+
+	# virtualmake dies on failure, so we run our tests in a function
+	VIRTUALX_COMMAND="chromium_test" virtualmake
+}
+
+chromium_test() {
+	# Keep track of the cumulative exit status for all tests
+	local exitstatus=0
+
+	runtest() {
+		local cmd=$1
+		shift
+		local IFS=:
+		set -- "${cmd}" --test-launcher-bot-mode "--gtest_filter=-$*"
+		einfo "$@"
+		"$@"
+		local st=$?
+		(( st )) && eerror "${cmd} failed"
+		(( exitstatus |= st ))
+	}
+
+	local excluded_base_unittests=(
+		"OutOfMemoryDeathTest.ViaSharedLibraries" # bug #497512
+	)
+	runtest out/Release/base_unittests "${excluded_base_unittests[@]}"
+	runtest out/Release/cacheinvalidation_unittests
+
+	local excluded_content_unittests=(
+		"RendererDateTimePickerTest.*" # bug #465452
+	)
+	runtest out/Release/content_unittests "${excluded_content_unittests[@]}"
+
+	runtest out/Release/crypto_unittests
+	runtest out/Release/gpu_unittests
+
+	# TODO: add media_unittests after fixing compile (bug #462546).
+	# runtest out/Release/media_unittests
+
+	local excluded_net_unittests=(
+		"NetUtilTest.IDNToUnicode*" # bug 361885
+		"NetUtilTest.FormatUrl*" # see above
+		"SpdyFramerTests/SpdyFramerTest.CreatePushPromiseCompressed/2" # bug #478168
+		"HostResolverImplTest.BypassCache" # bug #498304
+		"HostResolverImplTest.FlushCacheOnIPAddressChange" # bug #481812
+		"HostResolverImplTest.ResolveFromCache" # see above
+		"ProxyResolverV8TracingTest.*" # see above
+		"SSLClientSocketTest.ConnectMismatched" # see above
+		"UDPSocketTest.*" # see above
+		"*EndToEndTest*" # see above
+	)
+	runtest out/Release/net_unittests "${excluded_net_unittests[@]}"
+
+	runtest out/Release/printing_unittests
+	runtest out/Release/sql_unittests
+
+	return ${exitstatus}
+}
+
+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/icudtl.dat || 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
+}