Beta channel bump.

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

3 files changed, 523 insertions, 2 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 052b4c716439..748456663efd 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.761 2012/11/30 11:35:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.762 2012/11/30 23:47:33 floppym Exp $
+
+*chromium-24.0.1312.27 (30 Nov 2012)
+
+  30 Nov 2012; Mike Gilbert <floppym@gentoo.org> +chromium-24.0.1312.27.ebuild:
+  Beta channel bump.
 
   30 Nov 2012;  <ago@gentoo.org> chromium-23.0.1271.95.ebuild:
   Stable for x86, wrt bug #445246
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 1b84e3f38b23..73515510fd2f 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX chromium-alignment-r0.patch 565 SHA256 c679dd4ea0ac6e8ac330372da63a5c821ec54ed704287c392195a4a60db41062 SHA512 a3c7626f8335fcb5b2fe4664916fa07bbd717b57088dafc7092fa11e9873a911162a146f3f5b8531c0ae338d794c669854d8672ee31f00ccf2313b4e663bb6e8 WHIRLPOOL 30003851a02fff863ae01a174cad95280a89fe866fc5af6e6c8cb8f66bdee3e5ad4f1def2b813a77430744b41ff8a753c23b5c1c1bae86e7c1dbe0e0ce23f8de
 AUX chromium-arm-r0.patch 554 SHA256 1031e3b6af80c85aabd752eefe26342269ba71c6e4abd0bc22519b337e6477b6 SHA512 8920b3a4a49a510132484dadcd9fa5d3c5015bc6995d35d6221ca6627cc9d40abe234e92e3bdfaa3435a31e7b5a51b568b7609ca83eecf6d0214e8da2b3cdbec WHIRLPOOL ddc52ae329b53fcc85ec68efb86fe9725b41499d970c8bb1d597c36cbe3f7d2a27a66748d3e28e7dfcf72aa65a8ab62dde5f9a53b80677aa2615619fc23ac28d
 AUX chromium-bison-2.6-r0.patch 15135 SHA256 b016abb0ff68fc7d1fe153fe7e4a4395809363bb6c310a5c921a4e30175fd854 SHA512 e16539855cd43d063a9b504b8f08a76b57b5110b3ad1f56dff164cea06b33ca7a62adb37267d37d8c5992a9258108280ffebb2121308e2546f7b5f2606822f25 WHIRLPOOL d8f80adf1b5038891479519d85076f98110a0865b9cd4cae4ed77f7d4f0a3294e76ad6f94153cea5ac39105e8251e9f69f5257c9e6dbfcb9950da7670c928492
@@ -27,13 +30,22 @@ DIST chromium-23.0.1271.91.tar.bz2 218499930 SHA256 385d1abe2800e64261cbfb6b5d91
 DIST chromium-23.0.1271.95.tar.bz2 218497107 SHA256 30097d21dfff134cbdc0ebe6bb848558d4854f725322aa26b25f83741279f13c SHA512 91071e38625a2609a559038f7b7707b1fd8c3d85cd60ea3cc730795a74224a05c454223b1ec6f32a20adb5aeb053288bef0d01f71ced6f2308fb201b1fbccd96 WHIRLPOOL 9ff81d61670eb259fcf978a47a03c40903b387bf1c7c42a75981eb91fec30fd01ab98c8e2b058b27e2d949936e5492fef8c709408594ec91f315144c6694c6d8
 DIST chromium-24.0.1312.14.tar.bz2 185991437 SHA256 68feae750cd95ce9360b816d12337bc99723bce9a92b739240f2563cc963880f SHA512 3ea17d83926ebfbe5fc8e12405997179a9b55b9a73e14043faf37f398c0ba1f7ec41890babe6e379296ccfddd8ac5faa68ccca52245da26a2a8b06fd4a11894c WHIRLPOOL dbe45dc9710b45d99fb7bd1cbcd36fc44ec47319cf58f7081009b38248614f83b4a82d08bbbd9dc79bef2606226d369aad2ac66af9a0a7a10cbee1f74dc2c480
 DIST chromium-24.0.1312.25.tar.bz2 186092682 SHA256 d98554e267feac16e6202dc255cae733b9c7a57a96b18af90e4aee7ac1b65cb4 SHA512 cf8b2d5534bee9d94a485f85afec866e945e04d257bd6a3912812c63fac1eecf6438445e87d6c5f363fcf653ac9a3dc6da5c859c2044d4eddeda939a839f45a4 WHIRLPOOL 9f823768d9416834af39e75c538fbec6ee77fc8a23b6dca90fbb71f2a7a4edb413b1df96ca0b774e7e24906e2bd4f7bb93803b0025d882bc4bfc04bd49a8f110
