Stable channel bump.

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

3 files changed, 514 insertions, 6 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 4f9ab00e7eb0..ea0697a3a58c 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.745 2012/11/02 04:59:39 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.746 2012/11/07 01:06:23 floppym Exp $
+
+*chromium-23.0.1271.64 (07 Nov 2012)
+
+  07 Nov 2012; Mike Gilbert <floppym@gentoo.org> +chromium-23.0.1271.64.ebuild:
+  Stable channel bump.
 
 *chromium-24.0.1312.2 (02 Nov 2012)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index ee870cabc775..6a800bd01d44 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -28,24 +28,25 @@ AUX dot-gclient 253 SHA256 8c5750251ff681044cc584ef3768fe39c56c7877ade5fb9107298
 DIST chromium-22.0.1229.94.tar.bz2 210379000 SHA256 a0af7e681ef43a7a17b32a1f6e1dc16ffa2a5f725f946ddaeea13660eba31caf SHA512 1565433ed265681b2b0fc931cfc242c47eafd8f66aee26df935fd1c1cf18dfcd03c27e8da940b73bc3a5129778a92ac40f6a3f209a030530a8d370395ad88a20 WHIRLPOOL 95cf8e766f1b3903b3cc8826205f7fa5d826c085e49454c240203162abc090f23ff48779e40c251bf09d2a16060078f66817c87c9063ee4811fb73ba61875e35
 DIST chromium-23.0.1271.40.tar.bz2 217508369 SHA256 80a6c896cdbce8bc0c31367c0de61fdd0b4d0fe5bad247781dc9ecc373ba3e94 SHA512 8b14ed830323bda91542516dc3e2154e274a6c8cf3b687493c81c9a6c65520dd2700988362fdd1d7d3fa6458b6d8c251a23d1f80c9438edbc9ba35be0741dc5e WHIRLPOOL ac2050ecec5d3588961d891573fce881e2491709a46c629353681428f71d7b48fecc4c0de5effadba1e7435603aa29c66e3a930615c664caf70702532f63a335
 DIST chromium-23.0.1271.60.tar.bz2 218496617 SHA256 c25db31ddce24223c4fafa99301a16e029c2b4e3c7621e65d2549ee1d5114af7 SHA512 4b86841f6d3614442ae8e973551f31a75bc2eaafa775b5b63fa6b56f62f8a8a441bdacc13cbde58194a39dce125eb653f9b6d0a431a3af654a36ab123eb2b1f2 WHIRLPOOL 9fe906cdfb475af187679e066d6d70494d44573a44148df2a0736f38c496253d7928439aa3f6012f5c94aa458041d80de057bd2e8a9a0bf11c431fdb83bfcaad
