Stable channel bump.

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

3 files changed, 590 insertions, 5 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index defad9539116..786760623572 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.996 2013/12/04 04:49:31 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.997 2013/12/05 06:17:10 floppym Exp $
+
+*chromium-31.0.1650.63 (05 Dec 2013)
+
+  05 Dec 2013; Mike Gilbert <floppym@gentoo.org> +chromium-31.0.1650.63.ebuild:
+  Stable channel bump.
 
 *chromium-32.0.1700.39 (04 Dec 2013)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 6f42f5ad8cee..2fd8d5eeedbd 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -19,6 +19,8 @@ AUX chromium.default 148 SHA256 bdac1d32025d53158f96c8ad5bd71a58abdcf02f3a8759a4
 AUX dot-gclient 174 SHA256 0ae6d69323d1d286de7ef1fa62c330536ada7280bda7564fefb5d071384ed324 SHA512 ea858464ee8732536633259ed3d11990822e8b8493c07b83218856a127320ba21b9cfc184f7e7a899739bc5f938fbca25224e559fb7db8558cb86fccc743a685 WHIRLPOOL 72a5a9af7955e653151090b555c6a67a261ff807871fdda16d7c3fabf4b52449ac9caae466ba51a17d2efed74a68adc32687599ea4287cc033e75f787d874b55
 DIST chromium-31.0.1650.57-testdata.tar.xz 111204896 SHA256 d929bc500d121784e99e2a902378aad620e533f6c36ad6307b6213fb4ce82a36 SHA512 954448e8e6837672ff730721a2c05966e50d61e651415569f977c04b8904c6c74fb0243148a20bb5669f985d1cb8f6dd7cacd65587702142b7fa3ce74fff56bf WHIRLPOOL eceb74da3e98d6c34ff4f126a35d64e85c5ee9e851352d68da02a0f68cf8c02d2490107f4033aee3e5b44ead35173209c0f0fdd1226cc0b8bb5e656aa043cfe5
 DIST chromium-31.0.1650.57.tar.xz 174517316 SHA256 89fe1ea38754c3d39bbd068313336a4467e7111854d8e14cc51bc2435c7667f7 SHA512 0f6fa6c72122bfd9dce0344c434151ae0ee24428bea56da209a761f59edf1fc33760211857ee138030a8693d4849872a8f826a1b8e13970fa482797896cd1d54 WHIRLPOOL 623ab00eb8010b9edfc866f4510b8990f57c32e1f64f8e6a7558c99717812980c2ceba2c532b81aab9bd5fc4bb94c326d192c694b0befe694ae60679f5134c3a
+DIST chromium-31.0.1650.63-testdata.tar.xz 111203540 SHA256 b554f18f1ec334bf88170683bf08722f101c4cc5d7358a44019d8645cea135ac SHA512 15038c41275266ca1f6686c01ecb41b6fb7e55630913dc1afbb4fcabef29b4fc714e033bda8ed93361171548d207a1febf71996dac7bbf2b39aca572ec5df92d WHIRLPOOL 448ba6e75c0e24473fb91028d2b41108b37eee2dd57db07b3432255a57919fefc4f2f79fd55e55eea546514e80dd5c37f3a7c7652b32dbeba28f4d4536f8795b
+DIST chromium-31.0.1650.63.tar.xz 174527852 SHA256 7f0a37391b2829fa077426127f61b830cca51518e6a55ace2bf397aba9e52008 SHA512 33ac578b0faef0bf8b083315ce26fc099cb21dd80e0d37d1716459a580d3ef1792708e4deaa36109ea463fcb1bcd16de3afe668f9a040d34385542807aa41978 WHIRLPOOL 3aba011c72a9c9b6fe147a827a48356977a5c8c86d8206156a7ceba31a75dfa4e685aa3b0488f2e2210d9f3f57ecd5cc0adc46d5b00344d10229dc7b5e693b89
 DIST chromium-32.0.1700.19-testdata.tar.xz 112139100 SHA256 459b16cc254ac4206b93750a44a1dda7fc8e5c72bcf69293f372b53b641b37c1 SHA512 bed3cda8be8408ea85ce84afff8cd4a86b4fd6ccb16e8e912ef2e17f9f6465e3045071c58bad570d04b70c7c0bb8beba235c07c3b53a8e3059998fd770cf3886 WHIRLPOOL 4028b4f6b0ec8052db5ba50434d2c96959085c0dc68dac23f025b51699ede14fc15f791bdd4a6e8a69c5ef9a04c9c90acb956558ccde558ed5f10a1e769898c3
 DIST chromium-32.0.1700.19.tar.xz 177174300 SHA256 4510e628f51aa79bbb9723359b3484f82660cfec6f1035c521cf5f60827f1334 SHA512 415ac663e0c90dc04cb87075de4d7399fa4eeae6f4f0ba81cfb13b7f4337277a75feb39ab74c719ead6b0f8ab81bee35157ea980d788d93735a9a76ab9222150 WHIRLPOOL d8c979c225d6ffaa98ebcf2f0d514b54b8054cfbb78e02c66dd8319311300ce086c50a5e48ee5ac4177f2b35b3569c7108c7c8ffa06cf4296ac15db629cb20a9
 DIST chromium-32.0.1700.39-testdata.tar.xz 112138252 SHA256 0a1e8719a2b5c1120e6207ca2928f5b8d97326e8ce59260cdff7cb332f492c9c SHA512 3cd6770251976742c83304d709e4c9edddfe9bd8b9d9d288895471a3081fd1578c3484de4b7834c3c2811c973eab5b2595354c24b54cc446f5cccf80ab72771b WHIRLPOOL 50426c3c624f91c5b8738bc7e58d2d9c2606bc489a69cd2bd543f45f1ebfb36056331aeaee828caf23d8e722314dbc4dce8aae52ea9000f8940adcc9a2bfc8e7
