Stable channel bump.

Package-Manager: portage-2.2.0_alpha135/cvs/Linux x86_64

3 files changed, 469 insertions, 5 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index dd7156b565fa..7dedfa263524 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.728 2012/10/08 19:06:43 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.729 2012/10/09 01:20:46 floppym Exp $
+
+*chromium-22.0.1229.92 (09 Oct 2012)
+
+  09 Oct 2012; Mike Gilbert <floppym@gentoo.org> +chromium-22.0.1229.92.ebuild:
+  Stable channel bump.
 
   08 Oct 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   chromium-22.0.1229.79.ebuild, chromium-22.0.1229.91.ebuild:
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 28c9e81779ac..3697ecf4be06 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -26,23 +26,25 @@ AUX chromium.default 147 SHA256 de16d72d77ac9fe04f781df4f50dfb714ba33574755932df
 AUX dot-gclient 253 SHA256 8c5750251ff681044cc584ef3768fe39c56c7877ade5fb9107298734126e62cf SHA512 96d4ffd01fec2773d7beaf2bc82b8eb969556f6e859e39136b4044521c5b8bfd36c13a7f2fcc64613935d4703d8ede8a56c7ce581a7732642cb8ee71039c801e WHIRLPOOL 6a65521487fa353a22f192c567b487c77a405e068c88898e0d8045b3de26bdd54ed736f104e495598e0cc8703d3f6abc80f8b2ea1e254007dfb18f50294e8c07
 DIST chromium-22.0.1229.79.tar.bz2 210410507 SHA256 06cab1c48092def5bd94e9f4aa764f6ff5728ce35bbcdcc12fddbad3a0f0f738 SHA512 149666d8e185e4080c1cd7ab153edca2f4833be5beceef51b20e8cbd238030330ec1230cd3a9640bea2d02134683437bba7c809b2f5e13178d4a4e169321c717 WHIRLPOOL acf93160f2b096090a90e2718474477b40b67e8486a8ab7edca777268d4cd2799081cef8a73592302bd07248bdf831486f95873c6ac9b8e031587f3b1e5f739f
 DIST chromium-22.0.1229.91.tar.bz2 210386491 SHA256 dc375b6120352247bccc754863fe7c1d57b87abdb26e49187762020ecbca87ac SHA512 85d1f6f945ca906c7379f8c5933d3e6195853dfabe7e53b26ded32d68cdb55325c019b010c6b0c90ed7f7eca56b7108505114551ab876963c4c21574b0749016 WHIRLPOOL a23cc10ca767255d56b41cdfd0106cd0e294d6ede78d30ce49eebc55b106f8efba0bee8c48aceda6fe390ee428aa81703063733c221b0488907f2cc5e03477e8
+DIST chromium-22.0.1229.92.tar.bz2 210380938 SHA256 7f796f9df9ac2030801f5e0fc4b19d00757568f295d46e9cbc235853ec861e19 SHA512 ede032ee79929c9f02fb5eb9c4c5b1dae3b62b8c29e4dd31335b9aaa9190adb8a6db66754a5ce63add72ae3eb39938d560a62c6d43f4fbdc5a641e51b0036225 WHIRLPOOL e66c2edce342a4a7e37bb287bfec6cc4565f74301bc803b87bf15ecf89ab67a7e7c8614de1d59301f449942cc37f4dcf4ec7690571ff73e5674f9073a4c1e2ff
 DIST chromium-23.0.1271.10.tar.bz2 217667194 SHA256 c31b047cd02a3196cfa7ddbe676357c20c2be87137e61e8475149d842d74a9ca SHA512 66e5c145e4af21fa0c611ca6bc029ba608bb0c70cca112a3b1b4aa8d5d162f04415e85a6ff9f6d6f079897c6edf88fa9e20ef1f3703392d899a2ac7186e20fac WHIRLPOOL 69369be5278d26868f27e988e205d5b68dda5aed2e92ed91519979e8ce4e84a9ede00b50a83e1778fff9f81d6b613e217f23d040aba2a4890f40df562f0e2d12
 DIST chromium-23.0.1271.17.tar.bz2 217611060 SHA256 62ffe739a20e98ff16cd718ac7632afabce7e18d37daf86af5a76b748616ccdb SHA512 181b1f47c9ae69b619c01cd5b06e54f3e5e8c7a5a3f3a26572dfafe387c04be33ed19f8ae3e49b1e75e4a2200f8984e51b7c73052b02faeef72562edab358b3a WHIRLPOOL 17cabdde23f036e0c7bc1bb807fd49386b0f4633817023efd158cf6e087a853f141638b6834cae60b5a71a6f733bc1e87ec9ce2ee7defb4dae2b61fe1d62d2ae
 DIST chromium-24.0.1284.2.tar.bz2 217993014 SHA256 7dfaa01849e9dbe82062e1c67e518a31b09d6ededcb1dfacf03c9c362cc9e352 SHA512 54a88f304dec8de32613b917520f570a57d10ba337e374d7c545d1c30a40e17284cdfb1f43d6a38251deaba2f9ce85f217dd1206ba729035f96c4d51fd56e5e1 WHIRLPOOL 94635af0c2ef6d766ad148d98660f87a270184ff8ef0c4dca863251b2a53c3ce543ad55d0623f8b4dc71ca3ddab049dfc2891a6d0966620ea44bd4ad6f78b16c
 EBUILD chromium-22.0.1229.79.ebuild 14138 SHA256 4c12ffc43c3e709a74e9a136bec1d778eb009ac71bad05afdcc3eb88abdb7704 SHA512 ae4cdf396327e2fc03eef00f770908525365084aa3514a40b882aefc26cbd8b3ae786d2849f914d17991fd00b63865489fe2844d3995405c73026225dc395e72 WHIRLPOOL 5ef2e0701e657ea9c5c43cf6f9f6d9230e9607648eb7d5df4609821ba943131fcb797a2545f827f44723e2c7ad57130098a44329ba1f57c34209dc09749b1bf6
 EBUILD chromium-22.0.1229.91.ebuild 14140 SHA256 cbfd562ce534ed27ed063737f8cd1389c4de768deab18228d8a0fe7ca6baaace SHA512 4f374e23999df696f2d05ffd51185f6d8ec0a765c636f427edf1e3f00488524b9b12561ffdb9dd21e299a2dbb99f7fed79177d54cf8f1cc31ac17f94199c963c WHIRLPOOL 45b14f4f1db266464115b77c21edf44d964e889c80b8985c62d8713ee2b373cbe6ffcb1f63dedf7fa74a22204153b4370f88aeff89048b055df278b95cd96aca
