Beta channel bump.

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

3 files changed, 516 insertions, 5 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index e3ec734f5c16..e4d4f6d27f45 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.765 2012/12/05 22:17:07 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.766 2012/12/08 03:51:46 floppym Exp $
+
+*chromium-24.0.1312.35 (08 Dec 2012)
+
+  08 Dec 2012; Mike Gilbert <floppym@gentoo.org> +chromium-24.0.1312.35.ebuild:
+  Beta channel bump.
 
 *chromium-24.0.1312.32 (05 Dec 2012)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 75ba3c1f1a53..07e50db1a5ed 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -30,20 +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.27.tar.bz2 186141545 SHA256 417eb1d5bbe054479cb62819dce247d4775fe8f1b6bed6c9347fb819d8c07e70 SHA512 7eff1d33f922bacdf065d0237f8e1905d284ef44c0a3f2d428b43c681653d4d4d00ec6da668aa23c2417e14cd8c29577dc2020062911852e6967d228ee736763 WHIRLPOOL 83ef1ff780db3d94afff5da8354a003019793be0c0a48ec2acd3162131fdbcd3471bcbf465f00029703e7686463ccb13c2e319ea345554644e96b99569c65a8b
 DIST chromium-24.0.1312.32.tar.bz2 186159742 SHA256 5d26a5af421ac4592f1d4c56e7104479633a61958b1d5fba5d536d33100f471d SHA512 5e93957293e69066605be1622c80757d65efc624ac733fae482fb11c935ca8f4488c74957d15dadf32ba5cf6ee06b38df877fede4ee778b9c3f8c092dab99f4c WHIRLPOOL 7c489b817cef8032dbc609f6a52bf1a1e49ef4dc3e4ce76ee0f50dd57491bdb6daec520255add5ab94c86aaa6b75212761a678181ea9f08a59389d62a69b8293
+DIST chromium-24.0.1312.35.tar.bz2 186219160 SHA256 918d10035c62351ed3ee9e1e35fcd640ecaef3f572a08c7f98f2db4ccbef6655 SHA512 7104a8749bf7b7a96ca554012b587f5877f942149b507e496156d26963dd122efcc125cba1c88ff3aa98d287c46f324dcb786578f2e1a420eaf8cf040750ecfc WHIRLPOOL 5fc3464e1369b4a092cb2d5e1ee47f809fd522a2eb59d2bb4239e0f6ad04a61af0b02cd5191f108f52715694d1cd1b82809a203e9e0f384a12d398210b0e4aa9
 DIST chromium-25.0.1323.1.tar.bz2 187987460 SHA256 daa8ac4b8d54f9d40eba8d3e9d7e59acdf42f7d6f556eb9fe0764b0b7150efc4 SHA512 78d02243b75eb5352f61fb9c0f00643ce085db4dc559548ccd15e4d43a373e23f80fe3a19c1977218e9f5ec0abf57f2e00e1fcb68cb73fe5a73aab278e7a33fa WHIRLPOOL a8af2773654224da7996ec41a395e83f5222f0a3853ab6405f51a24823290a2a12f10a24367892d8a9bf64e948684e7272369bd32cc1413fd78a3854217998dd
 EBUILD chromium-23.0.1271.91.ebuild 15477 SHA256 401b3bf88a632acc01cf67fdaf228a52d0a6b8b720b93399b6a0863572c4a939 SHA512 268a84721c8ef63f296e9d393b017de49693cd9adea2a34069ea7d87cbdf1b01c4accd020a314bf19dfeccf3da589c8df84ca7f3fd8bfbd3c6a8a3b43d52f1d9 WHIRLPOOL 23acde312bc0d658e63fa42eb0c8b6944fac283809dbdb63a81073e00a5cb15ab63d9bb60c43ab1ec0124ec155b57d73c5c5d2d7eaec8a1451e671070c241541
 EBUILD chromium-23.0.1271.95.ebuild 15477 SHA256 4db7ae8569c167db01ea9d1cfca56e1315eb7a79421cf5a479a1d109d6dfdd91 SHA512 4d2d9852894b6a1b0d3a08fb522a11f8653287f4cb3d639b2083eda77bf48c1ab9a4dc5ca2730997f1ce682b8a5d116f193c9282f72864cc06c74c8f1c13bc2e WHIRLPOOL 27357d534d8897a9c24ebbd93fa658069bb23f7b263209f44535da74bec3999dae6ff625ac6b7b598b370222a24f6d098cbe1a411d26f5d214459f9f34ce4a40
 EBUILD chromium-24.0.1312.27.ebuild 15449 SHA256 7256b995ab985606ea4e912f1e806e598cb202b3ce0f3cdf16e6081c5a7fd9f1 SHA512 7787a784db98b12d5bdd40fd46ef6a3a594e4a41f97ab23780f09731413d00df8b1ceabaa6c2bf231e28becc686cd289eb39bff22ad493848df719ac42f480a0 WHIRLPOOL 7f118ef77bfb7650c57f6a1466cffd2e7f2af422335d113a57971debf0c70edbee0fdfeed677bf930d4e4df4e9a94421487bb036a52d807284e465187828ec0a
 EBUILD chromium-24.0.1312.32.ebuild 15447 SHA256 2a4936c1dcb7d5199e256adbfd36ac54b1d4aa9b637f17ffe342688f15ea2dda SHA512 5d29bff1bb2ccd3bb3f5badaf9c0f9f389eb991d7e058dea44e0623077f9e957a67ddfd046cbeef9b110f5cd371497dad90afc97a7f504b77abb213b8e63ff12 WHIRLPOOL 9c3e773c93d4c8707946e3595fd53dc09d239519b9f5ad7eadcf8aea4ff3332123d3855e1aa5bdd452a79f4a9d0c03a72b41b991ba4672121506eb38caef8b4d