+DIST chromium-23.0.1271.64.tar.bz2 218498403 SHA256 e894bb22d4747c69fc34b181be3a25e20fd9599ed93f08779df600fe3402ffe7 SHA512 dee210f60951a96aa37760472aa1b90d49492a97642dc8b7a0df5ac712fb393cca98aaf06189e1cd4a4b229e77bca5c30e907d6a7dbabf5d805766ec5e140eb3 WHIRLPOOL f9f630d1dd0aaf5d573cfc353d568b31d6b8fb69578ec63bdd3ee07ef7a55f6ab313c2b8d6a18559fa56b9b37ad43538bc74e23b9823dd4b0482c875fe99fc30
 DIST chromium-24.0.1305.3.tar.bz2 231939945 SHA256 dd3e199edd3288883ce7fd50af5eccd9ae3dd871c784c17560170d1b8b2849a4 SHA512 cb5b13a378962fb62463693d3ec681734df9a2439f2db73accd57a6b55a200edf021f5b442c23ac1a2a703d191ce41dc85a168531923f184e378f6435b0d2955 WHIRLPOOL 7a698c8b84a12dbb4c100b4c697ae5725f8df4d1e380d1a8fd0905fedcb578fedeaf73096b99ed7171a04926772d1d7e7ef87e56c1f2762ced9ad7b0458eb8e7
 DIST chromium-24.0.1312.1.tar.bz2 185732419 SHA256 80b2c409bf7a20677519883dc0b31ffd13c5b562ae98d32cd0daa80ed18b1df9 SHA512 b32f0536a5638f9fa0e3fae32f7ae721777ad1e30788b174541bffaf11fcfe0b5573cea7d7c5711b0f21640cdd5f5c475e3b1cb279f3d26c38adc59be5b6a60f WHIRLPOOL ed313e34a549091d986a0a022cea51df87233c52b2198ffce0f5d829650504fbff0641734e27c8084c61a1950e2d666c8d4cd3ee197295d7573448678c263c4e
 DIST chromium-24.0.1312.2.tar.bz2 185724804 SHA256 d050e5012c2704a5aa96e6ba6e7e9eea7cb6c1b26d1c53ebdfe23273aa36b494 SHA512 1ccaa171cedc774f3470863cb2db42e6bfd9720f61f4c08172d3547ee9b7a57986c159fcd7cb74b86aea3ab40b51419ceb4274818452dce4f434a36c2a6f0012 WHIRLPOOL 73979a526d9f4dda6deb0afd989d2a8b6cde98ab4739002b566919554379ebb481734f86c046abac27b0af2fc73758e4e17c83c5551b39132e66dc6d7828bb1f
 EBUILD chromium-22.0.1229.94.ebuild 14131 SHA256 ef4134367a577cb523e75eaaf4b8352603d973987d315eab108847248ea70d5c SHA512 e138691820ef87e94df49dcb1026e9495f1c79d0a422365417e4c5407b1f009f52306b794f00bb6bbdbef39cc98b363a13a03c71bad2f6626ff4e5c12d3085f2 WHIRLPOOL 9b9a5637fc04726b9e65215467bdcc73e5f0e4c7d3654b5bdcc7cf4e5485a5f3a292b06eb8ff406017b3fb098a19ed041f5b421c4ab775437dba18f6b07758af
 EBUILD chromium-23.0.1271.40.ebuild 15476 SHA256 6e906fb5a1e58d635d882b9af05a82d7c79adb21767fb928b49f9cd04e3f1c85 SHA512 b6ee46b68487af17b5d2f4d6089aa751c6940e08fa5b0d44c1eab90e92509d1716707491c8b0f1181156c82fbdd2450d087159b6d1362aa49c72d3693b9d97c4 WHIRLPOOL 4cb5f6a25545e518150f2877d10684ec9c20b5065c60a72c9ce8d5e187e37a5054ad07753d4553446711a48cf58237d180de9db69d21db20877b3c6bd534eac8
 EBUILD chromium-23.0.1271.60.ebuild 15476 SHA256 d2bf1192a42356cc8fa2a5d883993eca4e3912ae601def65d9b017a61f1cbe44 SHA512 3c9eef334c186b68f1dc44d88b023b88c31005d8a97722c925255fd9abfa77339dc18674b8ee3db9b37099582da3c73eb5418a97fe6fce896984596d2097471c WHIRLPOOL b80e4c08b795badcd202d523ea0db5e399d2ded14b781cf73e951d2d7a8036836b54b68cc60864d4dd592fff5bd154921b83404d2b2ac9ba5968e7e0dd76224b