+DIST chromium-24.0.1312.27.tar.bz2 186141545 SHA256 417eb1d5bbe054479cb62819dce247d4775fe8f1b6bed6c9347fb819d8c07e70 SHA512 7eff1d33f922bacdf065d0237f8e1905d284ef44c0a3f2d428b43c681653d4d4d00ec6da668aa23c2417e14cd8c29577dc2020062911852e6967d228ee736763 WHIRLPOOL 83ef1ff780db3d94afff5da8354a003019793be0c0a48ec2acd3162131fdbcd3471bcbf465f00029703e7686463ccb13c2e319ea345554644e96b99569c65a8b
 DIST chromium-25.0.1323.1.tar.bz2 187987460 SHA256 daa8ac4b8d54f9d40eba8d3e9d7e59acdf42f7d6f556eb9fe0764b0b7150efc4 SHA512 78d02243b75eb5352f61fb9c0f00643ce085db4dc559548ccd15e4d43a373e23f80fe3a19c1977218e9f5ec0abf57f2e00e1fcb68cb73fe5a73aab278e7a33fa WHIRLPOOL a8af2773654224da7996ec41a395e83f5222f0a3853ab6405f51a24823290a2a12f10a24367892d8a9bf64e948684e7272369bd32cc1413fd78a3854217998dd
 EBUILD chromium-23.0.1271.91.ebuild 15470 SHA256 476c4a8f2dd34bf133ff4811c72b5d8c47288b8a7a5619ac5367abe4cbb4b3b6 SHA512 7528ace7be0f4f8a07fbb308fd266c9ca5e9f9d4d356aee3e6c42bdc05d54a3861ddd7f4b50a67621c99cc25999cd938a59cb5f074882f583cf211e3686c40ed WHIRLPOOL 7f44f3b9ef97658d5daab8daff5442be81e1fb18179ea642beffbcbb34999957a45d27e14d23afeb887ba7114e47d45f472fac6db35b317c00cebb3c9ff2d046
 EBUILD chromium-23.0.1271.95.ebuild 15470 SHA256 609c292268c80bb2c5641c46f954b28666561b3942f5ff797f6f2a816c379bf0 SHA512 e13eb4c293c3f15b45b1da1797005521ef86011e04fbb255668dc59fc82897459fa116d5cd31d47fd52b9101bb05d94dfd6c67e4ea6046ab8cce3b61552cb1c3 WHIRLPOOL eb2a1f8bf45e73f58e3fc6f2f20e8123de76b95d0cd6bbbf5bfe672b3887b34d09ffd163a4318b771f5bd0752f9eba6e8071f036f63ded85e9fe9e86dab698b8
 EBUILD chromium-24.0.1312.14.ebuild 15444 SHA256 72c731bdb6abb97bbf8416fbb57da2ba3f5c4fbf12b63492754c9c17d6521f1f SHA512 ef6690d8ec60aa3d4721a28562e3c86405a669a26bb55b90b5280c85756f2905367b426e7d5fa2113b4ef1902d8f8245a0ce81629092615b3ce3d6ef0a91cb83 WHIRLPOOL 505178ac0853c8588e56f480e5f598133717db4637aade153b93c4baec39ec72e904abaf5aa82d9be62e66320174181b8df1fe89c5c7ab681c4ed2e42bb304c2
 EBUILD chromium-24.0.1312.25.ebuild 15446 SHA256 b7b88e2f788dfc601017df2aa315597733a264effb0782e291bc080d901ee9ff SHA512 9a1730294a677e66a003abcda662deae631e33d1b9d842bf7571c9200a94a5b3cf968ab38a27e4a57f4caad895b2c2065739e1338aa3d438464a3702abf99822 WHIRLPOOL f1aeab50a1ab02e802c30cc423c57e9bca57a4ab7f14c1c5e89743252e163f4ca1ed41a39208573c539257969f03632cd4d25d81d4c6361cff7a1dea8cbb5d30