+EBUILD chromium-22.0.1229.92.ebuild 14137 SHA256 d84d4af91adab48407ecf07af903ff867df06cc6ff1f2e786eb07a4301355be3 SHA512 c63664b176fbc9473a9938955343f6e5c82cc0ac50fe2bf3d41285d7322821f781e040c97bbe15e364cfe6fc6db15d685ea6df2a2cf63de032335096351cb0af WHIRLPOOL 1f7105b8a2ed9a0a85d8b268482a5ed2f1b1d2662a0ae31bd08b2077914b4c6f7c100da6ec20d0c837c10e47bde70b6490ea282ae9ade63122d48994dd326de3
 EBUILD chromium-23.0.1271.10-r1.ebuild 15449 SHA256 ec26e1e987133ed01d1ac84ed5ddd636c34e200472f75afe72fc3f879da05aa4 SHA512 e19b95f409a14a1c53b240793d63f82bf79233c34dfd3d377bbcafe5854ea53ef0b082a852a801e40f5c17c7305f36369a19aa15cf411d7992b297d0e4813257 WHIRLPOOL c7778f0decb1bea235678c482674bbe757a63f3b92c9c3fbc43933eb2bb9579533d883e735f7fdeed34639d28d8de8254a74a2a94b01f0bd293c49e629476469
 EBUILD chromium-23.0.1271.10.ebuild 15168 SHA256 995931d6c8fb0776dbfb49543ac51332df34a9be25275deba3d3bc52eb17f379 SHA512 3258cbde3791f26d0bf2455a787835955c7a1d23ddb6fe173405fbe0791304d1ccebfe162d3c7b0a7e17d46bcbe985bf1b639c77fdbc5b00b7e9042ec1f58f01 WHIRLPOOL 551c32aed9483bebf201b5cf886c74e80700c700ca8184b18feb49a17b424ccd3c25cf0c48bc95a269394146aacc09a3cdd0d3e6945784f51b415586bbe047a4
 EBUILD chromium-23.0.1271.17.ebuild 15479 SHA256 201f4fb98104962f93834dae315f741ff69fb78aa2292604048962bf1b02190c SHA512 96fe2d48d76e79168898679032e2cd6cb894097349efca656a96f0bed6cd2b3c51e7d6578c99768dc43608d89b0e51735b41c28e980ad3d050117058421bf2d1 WHIRLPOOL 8a999302b29f18783e1eb56e2bc899a6d19fd7628ed84dd85a86d82090612d270945a9ebbe2804a4e776699627b7c2463fa2af68bc48719f9749bc7fa2068051
 EBUILD chromium-24.0.1284.2.ebuild 15415 SHA256 b058c3c17321d5b97b95e3df91c7e2a354ec9fef03971f37a9fb7d34208a5f15 SHA512 6ec1231e99044929d8a9fb384bdb7880fe74b5c3cfd89e6fe192ce98343dd1e36b6a7ef9f18af21260296ada7a85ffe7ee484ed83e82c859640e6f9536c3fbe8 WHIRLPOOL 0176d31c9668810d613675aa1d4f93f07b638a918013681bf49c7d8f00b93db6ed4223f899685e6c5f7df0bbdb4ed58067952983272a89df8bd827079f61a877
 EBUILD chromium-9999-r1.ebuild 16453 SHA256 fc11dfdbdacd302ec911a1660e1db6b5394dfd26a82be17ec060961a256e8dab SHA512 95696e897044262e3fdc424e79819cc8f172687eaa895a4679890ce9c9677c91811b6e8938968206399033122c9c409cf58b735567cf83efbb2419db4e656911 WHIRLPOOL e91621d79efa7505d81eefae5df1d97dd694c344200e5e0dde25222e0c3c9ba585e071c7ae1ca441e3b63be4a2aea85a1649f53f8cd33d1c0ce63cf622af63d4
