Restore stable ebuild, was removed by mistake.

Package-Manager: portage-2.1.11.9/cvs/Linux i686
RepoMan-Options: --force

3 files changed, 442 insertions, 5 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index bd5e3620e135..71841ba82b56 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,10 @@
 # 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.690 2012/08/13 07:11:05 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.691 2012/08/13 10:07:15 phajdan.jr Exp $
+
+  13 Aug 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +chromium-21.0.1180.57.ebuild:
+  Restore stable ebuild, was removed by mistake.
 
 *chromium-22.0.1229.2-r1 (13 Aug 2012)
 *chromium-21.0.1180.77-r1 (13 Aug 2012)
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 8b8e7a580ffd..6c7e582e8fb0 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -21,10 +21,12 @@ AUX chromium-webkit-zlib-r0.patch 1750 SHA256 7a44c63d96b6fd4b12afcd06a81f410ff1
 AUX chromium-zlib-r0.patch 511 SHA256 ec2795bfc47c516401fd2c9648caa3b06e64794392b41a11b2664d9968171534 SHA512 d06c7551d1976404b07f4cbcb5f385cbc565884d34d3fd49bd4c1c2b96e2b660f4d8f778c5f7ac9bd34d66ad46a1f1235d89f1c2b026fbc3bd9c2b7ab7087fc4 WHIRLPOOL a394e499ca1bb3304716087f1a7b6e91847fbc7425e6d0e1bad00acb9a0e8690559687726fe41d49031f51e3eccdcbcd290a27e366613dfce4d2e89aab92375d
 AUX chromium.default 147 SHA256 de16d72d77ac9fe04f781df4f50dfb714ba33574755932df950c1d9472b589d9 SHA512 26cdfd05da7f33ba94cd710ae52a1b345cdea4928500af791cff10ca8f9f44036497d9520f690d4d40be5774e77cf9be77f21233b7f804b1dee7d81b8382a9fa WHIRLPOOL 162deb65f97efca4db35dae64e46e0cd21d02a3dd1ae0ec6fa2f9ee7660fbeeb771a1afa3d07cb0d904cd8d7c16ff4b462bc6be3cf9a4143833e909ab89ac5fd
 AUX dot-gclient 253 SHA256 8c5750251ff681044cc584ef3768fe39c56c7877ade5fb9107298734126e62cf SHA512 96d4ffd01fec2773d7beaf2bc82b8eb969556f6e859e39136b4044521c5b8bfd36c13a7f2fcc64613935d4703d8ede8a56c7ce581a7732642cb8ee71039c801e WHIRLPOOL 6a65521487fa353a22f192c567b487c77a405e068c88898e0d8045b3de26bdd54ed736f104e495598e0cc8703d3f6abc80f8b2ea1e254007dfb18f50294e8c07
+DIST chromium-21.0.1180.57.tar.bz2 192416785 SHA256 311ba95249ea994747355596885c9ad583e55bcbe7220a47ea096898e7aeb145 SHA512 7ae15bc00c9c215694cbe7aafeade34f295c669c9945f9e59804f7faf591ff717bb1dccf3c45334924d672366e1e3d7b8e30640f87cf5a016a97f3cb8314e9b1 WHIRLPOOL cfc82517caaccafbc2a208ab46b4e91135aae07e42273e8d0e7af941fecb2e0b3de7b64c96a41ab0f7c7ec7438ec97b61cf5180792960ba466d00329e3a43e54
 DIST chromium-21.0.1180.75.tar.bz2 192591729 SHA256 8ee09c680d254a41fda99713b69f541e50f1e7d555b94c6af517e25a11c8830e SHA512 57a6039d105a6b2a7120cc1f8a267c60873d46f14e826759a58325b9b46e3c96964b2cd9200a4a61b9dc87ee6df59a5072c46dbf190c519790828611e310e0ac WHIRLPOOL 5d242cc313b44f93ff2b7ae4dbc3dc3776c33a1ed539c21c0d387482790f6d1db495fbc21c1fd0ba2c5eb094a549431784330f1d182850bbe62f19b833ea311c
 DIST chromium-21.0.1180.77.tar.bz2 192601532 SHA256 68b4485ed479602c544a7481367dc367d4ad816c65f4ff8a8927e39b10e9dc8d SHA512 4b8ff073e0266c15b44e2df06157a4e4acee12b2dcf6efa093d3b5441c010a09c3a406e0f7b66890a37f8dbd1446da968afa4b7ead07471069128e9c068c9361 WHIRLPOOL 05f183b2bc85a68deedf720a4a7503cd8f801a0695dbaf14dce152264b02cb7d94c7ddb52a02b304c958d5df107e53adbeddf7c58f26a633cfc646c1ec27af93
 DIST chromium-22.0.1229.0.tar.bz2 209944402 SHA256 9de6e9b9f12c8429cc7c5bd9daee07ff1eccf32c83e5d6edf47bba5bca8d244b SHA512 ddc9d38e82b3b6a4fe20ea4eda814f4dd0cabe8a836f192d4dcfab542089f2fedda1b9711cd5603fc5ebdf4fcd41b19fd5bd29e70d057caead25152f8c1a27e6 WHIRLPOOL d4672d6dd27fef9488d63a4e62647acebabc5ab1f8c0642fb190946ea46a19569c57b009d4c1393f36da5c89299a3a1f3c5d9609747b99f03ccf473688eaff84
 DIST chromium-22.0.1229.2.tar.bz2 209929711 SHA256 3236158f708a65f3925575f22595b5dfb7f275e0ade8ce23a28644ec90f61594 SHA512 e92afe61b3c2ed954e026d1aea19d53e8ea7327ae57a56932405ca373ec656be122b1be99edfe6147903f2733f9e5825bfc9b58e933e867a3645c79b280faf5b WHIRLPOOL 1125467066179872b257fa04457c1608ab171bc67df46a9c42e57ec072ae9c6b5fac844236c4b28db21ca760a7ec19248afed1052ad63d824bc0162797571571