+EBUILD chromium-23.0.1271.64.ebuild 15476 SHA256 ca9d45d2d813c9cf9afee37c68336bcb25f67f0b47e5c5757e5272f208e10bab SHA512 7877eec25e527bef3f7956068a0988f81da51a5b15233549ba7045a3af7cf692dbc0277b5f3858d4ceffbc8d702b8871c5515250fb733cd20b6973a03f69b28a WHIRLPOOL 037b8d1f3e89a4a9beedfc57c735a5bb408ceec5222bfced19c6db42d75fe94382628a8048cbcb8f249dd9c3585f0da6a3de6115aa1897ae998d3a21e8b95586
 EBUILD chromium-24.0.1305.3.ebuild 15283 SHA256 7f22d91bca6f0a397d85cf2568dec4c29c83c128cfeab0d087e8d051b9133afb SHA512 1f155f1992e2e1e8cb6c58fb10937d15542dd43538ac43b196b31455ef2b4c863e35b9e2294c953e1cc832c65ce39593cbddcab79db1de314ce82ab75e867283 WHIRLPOOL 3045be244e9531c4b71b38d2375c5ff61d4200cce3e98211e39aba0efb9166b9c9c49e165e1dbcf07cc03b733a20b0d3d7dd43a54634069311f30b92f2bc3c7e
 EBUILD chromium-24.0.1312.1.ebuild 15446 SHA256 db30cd42d5178e1f9b63b9f9f4c3098156d7176e0cbf628d9d43fa5c06058438 SHA512 5bca59187a024abdefbc5d198a16c3d0ffd05f2f8b4b9c41d596c3cac57636ab4ee8e1e47369b312260c8177a55d914ee2f00b0dcb2b98c25a2e9137ec812856 WHIRLPOOL b39f21c5bfb8a1adffbd0a283581a9d2338621a7a2793efc5f84326b7ca41f69eb6da32eb2086e48f91bf12dea587c36ca964335ef35750e2e1bd24ff0cd3acb
 EBUILD chromium-24.0.1312.2.ebuild 15446 SHA256 3b83313d795abb8b1bdb62703474473a5135ebf6bd1d66c517422a5c8e15020d SHA512 8920db294c864264a1e301b876197d423d983e0ae1bc04b6465a76cd8cc511a2d1e4584b2f9217fd0bc97db338643f59db3a5a178839270b582f96176cc9ee06 WHIRLPOOL fc7b51f087af74f3f26940accc817435059064751f39348d62c6e5a874cccc9445cfb77510372f65b5a153d73b4e763d6c50507b3d604ceeaa6b287777a7aa54
 EBUILD chromium-9999-r1.ebuild 16538 SHA256 a91b027e1af5493a780cb7e21b364a3186bb11ed528ec8efbc1a1ba1b091c378 SHA512 586a0f3e03af754c0c6324f7cee2b5986384744b20b2b2d006b1a157385a4276655bd1f1b39844396c462bb3e0a93c40943f10e4bf8d5a3f717ba5fd3ae5add8 WHIRLPOOL a9f7f4dd7b444021773715e7a09e0279c52ee06317ab47e4dd2bf753d9764ee123a872a0bbaf3ef5efceac43305bca7489e2510e88790be97266c0ec8dc9bc0d