-MISC ChangeLog 40036 SHA256 b71421060699d4991e812efbdb45bc95f8fc38e8cf3a5df6b2ce6166cac71626 SHA512 a01d216bb7c624745689ec10f27be4458ee7ed2cf9f283b286b92eeda8dcee6b9722e127292830465b778d955ca99ce63e110e45199dff3200e8d14791ae9f3d WHIRLPOOL 1e665c97142840e68027c463d88088ae14e71140169bfc7db21d79ee77ab0226f4d0f962fe6081636ce8578f1da08a4dfefc9053b0f721120286d03386969ea9
+MISC ChangeLog 40175 SHA256 d0ee5ed298e09649c43e80c47038755fa838cadb533527819bb505db826c3d44 SHA512 9db4e3a8f0f2b4e3ed24daf216e01fe5ee950109a946afe72e4018791e07564162d0f43923beff5a4730de989908004b786e3b2243432f62040dfbbe37714d63 WHIRLPOOL 951dc98ed35a5335d7896c55d0603deddb0a1e9e6758dc6744b8a30ad2e7eebac6b5bb39c279c921beb1ab5e8889a383b9aac4d6077b62438f4353c4f4d97456
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
 MISC metadata.xml 360 SHA256 4c2cd208e61300491a73f23e90a6d1b447a4e0d16ad8f54ae68408eb94357e60 SHA512 f70a2eaefadf05baa375064fcc452982cbf6a5e775ba5b8fc49780ddc3910f8d18f9e5713b8ef083567f2d0bde53f8f9626afa4b4bed7b9b1ad30f444e42c14c WHIRLPOOL 6d7df2df36e34a6111c869f90636876cf30883c623d594e3a4830b156e2f14e938a739e5cf4089cd2ff7b4fb79d0e323725b984cbee9d466d735971ad2555f06
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBzJFEACgkQuUQtlDBCeQLfsACdHAhgA9hBidJtbX2EYqjWW2QG
-WiYAn0p4TOGlkoS2ig0Lbtoyfr113Qrp
-=qRe9
+iF4EAREIAAYFAlBze+8ACgkQC77qH+pIQ6RsDQD+K5Vs78FJokfTQs0SL2XJpxgV
+9LIUMFOn0GDm3nHNwFUA/2b48ACxZfPigzUXTuwmaV9zLlQOpq1uee+hQGKg3JBb
+=YtIf
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-22.0.1229.92.ebuild b/www-client/chromium/chromium-22.0.1229.92.ebuild
new file mode 100644
index 000000000000..df69410109e3
--- /dev/null
+++ b/www-client/chromium/chromium-22.0.1229.92.ebuild
@@ -0,0 +1,457 @@
+# 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-22.0.1229.92.ebuild,v 1.1 2012/10/09 01:20:46 floppym 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-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/libwebp-0.2.0_rc1
+	media-libs/speex
+	pulseaudio? ( media-sound/pulseaudio )
+	sys-apps/dbus
+	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/nacl-toolchain-newlib-0_p9093
+	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"
+
+	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/hyphen/*' \
+		\! -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/libva/*' \
+		\! -path 'third_party/libvpx/*' \
+		\! -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/npapi/*' \
+		\! -path 'third_party/openmax/*' \
+		\! -path 'third_party/ots/*' \
+		\! -path 'third_party/protobuf/*' \
+		\! -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/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/*' \
+		-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
+	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_libwebp=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=0"
+
+	# 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"
+	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
+
+	local excluded_media_unittests=(
+		"ChunkDemuxerTest.TestDurationChangeTimestampOffset" # bug #431042
+	)
+	runtest out/Release/media_unittests "${excluded_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
+		"SpdyFramer*" # bug #436370
+	)
+	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
+
+	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
+}