Version bump for beta channel release.

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

3 files changed, 461 insertions, 5 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 185ede8a7abb..ab5b251d7974 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.701 2012/08/28 20:49:34 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.702 2012/08/30 22:04:12 floppym Exp $
+
+*chromium-22.0.1229.26 (30 Aug 2012)
+
+  30 Aug 2012; Mike Gilbert <floppym@gentoo.org> +chromium-22.0.1229.26.ebuild:
+  Version bump for beta channel release.
 
 *chromium-23.0.1246.0 (28 Aug 2012)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index a6c935980c0a..ae1189c0d8c1 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -25,22 +25,24 @@ DIST chromium-21.0.1180.57.tar.bz2 192416785 SHA256 311ba95249ea994747355596885c
 DIST chromium-21.0.1180.81.tar.bz2 192602548 SHA256 f436e0383ee2a52b483ed4074d3ad067a51745545e159dfe32a4f77ededfbaac SHA512 7bf271fc7398cdcc12874f6aa226f35569bcc9d1721c6b17578efa9726135392fe6dc77c4d93c8b9064bd46b3f930b70dcfdce3f43bb2b2cadb919dc25d1f923 WHIRLPOOL f8ec4aeac24cdb9b68b030998c242a655a222041f36fbdc0ee0932a0a0a801ad25d2f8fbfc0a6a41763dba6b438aa4ada505111f9d55651930ac63d0e00a45f0
 DIST chromium-22.0.1229.12.tar.bz2 209869596 SHA256 09b5d0b5bc7c1951cc84ceb5a2a1ea6556aabdc9517e3f872979c6e5dd217bc1 SHA512 6672f7112c3c567b9f4c40e3df86eda5cad19498cdc20f58d4d9848c0ec7881574f1f1e6cf75421fa19fdc1afd390e618d9b32b2852c7b22fec578a8fa64d2d7 WHIRLPOOL c977157ed457db27cecc02e317785a8e1f8327e833e733a75c9673f214cc1f8e14c379bbe251864d926e283b85b9ee4f4573f0afe7f9c953967b82cb9969f465
 DIST chromium-22.0.1229.14.tar.bz2 209857785 SHA256 c53635bba0332a3dfc12c7c06b40e64b64ecd3b97660ad955e83905203e3e587 SHA512 38c232f100bf95038fcab27e9913822dcd9189f1aea9aedbd0b034e10005ecdc2e116aa160dc1e07cf25f21b39a5e6ee4f837d9d10d9f7a012736f77f1d0301b WHIRLPOOL 789aa423d8718f5c9c8b74927e72092af55e41992ed12cf7f209f6e775f07f9bcdc63224cbe6215d947447075b7f8ab3bf45831f882ca3aa8fd1734f6a624c28
