Stable channel bump.

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

3 files changed, 584 insertions, 5 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 76a3361537bb..be6cbdfe060e 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.982 2013/11/15 14:39:43 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.983 2013/11/16 03:45:05 floppym Exp $
+
+*chromium-31.0.1650.57 (16 Nov 2013)
+
+  16 Nov 2013; Mike Gilbert <floppym@gentoo.org> +chromium-31.0.1650.57.ebuild:
+  Stable channel bump.
 
 *chromium-32.0.1700.14 (15 Nov 2013)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 9b3ff8d04ad2..4bf32d8bdc60 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -18,6 +18,8 @@ AUX chromium.default 148 SHA256 bdac1d32025d53158f96c8ad5bd71a58abdcf02f3a8759a4
 AUX dot-gclient 174 SHA256 0ae6d69323d1d286de7ef1fa62c330536ada7280bda7564fefb5d071384ed324 SHA512 ea858464ee8732536633259ed3d11990822e8b8493c07b83218856a127320ba21b9cfc184f7e7a899739bc5f938fbca25224e559fb7db8558cb86fccc743a685 WHIRLPOOL 72a5a9af7955e653151090b555c6a67a261ff807871fdda16d7c3fabf4b52449ac9caae466ba51a17d2efed74a68adc32687599ea4287cc033e75f787d874b55
 DIST chromium-31.0.1650.48-testdata.tar.xz 111207036 SHA256 bc6e8ed9581d0edd5120c642e3cb32dc4103a9bffee180941da81ac48130f67f SHA512 6ebaacd295e27b626cdaeeb492cf65c39578e25e8c203106325c1faaf95d663ce50040802670f2820318b943c9f902bacb03d35d6aecd14cf32823a6fb91e4a4 WHIRLPOOL 9c4da1702dfa33f09c378eec1b3a19ccbeea53fc1a87b8109a932d60921c89d28a9ef86412cee75daa9a64e0dfa8975e9051799f801c1ee1c7e62902f7eb700e
 DIST chromium-31.0.1650.48.tar.xz 174509488 SHA256 3e478b5b85a023b3bba55b23d71cd6f585a08f865f7a98297a9a0757e9695c5d SHA512 7da87466ed4e86566d6c2c2cc51e3dd96c8a9cd6849f603a8b308cefef2e9e44e66a17ede53ab88890454cfae2073f87d806a13962e941b099edad334634f5c6 WHIRLPOOL 69d39719e372c164fb76a172501253781781252e48c1c5631e9c22b7a2e5a8ee6890b8f1cf30d7634086f3c9f61547e46a8f3cc7fdba554ae99c010d2ca05870
+DIST chromium-31.0.1650.57-testdata.tar.xz 111346684 SHA256 4fd95a51ed167ab4a14372aa51f14322848f62b1a5b99e2e08b75fb647d44434 SHA512 f4273710118fafaf0ebb07675d20b680330b352f4dc042b2acccc0c29560e62d18e38bc8610d006f6913e1632fdfb2a615688abd40718ebbbc28aa5c9429e5a3 WHIRLPOOL 24fc5d783a1c7bf0b91ebcc2887cd1f9ff22545b1aeaabd749d64676bfa1c6f73c7cb8b807bc2965d99c50d99840ce2f4cf6fd7ff1035fa47607dacb090ca86e
+DIST chromium-31.0.1650.57.tar.xz 174126516 SHA256 0b82fdd8041d82fdf481ff5ed4668149d9f26618855955c386507e2ae1950923 SHA512 854a2696ee360e5b6416ca51fde0e39c9e6d25a0cd7090bb9c56f1065ae75121f50a07a1ea6f999ba7952334a07294628cd536810699e4717987b10fb86b23b0 WHIRLPOOL 0fb885dad548172e5ae6e7456984a1ebeca9f355e68ec73921e2e12ae5273cd8c2bf36ca7f986f72eed4d78339d0dfdaa88f1c453f5fe6bb7526f3c497577030
 DIST chromium-32.0.1700.14-testdata.tar.xz 112140768 SHA256 e36056a1d2bda2447aacf18c4abc7001b871ad20b3f46b75ed9494a51b5f042b SHA512 e205469cac2211677bedaaaf4b69c856001425372034fc7f8cd40bb04a6c94a2bc5790ef7dabfaf9e21796bce0085b15e56643052d8401064be4827d4b7f28a3 WHIRLPOOL 66c2bab7e924e9c4787cbc2387c18d3de3ca5cc4a693f76b5c68f0edaa45cc70803e1301597e68024dd6f72afe3d9284a92dc523c50748b333360f4c8ef38061
 DIST chromium-32.0.1700.14.tar.xz 177159364 SHA256 26a88b0df0160bf99988ef04bb7b357777a352469d97043960958a357f065d74 SHA512 a5e39b12138000b984a71239956178a52288ece10ff2d3db2cb08295a2bdcd635fbb20bcbd56a490130b7a0c1ae4da520f15d038a7a042a68db359e5c922ccd9 WHIRLPOOL 4f98346a2763a2591e6dd90b6ed378438e0e79d43be34c6ec465a6dc7a6b3bbd6786a2eeb206a70e4f50e70120be557d53522ba8696635809b5d01959bf2e187
 DIST chromium-32.0.1700.6-testdata.tar.xz 112081404 SHA256 edce045b0d46a1ec480d5d42cc03ae8f2a3634e549f671b4a248b1c8d93f9263 SHA512 5f111cc4b5ecdf32912212a399e235be486127b3f3ceb118011c88a76bf757b1a091080784cb6ce761d1a22f94dff1a4ad1f800dfca2b88bbe277b56d01bc7c3 WHIRLPOOL 8fb98a46eccb30b525071c17627b29a6169c12df1d3fa0a53bfa6ab73857bfdd4b354ee328eed9955f0635e192df9373b1404969dfb2839981b0587269f25e88