+EBUILD chromium-24.0.1312.27.ebuild 15446 SHA256 e19fd1906ed2da1cc7bfc73fc6b4f3fca5346f9190f51d205e3d6918442bfee7 SHA512 f28431bd05afd719d00c25121e7ceaac4c907549d84e9faf696c50083e3c2d0f861c422ce501b509f905a595f568058773720267870b1c22dc18eebde4b14375 WHIRLPOOL c607bd7b84f24f591c83953a4c57352817b6e4f6cb61f746a95060defd4ebf30d623adb1d98a77261f57c1b25ea4476c3dc6e4ac36041dbcd01b0e2d59c18328
 EBUILD chromium-25.0.1323.1.ebuild 16128 SHA256 6044de0156634e33fe07c739c82062586eb86879c59900314e01cbc245e75d8f SHA512 b7a6928d585993efd49454c4c08d73ad3897689f2c75a6879945206f8c04fc8cde83ee98cbef90c1ec5507cc3b7e0a027a49745452bd1ae4707eb5b5293f17e4 WHIRLPOOL 640f8a3955693b26128a0d1118e4331116f597352952185b373887136a6c0c81a5b19946b261fafbdada82ef025a0c0dfd72ad39279e0ed2a4601aced6df2be3
 EBUILD chromium-9999-r1.ebuild 17262 SHA256 f67e5fc8786595f863722c3a6f4c16c0d6be8dac75e881314bcde9f3dcbccb63 SHA512 ecc6f3ec21998d660e09c15955cc12dc96459c385520b96df7821c352bb6ac123953b29e5a09d651f9d89f09a0b567ff2a0157669bacbe7f69b03f87fb0c7232 WHIRLPOOL b46cbbaa1709a746bc3f995d350970e890731c06e40c40c62a531cd0e1d2b8042d9748c86c64c80bd148f580effa8b39dc10fae7d6c2914d0ece3f3d2bf47bb6