+DIST chromium-22.0.1229.26.tar.bz2 209917396 SHA256 7b85a2ceea48d97d985cfb70cd925defbd410b1b625b2cff354bb3b546aed52e SHA512 66e6286648601a1e838ddafe2f6342b80a4fcdd44f5ae3474702e7a15f9a90c453397977d8aaca60093b5dfe81a084c75ad940035f6ad9df99460196e8c5fb26 WHIRLPOOL d4ba5989554955b90edfb698bfe9d61c25ed1f987eb0065a5e0ca7cbf306d6ee3f2dfcddad43415b6f444c1c4fdd818f2998d976c2b7a2fa0e375bbbfead088b
 DIST chromium-23.0.1243.2.tar.bz2 215356298 SHA256 308b319d5165a90ad24d904614966abf6650b206dbc12ce0ae220d066660bac5 SHA512 d5f29fa279057ecbcd5c79df48f49b64bc15a8217e9c77baea620015594ff5da56be1e8627ffb2af7fbcf3fddfed1a993bbbe1439f02e8b65c59fcb869da5731 WHIRLPOOL 54835049cddc886e3411073b756211e79bb3abc645e403ae16fc3940c38dfa96d4239894313ad26a7c7ceed35e186a8976530661062c5e1e83a6c2e8a5eddeca
 DIST chromium-23.0.1246.0.tar.bz2 216003896 SHA256 b71b99c774a4513c78b4c2d767a05420edbfcec5694b194f608105a8f2b7f6c3 SHA512 c6717a9fb174bc1576823a2e39bfdebdcec3493691ff574adb87d02498578759b637451419d4ba3778d4f8885b419cd3e525d793d43b10236d71d45dae25575b WHIRLPOOL 763ecb8dee3a64f3a56b1d2fac6239e4da084cf69628fded309ae3e8b95dabaf1310662ef8da302a261c9236d8567994c54e426ed57abfcdd0e5b18620570b18
 EBUILD chromium-21.0.1180.57.ebuild 13975 SHA256 2e5ec11d48c18a39a415699649ec83a791d9627735dcaab07cfd07c204c7fd96 SHA512 2032ac98eb1940a9d8d91eacb8c901d12a6c50417a71fa4c5814413d9150ccc782f3469b463be3257fdbfa5c04fa0b56fadb74d1e6a62bb72a541524a2504a62 WHIRLPOOL ff69f9e4cc1829363d9ac61e15b4033ff6844225c1d50ed7d0b2417b8df83e78da1c5f46a627cff757d9df324a90ef64b30a316f5aa40edb710f89a38ccaaef3
 EBUILD chromium-21.0.1180.81.ebuild 14032 SHA256 567148e0a92c7d10d1f7dfc7033706355bd45f396a47d499c4eafe73092e56b5 SHA512 6713b8336594a9553af6d28f9b6827eac67e0cf910f23f761a61565061f4f7a3f0caa37556e3952427e93125b48a66d859a912c44ed0f03dc711ce27a6ae691b WHIRLPOOL 00e51ba9ab8966eae0f36f5498bc6240372ddc88fac1c382a590dbb1579d2829e6acb7724cac71118b4bf72c62742e7e24328f5d00e4cf85c08b240851830a86
 EBUILD chromium-22.0.1229.12.ebuild 13948 SHA256 32cc25014fdfe9222e66457f5fd6a631af25282e3bfc76ee512a8bd1d97c4957 SHA512 99c202ffde955dba4e45f2577c1712230400b2a706f4bbc87465729aec995f348c1bb454015f287fc09ffebc87ab27b217762ab157d04f79a29a9b67fae64585 WHIRLPOOL 49600f6eb3df94d72687121b0b3182150a587b6e73124977998f80305dbbd3d4384837dab1a4ac8cfc89c5ea6dbdcea5829f339b3a304ef9c92de6efce226c68
 EBUILD chromium-22.0.1229.14.ebuild 13948 SHA256 d5e591f6210fe0828e1c2aedff765a57f89425d8a270feaf66a95066ba58df1c SHA512 bd175d4fb8a56cfcc14e0242ae5737c4a0f5311e66d050dcdadfcd6b94510fc23457029ac68e0c0263669f472148521b81d6ab19f578dc69b51dbcf922cbc9e2 WHIRLPOOL 7cab6c9577941b2435ff1831189e49470281072fa989f6a640e2e7584b7b5fbb9a827f0ed4e10516f292ce312998c6a0552703310be6dda810cf2bf33e2b8301