@@ -28,17 +30,18 @@ DIST chromium-33.0.1711.3-testdata.tar.xz 112144684 SHA256 0f2403405ed53669c4f9a
 DIST chromium-33.0.1726.0-lite.tar.xz 155194308 SHA256 5d177fec9e03a4ef9c6945f913c8b2aeabba2647007b4a4a628dda5041b13dba SHA512 c26d0b85f7787e8ffa22ba4f9dffe5555350205008fe11937189ae888609e238c55d4c107f7b0815db792925fa65ae9e6b7a58f84f7fa891cb052ad73291d54e WHIRLPOOL e789d083db046f3d580da41385ba020d48b84c350318f628f7f6dc305304fd2468dbb7e9aa1d72e2801370031806aed3e21a5929f7d92a1309eae0565e792272
 DIST chromium-33.0.1726.0-testdata.tar.xz 112192764 SHA256 f44d2ec4cbbac7c6e97af3097d2b1f7ccf178dce8bdbfcb8ec854165662011d8 SHA512 4ec9701a993a9f7c850945ffee4bc40f1c262737b8253a99455ae3bc3b454f5aff1364ba4726287fd40658506b4133e251a77d94091819e59cf0a8382f2ebe74 WHIRLPOOL b277b3005f48c0eeb4146452cde5a98018a37011cad5b734ea415bf290978b8c3bfaa6c1a0e16ff764d61bbd1e747dc3b797c9e92245bce74bb511be7d0d7865
 EBUILD chromium-31.0.1650.57.ebuild 17363 SHA256 320d5496086f266f862c642ffc328244cea7c22e2048b042a44c9811c1505f88 SHA512 21b92b2b94d7ed5a2faa0d2f8316374477a8f05fd1bd4e780a2f44c1d530571eb90f9f19c9d01373af72c23adfe453f8c2f23765822de3abdc13b8a75f3ae51e WHIRLPOOL 196d93fa85673b428261116c2792fc9f1d46cd793a3081df11ddfdf21d7b5d15e2795a3acf3c1782da56e05908cf993b12e70cd8e20412deff9953584f986b6e