+EBUILD chromium-24.0.1312.35.ebuild 15447 SHA256 6eb30be7e86b19efa65913206865c7b05feec1dc60c2294ccf6437ae3645fb5a SHA512 eb3aa886acb891518c147e95ccd41ff09ec775c2001b67edc47974417f960472f9b6653f2c1a5a6c3209af8e4286414ae1cadf356c184d7e43b68223e2f91c0c WHIRLPOOL e067161498b2b97d5ab99b1c8b43897779baab16dfa02910dda3517f1292558b62dcf450a28838b776cad30a1a2b63dad73c36dee59c5325708b05428922b27e
 EBUILD chromium-25.0.1323.1.ebuild 16128 SHA256 44af38271e54adf1b3ef65b518e0bd78466296fd087e57ae690bebcd08d11328 SHA512 eb3f87fde94434d682cda884795b2a25a21453b0c0f845a51bba6c7c18ad710f0fec0b6a4a0dfb3fab6d29f270e68f456dbc525cb601773870610f04b190f14c WHIRLPOOL 05db27b15a4733b791c06181cc4a59aefc6c5faf382f66c7c99e3d91e1d15e31e16efaf3c54eb4d084038736043ed0ac8d16dbb07b6874f653620fa896af82cd
 EBUILD chromium-9999-r1.ebuild 17262 SHA256 64402ae56c6592a5265c2e82f3e753b2334e74ee1f46012949eaf57639502131 SHA512 f9b3546dddc4bb51dbfd9801d873d8023353cf6c2abcb1abfc6e01a7356916bd9aadf15f11e9b55cd4c23905c3fc7d42ee82a99f99a668aafd78927291ea1bba WHIRLPOOL 4f30d6e983cc390178ce8eb0559f39f6111e2d2cdd3d44aef79fb3f708fa18f5ac655c7a85e802f88ceda618d18bdc4fd26b77f67d63df013b3b8ae05e393556
-MISC ChangeLog 46043 SHA256 6c5c31ec18db496dce4712bb517029431bda2632aa5e48fa0d03f44afb861364 SHA512 8321132b7b28f9e3d46e899067d24e4696f7dadf6ca7179b7729dba340b2a3edb143dd428c45826e14ba6ef500c272eb04eafba745949051c342ec455b92e453 WHIRLPOOL 4bbf049e50b716d64d162382da8856dd75f481f38171cca39faa4bc6f160b2919cc8da3b34f6e876b021ba1732e629781a35cfcfa4456153b9054cce84b0bc4a
+MISC ChangeLog 46183 SHA256 40724665cbe63dcdc42f6cbb043b28ce479fc34d93390b013bd1fa7d41de4ae8 SHA512 333c2f3a2c54de5b8cb15d8b41bae9170b6d56c28804b4d7b9fa2e31886dcab7ad6d64d59d67c88c2375d0506a01e0906d9c086c0d7b17a908967e6594af5388 WHIRLPOOL bf095b5d763a63ba92772aa2604d5c0738f127a151a2bc862345b60649aaa28039df8cf9dadcd977745d0c840f9cd5662b7441cc612c4898b2bbe7ea69eabe94
 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)
 
-iF4EAREIAAYFAlC/x+QACgkQC77qH+pIQ6RQUAD/ZLLYPY8B2/ga3QNvI8RX3Tv8
-tG90fERnFaNgshlwcHwA/AuOhSmlpsLQIrs7bkxGSEiUGTzhPkaOSZuzJmyK7hJc
-=oRYT
+iF4EAREIAAYFAlDCuVQACgkQC77qH+pIQ6RioQD+MYWEj2pA0k0tClmN7bk8lZl5
+q85Kugoz5rm4MKEOILYA/A4gNitSHQm21jbXyz1Z1T6iLwoKSBkZv7T1W64PhrE3
+=RYxa
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-24.0.1312.35.ebuild b/www-client/chromium/chromium-24.0.1312.35.ebuild
new file mode 100644
index 000000000000..e683d861960a
--- /dev/null
+++ b/www-client/chromium/chromium-24.0.1312.35.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.35.ebuild,v 1.1 2012/12/08 03:51:46 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]
+	virtual/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
+}