+EBUILD chromium-21.0.1180.57.ebuild 13967 SHA256 b8f2542f4e1cef65022660b5e76400460e2e8f8ae677c2d00faf7fa6eba1dadf SHA512 eec4bd8e8901bfd4dcdf9845139313d32fcb4ddac298a25d8d9b0292425904531d102cde4861c0d20b70a5e546c71ff2f5b36a72d187901da4f1b2fd7b77d086 WHIRLPOOL 9052ce05955830ea43283161d3f4be94df52284881e2999af46c01255bbe224dfec9114a331d0a1e30f2b7a70c46c3adeda2cd95d36d6083250e95b52563a5e1
 EBUILD chromium-21.0.1180.75.ebuild 13966 SHA256 b6e6fdc49a64245f54e90e53edf42e51a736e75147e056cede6f8bd4d5ca4527 SHA512 341d82d3a0382b306c494232362712569bedbf33f7e98c00ea3d4f970b0c940968f4a6cb425059bd682e63b5926b2ec1095524da86c24b61df62f401a55d273f WHIRLPOOL 9bc55a0175c10dcd3d32c345d65f79a39d1c91812783fc33a8f35682505bc8c5476b40cdadd2851d2f5cf65a1bfe4c45b8c23a1ac6a63692e7d536e20d8980e3
 EBUILD chromium-21.0.1180.77-r1.ebuild 14030 SHA256 9cb4a41e6a12cd11c3a81dd5a7c2ebec5c3c5f016c8b5224b2035448b5f206a5 SHA512 fb99b6254fe0f482d8a627e1d08bdab124ab6579820901799215decb749230a34d94ce442ada0dd8882dbed81b6c75bcb788c6205dfdcc2a2b0db69f3b7c4c99 WHIRLPOOL 15c7e3f5be2d2355acc380421f891284a230e29f9d8a9a112dde57818ad2452b4036388dafce88ccadb695635a0acb7d964c55b37eb550448ad95d9409afbc54
 EBUILD chromium-21.0.1180.77.ebuild 13966 SHA256 49eac76a48a64ce5d9db1e2fc46eaf577e5cdc98633a4d8eec2cd6a5336fc6e7 SHA512 3a45c93411409ef83ebe7e56c92b973e66e2882c7955e0acf5678e9c18d1e5675c8991218f77697dd9a06ad248941422a55d6643b61e83d2f0cdac4f47ae00f5 WHIRLPOOL 212224800c0c7c9cb7157f70b0d2194e1bdc6077a63818f0a083af68e4be5085dc33598a6a977cca977aecf408cf89b62fc397e9ba642c90a0078056e1a892da