+EBUILD chromium-31.0.1650.63.ebuild 17365 SHA256 cc50c204a5e6e6e2cebaf33a61a47c4bad1cdd7f03b9b451545bdae670d84f04 SHA512 5ce8642ebed28236cf048190cedf2d626692928f3c8f9bea52834f8d5a1dc39bfc3ca961f72c8a10dec411f925c09d9792adf0aede08b1a6aa5c74c9ccb22c15 WHIRLPOOL 59cd9a63e8305b542ee504dfab8c5672046a94a7b5793eb0b912417b60b608d3952104466bb4748394ef1d6f3a33dbfe131d677af9b72d6d7e5e19056cfdb11e
 EBUILD chromium-32.0.1700.19.ebuild 18582 SHA256 c67000dbd68138e4388869b91ca9c215a96b19c24f2f6a8a1e95f8468b692710 SHA512 8391e25976844254228c65d46c02d38a0c29d877ea9ba459bf4574fd88b609f2be1ae40f099a8943dec4fcc1678268ac7715ecdf82feb4f2c2ebade3b6e631d6 WHIRLPOOL 9a2a9e60ce67f2d22ddf1722f1dbc7bdaea8b86aac58eb92d923ee858e876594cfe66721f590abc0db9e122e537bbb33d670156885bb5ba36bcaf72b3136f309
 EBUILD chromium-32.0.1700.39.ebuild 18582 SHA256 e15330310f59737822de79d983f611cfd02573bf80a73c08380c738221ea57eb SHA512 86549bd23676c60c1dc7137b441048fedab7e9ac4b2a0f7fa31bb81e64c23167ad09a3be1a4c3f77c172207ba563fa095132b399ce3117a6929396c9e10b5002 WHIRLPOOL 78b3a2255fb74c1adec6d5a36dcc4e3406536231cf7d5450eef16355173ac478b451757a3366604a2698a30010bf7931fad850a8e09ff9990f20d9c3cd011f91
 EBUILD chromium-33.0.1711.3.ebuild 18635 SHA256 89ced062c7d6f743ff7e1599b9d682f0e6c6fa60881ebacc9bb5559d13f8d6c6 SHA512 0d5795be19634da082803e3e58e69a4516d0c3bef3e0d5e98b619c7a7ad6010fa3839abcd2317f899598804930e1eb2ca61c1df85043e0f74c4b7b42c60e8454 WHIRLPOOL 4d10541786d6ac4d3209a587f339dae04978c463583c5a9d6a36d4d9e3d3ed28e209ca4757c791f2cc1831464c3d379e94252b8f9316ebb5523564a77814a51e
 EBUILD chromium-33.0.1726.0.ebuild 18702 SHA256 0d83fe6a2ee0eac30ba2188af34bd5cbcce1b019bac475f412f0cd6a977d3b67 SHA512 b9d10f91df24e4caf232ae9b1a892fc86ccd6508e59e38f7bb094811fab0792b7669070b37af8eb2c9a17f03e5febf416fc943f49829acb334720a8e577eb5e8 WHIRLPOOL 7670f0b619025378cc31eca7f31aa0aa7ea523b767adc4a10fa5b70cb12314758c57809d2391582d65b7c1ee90b54ff2f081e80c245e94203d32376eb6cb5c4e
-MISC ChangeLog 91901 SHA256 b6365dc78137218194f4bda8460ead3ac04488d5f098ba66a273da6a34b09136 SHA512 9935b5e3467703457b4062a2bad210506b1ff31938d6bb591bfab42fca21db77a7de6f0f64c942a792906f626903cfe3d3ba812cb0c20d42deb4c37fe614cce0 WHIRLPOOL 8a771a939086483d6f7f9eb2807d031f766447e0d80cc2b97770991fe80157ac6768f72f071bf915d95d43a2df5e8332721a885ff06873cd604f37118e8cf7d8
+MISC ChangeLog 92043 SHA256 d59c1dabc21457f5de7cd03beeada9076a5e4eaa82e7f720f846fd2668f65e40 SHA512 16f6343e02fc245be5834fb43b8098d6aff3c917a039b5dcc4bc645a1866f88dd25c66509b5c42f456c7410b2c17ad96dd999bdb9ffefa2357341f31221226b2 WHIRLPOOL d9e62e6f0c3473486e46783d7010e08afc34f4db72d33fc351f7a8855ca5b9683f2c5ae702f344d345273e2bca694587c8a33156133926bc1d867aaebace3242
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
 MISC metadata.xml 786 SHA256 12e03b633076f7fdf1fb7b3a3a2c10c0a4210566511101d6df5e18d962680c6d SHA512 cc2fdf94c85a24d528d921890d1828341b173b5b2daba820b1ddcf973890ee950e2fe9e096d81106196e9ca761908141b0aac88330b68b536a8b39bf29c1c868 WHIRLPOOL 101c01d630f4460c1f23ea9e2334e9509839cc2c968af254f40489680dffd59942e21f6040fc4d127abc6cae82ece031bbbb3f08b325a8e8835f80c322c2948c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlKetF0ACgkQC77qH+pIQ6T6/gEAxadI+qP7Pz40nCsGsAIYbmJv
-LL/bl4vsV+GPXkrlRKoA/3mJyOfAWqisYYAB4cKh0mE6/AdvnxloCRshU0uuZ1r8
-=PlxB
+iF4EAREIAAYFAlKgGmwACgkQC77qH+pIQ6Qk6gEAt8zTN/A1YWKSmz9SjzZFmT07
+50AFEnxIk2wSPDbB+kcBAIYOOzHATUhja5Yx8zCjTCBJ59fuqU9ChhbLV0j8i/Zu
+=mCF2
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-31.0.1650.63.ebuild b/www-client/chromium/chromium-31.0.1650.63.ebuild
new file mode 100644
index 000000000000..200a873ca725
--- /dev/null
+++ b/www-client/chromium/chromium-31.0.1650.63.ebuild
@@ -0,0 +1,577 @@
+# 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.63.ebuild,v 1.1 2013/12/05 06:17:10 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"
+
+	# 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
+		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
+}