+EBUILD chromium-22.0.1229.26.ebuild 13948 SHA256 f8e5b08e74d7806b4ac3069a7a91a4a28df9857040b3cdc6b26ef3474bc74111 SHA512 2e3832f6483f261ec1ac1d42304e7f98afac715ae9aabcc7fe78e386395d9ef55ed3c714a26048d37ed0a6560c60ee51ac0cd40e5033f2494d9c6d9d863fcb50 WHIRLPOOL 74478c0e7cfa1cd646591bf42fe27ed0133245265907dd1f3d450019e6fbe0648e24a9a6d9470c51a2376f5af1b55b9302c56a09d6c2a35e0d16188328377999
 EBUILD chromium-23.0.1243.2.ebuild 14477 SHA256 8aa0cfdd3b15931bbbd540453b1d3cc7b4443c40f9ca1ede977b8d076af0cd6c SHA512 dfdc0f8eae6818a137956bc657d6b687f6899f03b7ecc66e10450aad47301c6b72fb2c0de9b7ec0c1d338672257a66035483e00acc64b91e091f483b00932824 WHIRLPOOL da4d09f3bd1287abc9621d5d02a56a261aaae0d2651f8c8c6868b9685c05a35f29a1f048c3a1111faf026b509e6f8ba364299f106ee90c581f40888fd2c50897
 EBUILD chromium-23.0.1246.0.ebuild 14514 SHA256 7c0836f78c025824ae101fcedbfa00887a7a6f855c8c749736df072605da055f SHA512 e701352f7c84ea02afea72d364e172728b7e4f125ab8bdc58fe22a9c05f37fb67513efb4d90e2c5174b8be03c17e94c57cbba23fbc27ff666d21cfd5dc2aec20 WHIRLPOOL fa1884dcfb4a2805dc43d2482fe788e1e6f2e0c82c7366858be188d0a9cfa448c41d1062b7462e625542fbc5ecddf12c20f49354b6e398df1ede311b9ba674ef
 EBUILD chromium-9999-r1.ebuild 15677 SHA256 023163b6a5fbe86d5321f0da9c73095bd978499f2633f633b8bcada2dcaa2b36 SHA512 1b45f8e53db68a64a85d9a29030f6697009f5e30992a69ac4a774d1a566cba08313a2b198cdd4a7c303f22d991b8b204ffdf43b90e6121dae84511697cf4cb85 WHIRLPOOL 40973031791e46e8c2a9c8815c295507a37603c0393b9d5241292fc1ad97aa8a4ad4d1c20f02676a9f4d572e8edaf390f080778c5c81d41c4a14d7f4160a126d
-MISC ChangeLog 34707 SHA256 b51a36db72ebf402d9a61308f94d31a50035e8759548b72b1f73fbe1948c5f0a SHA512 a9025f1efa050bba31a38664dc4699c5e26385d2d30bf27dc793c0dde74b9e13e603aaad37983feacfe07a652ade4fd53a47b2742752dd9e30260ab498e2e2cc WHIRLPOOL 3946744ee92a706e8feaa2f8c69b926f6b2f96b7efb56429c2e3a3cc55ac795c13f9cdf50c436778b165ddbc42882b99092118c4eb2f624f5edc8787e1cf89cd
+MISC ChangeLog 34867 SHA256 db848399a9517f4c2116ccdfc3e732549ec8595f84ff835879838b816436c5f3 SHA512 a7bc46dc123c1afa108f29886e170a32639522534b7125cc547180eaaf28dca42af53c1da3d66ba5cc41a403992c8e1377c4f96d53285bf5e62dbb5cc0a40bad WHIRLPOOL 2b051633f764dcbf11c8a566f9c5f9e103d3f51a62043be3a0a9fdbe62a42fa69c0f670505fba28a47e363d5d7e564744bab332c7cebe49b721dc7c24dc215c2
 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)
 
-iF4EAREIAAYFAlA9LuQACgkQC77qH+pIQ6TjSAD/aQJEvojoRV/BicUD1lBXwBFr
-2vIlDW+NW3vLI++JySEA/1Wl0SAFcLm7+92eomTzZo1OZutUgSpp4NK2AG2ccaRg
-=e1P7
+iF4EAREIAAYFAlA/42MACgkQC77qH+pIQ6RQRQD+PSUglfMrWslhL8czV9dfvUDK
+EWdjZA90Lt/TpsHqk3gBAIs3WFgVXIKxI8OiwrDbej83RXYy4bxG0Tfn78m02wEz
+=KGVV
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-22.0.1229.26.ebuild b/www-client/chromium/chromium-22.0.1229.26.ebuild
new file mode 100644
index 000000000000..2c88cd394b6a
--- /dev/null
+++ b/www-client/chromium/chromium-22.0.1229.26.ebuild
@@ -0,0 +1,449 @@
+# 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.26.ebuild,v 1.1 2012/08/30 22:04:12 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-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_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/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
+	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=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"
+	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
+	)
+	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
+}