@@ -32,13 +34,13 @@ EBUILD chromium-22.0.1229.0.ebuild 13833 SHA256 2e2d6e6dee71511cf3ddaf4c65450179
 EBUILD chromium-22.0.1229.2-r1.ebuild 13894 SHA256 406b92ea7ae996eed197fec0dcf22bf2140185a443db0bfde77d741451cd0890 SHA512 da08fdf43b386d896b1f32e69d5eb209fdad9893896b747890c680482f489161ea6a4d7fbc51d04e5f18ff9c4df91c49dc3020f9126e609b5d68d9eb481c2f1b WHIRLPOOL c29e6dad66088a9ef8658164fe7fd07537bcf420f52197ee0a969073652eb97fea699d62b79f12f157fcc65dddeb1f536886d59ca299d6a1744d81b0ac5e72e7
 EBUILD chromium-22.0.1229.2.ebuild 13833 SHA256 d4bf762d5c6eddd960bb68d0db07e177f02c953de3adbc040f99bfc00eebf4c9 SHA512 ae27ffa4bd093103c9088afad84185925b90d43125f8c87889aea144af627f3bc06cc45484ac3ab2fddbcb78533af516d1d889f2aedd81981be11ebd529db134 WHIRLPOOL 7040a71be5ce95f88ca5549507aa0f44a152f6c06eeadfc3c82a9dc6b6d03ab2016aa5ed66f550289b61b4189b8616d54a362d8a8473245ae9d7db034bfd715d
 EBUILD chromium-9999-r1.ebuild 15457 SHA256 ee4d96a4cfd3a1288d0960820b4515fdcf62a074cf77af1223cf1e6da3952333 SHA512 67c3e875d1bb93af5f9f191774a55d88546a60e717addcd1e0012973e5e1d182f4930dd207b7fa832e781a4ad69284a69976b7110ea0f22073d18962bd02bfb3 WHIRLPOOL 441f343e01e5c7219b78cc505c17082dc9de72685d74a98ee94ecbe9ea8ccd61e89c2aa07087b81480ca0a08e8c9707eb6a2302893a96fd40883ab00e006b25d