-MISC ChangeLog 42708 SHA256 59e16963eac6a442bbe6453abbfc5ca57c24ce4f378e4763a71320e1c12d7b31 SHA512 01fbd9e4f0a89e8e9f2c4f50f6d393a58efe13c5749136c3e70332ec9eab37930e479c5d6bc9bd938eafb7ca7c72b47267058a96dabb125d4ebe6614e20eac9e WHIRLPOOL 9fd31b02f00d56238f29574346d183b5a9e0e72f6aa5ca699eafe508a60038773a9c6ade49d968bae1a5471423cef1750153f541d5ec31e9c857be3311ba9018
+MISC ChangeLog 42847 SHA256 8de9032c6c5cb49a032d836e9e91bd9779e5fe5549b174eeef30d3b3e165cce9 SHA512 90970b50ee90c5e19d8cdb20ccf799723f46a2517a950f6965d6e7ee1b9dfd2440e2aca6b799ead9e2662f667388f8d07ad8ec0dfa6dc5996ebd72bba60edda2 WHIRLPOOL 1a4dc57500802cf78e09a4603bf808943b68b5262bf3a6977914815f7ecd61461743bf8d7aec83dd50cdb02306696165e2ee624c1b7fd3b78e2317e7480fba0c
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
-MISC chromium-9999-r1.ebuild.orig 16375 SHA256 9f7dca7a0c6b2fc3d9c526a5306d155ca4d6468637a46c04a48b1d9e0f430edd SHA512 336ee63ecc4be3ac92bf6686f7afa1d440b07b800f967e4e3fd8904d789ac07d6db738851a73483e1af454a21ada3aa4df8db6b7d1550f5c9902485fc67c1788 WHIRLPOOL 2c0f0d5d661111a5b919a0340aa03f5c84595428e63401265ec762d43dcfa5fa9a58b6dbc07dee28e53035dd31474d13513d6e31f04f7fe2c55169321ce7ea91
 MISC metadata.xml 360 SHA256 4c2cd208e61300491a73f23e90a6d1b447a4e0d16ad8f54ae68408eb94357e60 SHA512 f70a2eaefadf05baa375064fcc452982cbf6a5e775ba5b8fc49780ddc3910f8d18f9e5713b8ef083567f2d0bde53f8f9626afa4b4bed7b9b1ad30f444e42c14c WHIRLPOOL 6d7df2df36e34a6111c869f90636876cf30883c623d594e3a4830b156e2f14e938a739e5cf4089cd2ff7b4fb79d0e323725b984cbee9d466d735971ad2555f06
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCTU0MACgkQuUQtlDBCeQJvRgCfcQkN7keuN88r2p7RSya1n1C8
-5z8AnjzewFTYglXNOTIemmupP0h/vcxK
-=au61
+iF4EAREIAAYFAlCZtBEACgkQC77qH+pIQ6T/YAEAkxWup0/sOG3dTiZVQB2QhKjm
+n7mmhENXaiFhG5rmDHgBAMTmU5nufyZfs0pU/D/bqWZPD8FHKcxvXb/NhzdNPLdc
+=JcEw
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-23.0.1271.64.ebuild b/www-client/chromium/chromium-23.0.1271.64.ebuild
new file mode 100644
index 000000000000..78bcc4f2d902
--- /dev/null
+++ b/www-client/chromium/chromium-23.0.1271.64.ebuild
@@ -0,0 +1,502 @@
+# 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-23.0.1271.64.ebuild,v 1.1 2012/11/07 01:06:23 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 tcmalloc"
+
+RDEPEND="app-arch/bzip2
+	cups? (
+		dev-libs/libgcrypt
+		>=net-print/cups-1.3.11
+	)
+	>=dev-lang/v8-3.11.10.6
+	>=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() {
+	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
+
+	# Fix build without NaCl glibc toolchain.
+	epatch "${FILESDIR}/${PN}-ppapi-r0.patch"
+
+	# Fix unnecessary dependency on dbus-glib, bug #434346.
+	epatch "${FILESDIR}/${PN}-dbus-glib-r0.patch"
+
+	# Fix build with system ICU.
+	epatch "${FILESDIR}/${PN}-system-icu-r0.patch"
+
+	# Fix build with system speex, bug #432748.
+	epatch "${FILESDIR}/${PN}-system-speex-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/ffmpeg/*' \
+		\! -path 'third_party/flac/flac.h' \
+		\! -path 'third_party/flot/*' \
+		\! -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/mt19937ar/*' \
+		\! -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/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/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"
+
+	# Optional tcmalloc. Note it causes problems with e.g. NVIDIA
+	# drivers, bug #413637.
+	myconf+=" $(gyp_use tcmalloc linux_use_tcmalloc)"
+
+	# 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"
+
+	# 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_speex (needs additional shims, bug #432748).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+	# TODO: use_system_vpx
+	# TODO: use_system_zlib (forked, bug #432746).
+	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"
+	elif [[ $myarch = arm ]] ; then
+		# TODO: re-enable NaCl (NativeClient).
+		myconf+=" -Dtarget_arch=arm
+			-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
+	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
+}