@@ -25,16 +27,17 @@ DIST chromium-32.0.1700.6.tar.xz 176963440 SHA256 cbd1bfc5bc1bc3f3f8d57828097bd7
 DIST chromium-33.0.1707.0-lite.tar.xz 154007504 SHA256 3dafd652ddc1c49f5d0594fe72502e8d5772b6065e53b100f2b2d126313f17f0 SHA512 b0b4e793e0752946543a09313d43f008ea43527f96d7527f8beaf2073227fcee2758ecc32d476017cf752aaabe8e653d7ebdb55a3ecd4458793e2d6c312ee3f4 WHIRLPOOL f1c647a07039e0a5bdf2b886348298ebbadaf7900c8bde2543677af0ffc617f3ff99cd10a98aa2fddba990bcfbaab372b70c16ef06f83bea3a153f1079291518
 DIST chromium-33.0.1707.0-testdata.tar.xz 112156276 SHA256 f36782ffd0c56dcc00f316b8267471e40afa72a37be1fa306a7ee20f5b9b4485 SHA512 dffe4cd94a32de09774abfdb3d46da401446416f0846a3498043951ffb7cc7f7279b11be67d2f300c109f3f7337a5c61f2558b4639e9a19b78a54bd375629e83 WHIRLPOOL d6d404a91c7a5118a8f61fe29c9677655cb411b27df38a8b7d450160161adfc39fffb1ff0755b8d3347147d3e30016f9bad8a2857b908d4d176bb1e3e1bdedb1
 EBUILD chromium-31.0.1650.48.ebuild 17190 SHA256 c55f914c79ca64879e11ed9aa7375f9b8363aea1727d7774d3cd04d923be434d SHA512 c3526996c3a60a219faffc98cafbc3176a008c870f8d9a75f65ac674b46641dd25c31d47798dc6ac38db1d371e8b1e1cfac2ec0c44895f1907d86ed65729ed57 WHIRLPOOL 2b7f8a29ff5f07505fc787b8a5c8a27082d0c63b89b3f09e8a8ec2b8dce2fe9a8c43e8f54aa723cfafc337103446f6263e4baf7962ea2dcdc98f1da1ba70286d
+EBUILD chromium-31.0.1650.57.ebuild 17196 SHA256 835f4dced7bb6b9e27a9f51f4cb6c48d14831e10185c48d93f8877cd82c0b440 SHA512 5d1bb7dfcef0e02102c317eecf924151fb8f1c73f4eb5378ec09b1a70c8af57be4db7389974f30480b65c9db9766788198a929a4d601c92120ce41683cddde68 WHIRLPOOL 966dbd5097f16702c8380b45b97dca3f4d1d35937cd892d6251658837854e57d0df4fea586bc6f9a1bd8feb9b5a52c8fece2ece8db1a006e80a657865148104f
 EBUILD chromium-32.0.1700.14.ebuild 17889 SHA256 669b930ccdfc59c65798b08beae7552c581060c375230c2d9fbfb5cb3d2aa8b7 SHA512 d0361266f4a348a5f085cdf9fde4b4caf7b5272c2e7919e3f1b320c546ebc193a26331c5801ab6403bb77dca52593a81171840d49e7f4de7dc690f43952515fd WHIRLPOOL 2c7d9cfb6caccf92ba987ed5f50ec4c2b59f7b32328ba46e48fe6d24785aa4344ecfe695696e02e502dc59eba1659c557547ee35f0f618941ecf97bfff6aecd6
 EBUILD chromium-32.0.1700.6.ebuild 17891 SHA256 85d0063e184f892121e29c9b146b4f68b388e465c662297a8415e30e0cc8ab35 SHA512 05f41f85fe667d8419d4b87488947d918beb5c86254f676c95c935d7966e54c31135ad4266f1cd3b11c3d64805f0e75b9dc1d1615998097b5d4f306897cfcddd WHIRLPOOL dc6d482246775534b6f4018b9ba511e97c1c789256d8bd3f26711f0049b0fd44996736c356f657817ccc677c6a21703ae8f3aad41f0e130a0329c8b244a2a209
 EBUILD chromium-33.0.1707.0.ebuild 17924 SHA256 abce81fd8363b4e810b7612dd1df9595b2698c0413ce6492cd1f7c88764330ad SHA512 b257915e9228eb363ba52ca4aa9fef1219e8afb5ead1cc64cccc984233cd927b1b7ac387c43933cd107ca65407a9f9b0584a9b25307a001e47e018cb029870b6 WHIRLPOOL 6418157b631387d7a10e757ad4160927b78f5affa49be82522ef9388c47226309957915f737e1db63241d4f53c839f55435989baf77e03aafe2ceb11f973801b