-MISC ChangeLog 32447 SHA256 66ccc3a1d769cfb4dee3f4fe157751a9ad7c7b2d6fff6ba95c7b8a7f2465a33a SHA512 0171dcb80c3ca71e3d0a5f4420818737e73cf4300bdc2c5bd55334d6dd49c83be7b60ab22bc62b803f932512ca760bde1a8f5951a8a4c48c2124368238780cfe WHIRLPOOL 707d44eaa4fd1047c216b11349b2ca783122cb3034c89a8f71d04dcbd235e907d8f8c5dc3e74ac915015c7ec1f41f5c184451b85f62ec6b4f8d5f774df9c0f52
+MISC ChangeLog 32585 SHA256 4eabf0acf997a70700d4e30d5e4d38c4669110c60cf41d47f339aac62f2ffbba SHA512 cec094c415a8914dec05a07f7316b3be27f16bae2e048fc7366ee0ed5a19fa8a7158583c2ccd63a611463449d20812ab96e953e8e95247d7fc0d6bba3a8e9b26 WHIRLPOOL b9ddfc4e24873aef38bc32c9d7e0a310d2ca20bfc1642716fb70bc417ef6dd456b721b9fb5e7f53383af6226c5aaa2a112370ba71f0af9f793e19c0887b6a2ac
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
 MISC metadata.xml 267 SHA256 4e6afae33f60d6752cacf2785f7f9a396b8711cce605b73d0d752a4af7d01fc8 SHA512 f6d64d50bfbfad74db0ca0454fcba335a1744d11a44f921f19545c478219c507994cfcaba13160215cbb5a77d0bc82cdbf64a90a4b1b169184e404e404f9029e WHIRLPOOL 66a5cdeac3a86b910040d4c601fef50465fb0e0a0805e6b1c22cde2a83a63a2a1d441643af5454775becdfc65c71116d00b27703a7dd15ced183fb223c32f075
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAoqJcACgkQuUQtlDBCeQLewACeJvYSaOLsqt7LJTnDwR5DV2UG
-gWQAn0CibCYGi1CcPx/fkclKKg4G1ANm
-=LTz7
+iEYEAREIAAYFAlAo0eAACgkQuUQtlDBCeQJl0gCfYWwwX9g88QCelpXnveRs+duI
+OzEAn21Iji0TrVAlR9PVU3KAmmLKEGeK
+=rNUR
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-21.0.1180.57.ebuild b/www-client/chromium/chromium-21.0.1180.57.ebuild
new file mode 100644
index 000000000000..8109ece5f5b3
--- /dev/null
+++ b/www-client/chromium/chromium-21.0.1180.57.ebuild
@@ -0,0 +1,431 @@
+# 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-21.0.1180.57.ebuild,v 1.6 2012/08/13 10:07:15 phajdan.jr Exp $
+
+EAPI="4"
+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"
+
+RDEPEND="app-arch/bzip2
+	cups? (
+		dev-libs/libgcrypt
+		>=net-print/cups-1.3.11
+	)
+	>=dev-lang/v8-3.11.10.6
+	dev-libs/dbus-glib
+	dev-libs/elfutils
+	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/speex
+	pulseaudio? ( media-sound/pulseaudio )
+	sys-fs/udev
+	sys-libs/zlib
+	virtual/libusb:1
+	x11-libs/gtk+:2
+	x11-libs/libXinerama
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	kerberos? ( virtual/krb5 )
+	selinux? ( sys-libs/libselinux )"
+DEPEND="${RDEPEND}
+	>=dev-lang/nacl-toolchain-newlib-0_p7311
+	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() {
+	ln -s /usr/$(get_libdir)/nacl-toolchain-newlib \
+		native_client/toolchain/linux_x86_newlib || die
+
+	# 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
+
+	# Fix build without NaCl glibc toolchain.
+	epatch "${FILESDIR}/${PN}-ppapi-r0.patch"
+
+	# Bug 427438.
+	epatch "${FILESDIR}/${PN}-bison-2.6-r0.patch"
+
+	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/ffmpeg/*' \
+		\! -path 'third_party/flac/flac.h' \
+		\! -path 'third_party/gpsd/*' \
+		\! -path 'third_party/harfbuzz/*' \
+		\! -path 'third_party/hunspell/*' \
+		\! -path 'third_party/iccjpeg/*' \
+		\! -path 'third_party/jsoncpp/*' \
+		\! -path 'third_party/khronos/*' \
+		\! -path 'third_party/launchpad_translations/*' \
+		\! -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/libvpx/*' \
+		\! -path 'third_party/libwebp/*' \
+		\! -path 'third_party/libxml/chromium/*' \
+		\! -path 'third_party/libyuv/*' \
+		\! -path 'third_party/lss/*' \
+		\! -path 'third_party/mesa/*' \
+		\! -path 'third_party/modp_b64/*' \
+		\! -path 'third_party/mongoose/*' \
+		\! -path 'third_party/npapi/*' \
+		\! -path 'third_party/openmax/*' \
+		\! -path 'third_party/ots/*' \
+		\! -path 'third_party/protobuf/*' \
+		\! -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/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/zlib/contrib/minizip/*' \
+		-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
+
+	# Make sure the build system will use the right python, bug #344367.
+	# Only convert directories that need it, to save time.
+	python_convert_shebangs -q -r 2 build tools
+}
+
+src_configure() {
+	local myconf=""
+
+	# Never tell the build system to "enable" SSE2, it has a few unexpected
+	# additions, bug #336871.
+	myconf+=" -Ddisable_sse2=1"
+
+	# Disable tcmalloc, it causes problems with e.g. NVIDIA
+	# drivers, bug #413637.
+	myconf+=" -Dlinux_use_tcmalloc=0"
+
+	# Disable glibc Native Client toolchain, we don't need it (bug #417019).
+	myconf+=" -Ddisable_glibc=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_ffmpeg
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+	# TODO: use_system_vpx
+	# TODO: use_system_webp (https://chromiumcodereview.appspot.com/10496016
+	#	   needs to become part of webp release)
+	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_libxml=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)"
+
+	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"
+	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
+
+	# ICUStringConversionsTest: bug #350347.
+	# MessagePumpLibeventTest: bug #398501.
+	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/base_unittests virtualmake \
+		'--gtest_filter=-ICUStringConversionsTest.*:MessagePumpLibeventTest.*'
+
+	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/cacheinvalidation_unittests virtualmake
+	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/crypto_unittests virtualmake
+	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/googleurl_unittests virtualmake
+	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/gpu_unittests virtualmake
+	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/media_unittests virtualmake
+
+	# NetUtilTest: bug #361885.
+	# DnsConfigServiceTest.GetSystemConfig: bug #394883.
+	# CertDatabaseNSSTest.ImportServerCert_SelfSigned: bug #399269.
+	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/net_unittests virtualmake \
+		'--gtest_filter=-NetUtilTest.IDNToUnicode*:NetUtilTest.FormatUrl*:DnsConfigServiceTest.GetSystemConfig:CertDatabaseNSSTest.ImportServerCert_SelfSigned:URLFetcher*'
+
+	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/printing_unittests virtualmake
+	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/sql_unittests virtualmake
+}
+
+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
+
+	doexe out/Release/nacl_helper{,_bootstrap} || die
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/nacl_irt_*.nexe || die
+	doins out/Release/libppGoogleNaClPluginChrome.so || die
+
+	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
+}