-MISC ChangeLog 45211 SHA256 8fc3e97718317eeb42b495d87bcce3244c8b075085be336f9c903c9d3bbf7e4e SHA512 3f6060a40ba28181fddc4061ef5b32ab89b56300d10c7c8df1dd92e02bed74e3d4be9fb781fd744b0807a51ac7c5fc81f307e48f0cf864847cf50c78b90768ce WHIRLPOOL 533d595adea57d0220d11365c945d56096bcee32c61e711b81f664f899da6a6e1558b7fd82fc83d1fabcf5e783b671e3999783e2379ce06e8b4b6de36fd27186
+MISC ChangeLog 45355 SHA256 5e67c7499e82738e5b39bb88aa13328bb00b6b4007f3819f6414b350c1b45dee SHA512 9da7054a7732f76bbef44ece4db14038ae58140c8822d397c55396407b045729a5075b92d356afed387f98e00f125b453addf04347b4c4efd37efb4d758b2530 WHIRLPOOL f492c5116440f45b63374477e83590b29c7821cb0f3f27671eabd8dd5fc20ee939bc868438f98fb348ebbfabb8e22e6c581d72b4b3e64e0c4dd5231fd493c07b
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
 MISC metadata.xml 441 SHA256 2e4485b8a0451abf35bc19812cb993e998ee037ed97bc2cd53bf25c7c6c2f4a9 SHA512 4acbea177dc61613b6550987f26f8f4766ba534e0e87605657617f60569800e1a6960f9e7f0084863ad88aaa4ede94f593d1bd15d418594652e25288f6d79c9e WHIRLPOOL 2abe87ee8c80aff177de74bf5174fdd144f053759fb2d14ac7105f67f5e96082b7912d0283b5c78912750277ee6423b02a1b1bc2842bc851e8db9568d3b2ae59
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlC5RZYACgkQC77qH+pIQ6S7eQEAh6DT1SItCqCnc97R4rimQhce
+g7vV2STwwI58QEt3uokA/A10Zvk2Xx6oEjL36f1plvNvwJokAqRRx1ZPZR81rssF
+=um7L
+-----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-24.0.1312.27.ebuild b/www-client/chromium/chromium-24.0.1312.27.ebuild
new file mode 100644
index 000000000000..4b4dbff2fa9f
--- /dev/null
+++ b/www-client/chromium/chromium-24.0.1312.27.ebuild
@@ -0,0 +1,504 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-24.0.1312.27.ebuild,v 1.1 2012/11/30 23:47:33 floppym Exp $
+
+EAPI="5"
+PYTHON_DEPEND="2:2.6"
+
+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 \
+	pax-utils portability python toolchain-funcs versionator virtualx
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/"
+SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bindist cups gnome gnome-keyring kerberos pulseaudio selinux tcmalloc"
+
+RDEPEND="app-arch/bzip2
+	cups? (
+		dev-libs/libgcrypt
+		>=net-print/cups-1.3.11
+	)
+	>=dev-lang/v8-3.14.5:=
+	>=dev-libs/elfutils-0.149
+	dev-libs/expat
+	>=dev-libs/icu-49.1.1-r1
+	>=dev-libs/libevent-1.4.13
+	dev-libs/libxml2[icu]
+	dev-libs/libxslt
+	>=dev-libs/nss-3.12.3
+	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/libjpeg-turbo-1.2.0-r1
+	media-libs/libpng
+	media-libs/libvpx
+	>=media-libs/libwebp-0.2.0_rc1
+	media-libs/opus
+	media-libs/speex
+	pulseaudio? ( media-sound/pulseaudio )
+	sys-apps/dbus
+	sys-libs/zlib[minizip]
+	sys-fs/udev
+	virtual/libusb:1
+	x11-libs/gtk+:2
+	x11-libs/libXinerama
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	kerberos? ( virtual/krb5 )
+	selinux? (
+		sec-policy/selinux-chromium
+		sys-libs/libselinux
+	)"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	dev-lang/yasm
+	dev-python/ply
+	dev-python/simplejson
+	>=dev-util/gperf-3.0.3
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	>=sys-devel/make-3.81-r2
+	virtual/pkgconfig
+	test? ( 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 tools, bug #340795.
+	tc-export AR CC CXX RANLIB
+
+	# Make sure the build system will use the right python, bug #344367.
+	python_set_active_version 2
+	python_pkg_setup
+
+	if ! use selinux; then
+		chromium_suid_sandbox_check_kernel_config
+	fi
+
+	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
+	#	ebegin "Preparing NaCl newlib toolchain"
+	#	pushd "${T}" >/dev/null || die
+	#	mkdir sdk || die
+	#	cp -a /usr/$(get_libdir)/nacl-toolchain-newlib sdk/nacl-sdk || die
+	#	mkdir -p "${S}"/native_client/toolchain/.tars || die
+	#	tar czf "${S}"/native_client/toolchain/.tars/naclsdk_linux_x86.tgz sdk || die
+	#	popd >/dev/null || die
+	#	eend $?
+	# fi
+
+	# zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 383371.
+	# sed -i '1i#define OF(x) x' \
+	#	third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.h || die
+
+	epatch "${FILESDIR}/${PN}-arm-r0.patch"
+
+	# Fix build without NaCl glibc toolchain.
+	# epatch "${FILESDIR}/${PN}-ppapi-r0.patch"
+
+	# Missing gyp files in tarball.
+	# https://code.google.com/p/chromium/issues/detail?id=144823
+	# if [[ -e chrome/test/data/nacl/nacl_test_data.gyp ]]; then
+	#	die "tarball fixed, please remove workaround"
+	# fi
+
+	# mkdir -p chrome/test/data/nacl
+	# cat > chrome/test/data/nacl/nacl_test_data.gyp <<-EOF
+	# {
+	#   'targets': [
+	#     {
+	#       'target_name': 'nacl_tests',
+	#       'type': 'none',
+	#     },
+	#   ],
+	# }
+	# EOF
+
+	epatch_user
+
+	# Remove most bundled libraries. Some are still needed.
+	find third_party -type f \! -iname '*.gyp*' \
+		\! -path 'third_party/WebKit/*' \
+		\! -path 'third_party/angle/*' \
+		\! -path 'third_party/cacheinvalidation/*' \
+		\! -path 'third_party/cld/*' \
+		\! -path 'third_party/cros_system_api/*' \
+		\! -path 'third_party/ffmpeg/*' \
+		\! -path 'third_party/flac/flac.h' \
+		\! -path 'third_party/flot/*' \
+		\! -path 'third_party/gpsd/*' \
+		\! -path 'third_party/harfbuzz/*' \
+		\! -path 'third_party/harfbuzz-ng/*' \
+		\! -path 'third_party/hunspell/*' \
+		\! -path 'third_party/hyphen/*' \
+		\! -path 'third_party/iccjpeg/*' \
+		\! -path 'third_party/jsoncpp/*' \
+		\! -path 'third_party/khronos/*' \
+		\! -path 'third_party/leveldatabase/*' \
+		\! -path 'third_party/libjingle/*' \
+		\! -path 'third_party/libphonenumber/*' \
+		\! -path 'third_party/libsrtp/*' \
+		\! -path 'third_party/libusb/libusb.h' \
+		\! -path 'third_party/libva/*' \
+		\! -path 'third_party/libvpx/libvpx.h' \
+		\! -path 'third_party/libxml/chromium/*' \
+		\! -path 'third_party/libXNVCtrl/*' \
+		\! -path 'third_party/libyuv/*' \
+		\! -path 'third_party/lss/*' \
+		\! -path 'third_party/mesa/*' \
+		\! -path 'third_party/modp_b64/*' \
+		\! -path 'third_party/mongoose/*' \
+		\! -path 'third_party/mt19937ar/*' \
+		\! -path 'third_party/npapi/*' \
+		\! -path 'third_party/openmax/*' \
+		\! -path 'third_party/opus/opus.h*' \
+		\! -path 'third_party/ots/*' \
+		\! -path 'third_party/protobuf/*' \
+		\! -path 'third_party/pywebsocket/*' \
+		\! -path 'third_party/qcms/*' \
+		\! -path 'third_party/re2/*' \
+		\! -path 'third_party/scons-2.0.1/*' \
+		\! -path 'third_party/sfntly/*' \
+		\! -path 'third_party/skia/*' \
+		\! -path 'third_party/smhasher/*' \
+		\! -path 'third_party/speex/speex.h' \
+		\! -path 'third_party/sqlite/*' \
+		\! -path 'third_party/tcmalloc/*' \
+		\! -path 'third_party/tlslite/*' \
+		\! -path 'third_party/trace-viewer/*' \
+		\! -path 'third_party/undoview/*' \
+		\! -path 'third_party/v8-i18n/*' \
+		\! -path 'third_party/webdriver/*' \
+		\! -path 'third_party/webgl_conformance/*' \
+		\! -path 'third_party/webrtc/*' \
+		\! -path 'third_party/widevine/*' \
+		-delete || die
+
+	local v8_bundled="$(chromium_bundled_v8_version)"
+	local v8_installed="$(chromium_installed_v8_version)"
+	einfo "V8 version: bundled - ${v8_bundled}; installed - ${v8_installed}"
+
+	# Remove bundled v8.
+	find v8 -type f \! -iname '*.gyp*' -delete || die
+
+	# The implementation files include v8 headers with full path,
+	# like #include "v8/include/v8.h". Make sure the system headers
+	# will be used.
+	# TODO: find a solution that can be upstreamed.
+	rmdir v8/include || die
+	ln -s /usr/include v8/include || 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)"
+
+	# TODO: build with NaCl (pnacl is sort of required).
+	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
+	#	-Dbuild_pnacl_newlib=0"
+
+	# 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_ffmpeg
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp (bug #348600).
+	# 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_icu=1
+		-Duse_system_libevent=1
+		-Duse_system_libjpeg=1
+		-Duse_system_libpng=1
+		-Duse_system_libusb=1
+		-Duse_system_libvpx=1
+		-Duse_system_libwebp=1
+		-Duse_system_libxml=1
+		-Duse_system_minizip=1
+		-Duse_system_opus=1
+		-Duse_system_speex=1
+		-Duse_system_v8=1
+		-Duse_system_xdg_utils=1
+		-Duse_system_yasm=1
+		-Duse_system_zlib=1"
+
+	# 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 selinux selinux)"
+
+	# Use explicit library dependencies instead of dlopen.
+	# This makes breakages easier to detect by revdep-rebuild.
+	myconf+="
+		-Dlinux_link_gsettings=1"
+
+	if ! use selinux; then
+		# Enable SUID sandbox.
+		myconf+="
+			-Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox
+			-Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
+	fi
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	myconf+="
+		-Dlinux_use_gold_binary=0
+		-Dlinux_use_gold_flags=0"
+
+	if ! use bindist; then
+		# Enable H.624 support in bundled ffmpeg.
+		myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=Chrome"
+	fi
+
+	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).
+		myconf+=" -Dtarget_arch=arm
+			-Darmv7=0
+			-Darm_neon=0
+			-Ddisable_nacl=1"
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	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
+	fi
+
+	egyp_chromium ${myconf} || die
+}
+
+src_compile() {
+	local test_targets
+	for x in base cacheinvalidation crypto \
+		googleurl gpu media net printing sql; do
+		test_targets+=" ${x}_unittests"
+	done
+
+	local make_targets="chrome chromedriver"
+	if ! use selinux; then
+		make_targets+=" chrome_sandbox"
+	fi
+	if use test; then
+		make_targets+=$test_targets
+	fi
+
+	# See bug #410883 for more info about the .host mess.
+	emake ${make_targets} BUILDTYPE=Release V=1 \
+		CC.host="$(tc-getCC)" CFLAGS.host="${CFLAGS}" \
+		CXX.host="$(tc-getCXX)" CXXFLAGS.host="${CXXFLAGS}" \
+		LINK.host="$(tc-getCXX)" LDFLAGS.host="${LDFLAGS}" \
+		AR.host="$(tc-getAR)" || 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 mylocale='en_US.utf8'
+	if ! locale -a | grep -q "$mylocale"; then
+		eerror "${PN} requires ${mylocale} 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 ${mylocale} is not supported"
+	fi
+
+	# For more info see bug #370957.
+	if [[ $UID -eq 0 ]]; then
+		die "Tests must be run as non-root. Please use FEATURES=userpriv."
+	fi
+
+	runtest() {
+		local cmd=$1
+		shift
+		local filter="--gtest_filter=$(IFS=:; echo "-${*}")"
+		einfo "${cmd}" "${filter}"
+		LC_ALL="${mylocale}" VIRTUALX_COMMAND="${cmd}" virtualmake "${filter}"
+	}
+
+	local excluded_base_unittests=(
+		"ICUStringConversionsTest.*" # bug #350347
+		"MessagePumpLibeventTest.*" # bug #398591
+	)
+	runtest out/Release/base_unittests "${excluded_base_unittests[@]}"
+
+	runtest out/Release/cacheinvalidation_unittests
+	runtest out/Release/crypto_unittests
+	runtest out/Release/googleurl_unittests
+	runtest out/Release/gpu_unittests
+
+	# TODO: re-enable when we get the test data in a separate tarball.
+	# runtest out/Release/media_unittests
+
+	# local excluded_net_unittests=(
+	#	"NetUtilTest.IDNToUnicode*" # bug 361885
+	#	"NetUtilTest.FormatUrl*" # see above
+	#	"DnsConfigServiceTest.GetSystemConfig" # bug #394883
+	#	"CertDatabaseNSSTest.ImportServerCert_SelfSigned" # bug #399269
+	#	"URLFetcher*" # bug #425764
+	#	"HTTPSOCSPTest.*" # bug #426630
+	#	"HTTPSEVCRLSetTest.*" # see above
+	#	"HTTPSCRLSetTest.*" # see above
+	#)
+	# runtest out/Release/net_unittests "${excluded_net_unittests[@]}"
+
+	runtest out/Release/printing_unittests
+	runtest out/Release/sql_unittests
+}
+
+src_install() {
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome || die
+
+	if ! use selinux; then
+		doexe out/Release/chrome_sandbox || die
+		fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
+	fi
+
+	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
+
+	newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die
+	if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
+		sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" \
+			-i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
+		sed "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g" \
+			-i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
+		sed "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:" \
+			-i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
+	fi
+
+	# 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
+}