-MISC ChangeLog 89174 SHA256 39123e79ea91b7dbf768729621b106ed09351365660760fa9b53bf08ab9d71a2 SHA512 ab67c43543be12aff634d56d84e4d4cf88ea03bb45750baf38041db01d1fa5c5077555116210525ea2a68207ef260226aaaf60e646f1ad65014dd438ba6c3c11 WHIRLPOOL 6e6b09db974242988584bb2fe781fc60b161aa779bafc35117585510080b702d101146cb781617db7ea4c5712209e8123d08bbd02399dfffa6ad45be07ffc755
+MISC ChangeLog 89316 SHA256 7d99bc57790438b399548ce328a984b14d46146545a6689441a60308925f4d7e SHA512 56b676250445caf385c375ea6bd7309eae855f733a4f432b4054aa4c70edc2d3a769946465b2c098be27215db573540c68f7c973b98f7b16c7216aceb23512d0 WHIRLPOOL 882adea8a592a8a18b9df8f7c0bdf67cc822379a9e1208bf5a67f8433bec1b9972367a561ad818f97afb8533eed3ef69e6d51ae7349d54d20c2083f2115ee3a4
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
 MISC metadata.xml 622 SHA256 0cc15c6cfce29d9372d650e883075630c844e262bb354a64c96d7e51580d25c9 SHA512 957d3b569ce2259d250681d91edf31d7dcea412d84c79017413866691d3b6fe27076f7d0d7c14f41421254438064d15c90d84940a3c6aa9c307c4db4277eadd1 WHIRLPOOL d621daeca803c0aa06b7abff6207a16cb9122c7ae6f7b02b57be88dd551ef4410fd20d592ea8ee7062bbef54ce09079dacd51e514febdebb16da24d8fb55f823
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlKGMjAACgkQC77qH+pIQ6QhYQEAvw0ZWmrn+asXjwbDa3EtjNpO
-mbhet84Xry2s/vzd+WgBAMWE0JTCBvtKXbDdwxgm5upWUIYfdznxPVMKKqI2fMBP
-=9S2j
+iF4EAREIAAYFAlKG6kMACgkQC77qH+pIQ6S2OAD9HIiHFMCp041Vdl09KqMVIAfR
+BfJLynoM0WEExYwB4yAA/2Hywi1BI1UJGWHdpmFp4K+qobVmVt3d1zlVU0mJ3yzy
+=hF87
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-31.0.1650.57.ebuild b/www-client/chromium/chromium-31.0.1650.57.ebuild
new file mode 100644
index 000000000000..a1d4ec2d74e1
--- /dev/null
+++ b/www-client/chromium/chromium-31.0.1650.57.ebuild
@@ -0,0 +1,571 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-31.0.1650.57.ebuild,v 1.1 2013/11/16 03:45:05 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 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="bindist cups gnome gnome-keyring gps kerberos neon pulseaudio selinux system-sqlite 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:=
+	system-sqlite? ( dev-db/sqlite:3 )
+	cups? (
+		dev-libs/libgcrypt:=
+		>=net-print/cups-1.3.11:=
+	)
+	>=dev-libs/elfutils-0.149
+	dev-libs/expat:=
+	>=dev-libs/icu-49.1.1-r1:=
+	>=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/protobuf:=
+	dev-libs/re2:=
+	gnome? ( >=gnome-base/gconf-2.24.0:= )
+	gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2:= )
+	gps? ( >=sci-geosciences/gpsd-3.7:=[shm] )
+	>=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/opus:=
+	media-libs/speex:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	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}
+	${PYTHON_DEPS}
+	!arm? (
+		dev-lang/yasm
+	)
+	dev-lang/perl
+	dev-perl/JSON
+	>=dev-python/jinja-2.7
+	dev-python/ply
+	dev-python/simplejson
+	>=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
+		dev-python/pyftpdlib
+	)"
+RDEPEND+="
+	!=www-client/chromium-9999
+	x11-misc/xdg-utils
+	virtual/ttf-fonts"
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+pkg_setup() {
+	if [[ "${SLOT}" == "0" ]]; then
+		CHROMIUM_SUFFIX=""
+	else
+		CHROMIUM_SUFFIX="-${SLOT}"
+	fi
+	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
+
+	# Make sure the build system will use the right python, bug #344367.
+	python-any-r1_pkg_setup
+
+	chromium_suid_sandbox_check_kernel_config
+
+	if use bindist; then
+		elog "bindist enabled: H.264 video support will be disabled."
+	else
+		elog "bindist disabled: Resulting binaries may not be legal to re-distribute."
+	fi
+}
+
+src_prepare() {
+	# if ! use arm; then
+	#	mkdir -p out/Release/gen/sdk/toolchain || die
+	#	# Do not preserve SELinux context, bug #460892 .
+	#	cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
+	#		out/Release/gen/sdk/toolchain/linux_x86_newlib || die
+	#	touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
+	# fi
+
+	epatch "${FILESDIR}/${PN}-chromedriver-r0.patch"
+	epatch "${FILESDIR}/${PN}-gpsd-r0.patch"
+	epatch "${FILESDIR}/${PN}-system-icu-r0.patch"
+	epatch "${FILESDIR}/${PN}-system-jinja-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_dx11' \
+		'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/jstemplate' \
+		'third_party/khronos' \
+		'third_party/leveldatabase' \
+		'third_party/libjingle' \
+		'third_party/libphonenumber' \
+		'third_party/libsrtp' \
+		'third_party/libusb' \
+		'third_party/libvpx' \
+		'third_party/libwebp' \
+		'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/ots' \
+		'third_party/pywebsocket' \
+		'third_party/qcms' \
+		'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"
+
+	# Optional tcmalloc. Note it causes problems with e.g. NVIDIA
+	# drivers, bug #413637.
+	myconf+=" $(gyp_use tcmalloc linux_use_tcmalloc)"
+
+	# 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_libusb (http://crbug.com/266149).
+	# TODO: use_system_libvpx (bug #487926).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+	# TODO: use_system_libwebp (http://crbug.com/288019).
+	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_libxml=1
+		-Duse_system_libxslt=1
+		-Duse_system_minizip=1
+		-Duse_system_nspr=1
+		-Duse_system_openssl=1
+		-Duse_system_opus=1
+		-Duse_system_protobuf=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 cups)
+		$(gyp_use gnome use_gconf)
+		$(gyp_use gnome-keyring use_gnome_keyring)
+		$(gyp_use gnome-keyring linux_link_gnome_keyring)
+		$(gyp_use gps linux_use_libgps)
+		$(gyp_use gps linux_link_libgps)
+		$(gyp_use kerberos)
+		$(gyp_use pulseaudio)"
+
+	if use system-sqlite; then
+		elog "Enabling system sqlite. WebSQL - http://www.w3.org/TR/webdatabase/"
+		elog "will not work. Please report sites broken by this"
+		elog "to https://bugs.gentoo.org"
+		myconf+="
+			-Duse_system_sqlite=1
+			-Denable_sql_database=0"
+	fi
+
+	# 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"
+
+	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
+		myconf+=" -Dtarget_arch=x64"
+	elif [[ $myarch = x86 ]] ; then
+		myconf+=" -Dtarget_arch=ia32"
+	elif [[ $myarch = arm ]] ; then
+		# 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+=" -Dtarget_arch=arm
+			-Dsysroot=
+			$(gyp_use neon arm_neon)
+			-Ddisable_nacl=1"
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	if host-is-pax; then
+		# Prevent the build from failing (bug #301880, bug #487144). The performance
+		# difference is very small.
+		myconf+=" -Dv8_use_snapshot=0"
+	fi
+
+	# 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}
+
+	build/linux/unbundle/replace_gyp_files.py ${myconf} || die
+	egyp_chromium ${myconf} || die
+}
+
+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
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	ninja -C out/Release -v -j $(makeopts_jobs) ${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}" "--gtest_filter=-$*"
+		einfo "$@"
+		"$@"
+		local st=$?
+		(( st )) && eerror "${cmd} failed"
+		(( exitstatus |= st ))
+	}
+
+	runtest out/Release/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.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
+
+	# 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
+
+	# 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
+}