Stable channel bump.

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

3 files changed, 578 insertions, 6 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index ffa2857cedd2..7352f86ec110 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.933 2013/08/18 02:33:26 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.934 2013/08/21 01:27:40 floppym Exp $
+
+*chromium-29.0.1547.57 (21 Aug 2013)
+
+  21 Aug 2013; Mike Gilbert <floppym@gentoo.org> +chromium-29.0.1547.57.ebuild:
+  Stable channel bump.
 
   18 Aug 2013; Mike Gilbert <floppym@gentoo.org> chromium-9999-r1.ebuild:
   Apply previous change to the live ebuild.
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index bc704c9a6eb2..2eb54fd45421 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -28,6 +28,8 @@ DIST chromium-29.0.1547.32-lite.tar.xz 124405536 SHA256 7efa72b9f75aed65a7400740
 DIST chromium-29.0.1547.32-testdata.tar.xz 108869168 SHA256 39f10c55f52f7aecf631d15094dc58ad484061049a6c94a572607b4d136953d7 SHA512 dc5d8cbdba42946298a95e6b54c8e53ffec9e8d8fc2b262382ad6a3f042bfd15b00cbfa102cfddc58742b1550906f138ead7d8f9eead0910d2f919d753498343 WHIRLPOOL 7198cab6f9e0eabdf09a5d41188325af4295c489f2dd3383a0f4558d223b2d73b0c526914830485f5fd6ff0774c1d977cf1bc1e4a46054539f7715053ae76b20
 DIST chromium-29.0.1547.41-lite.tar.xz 124466740 SHA256 6af345b129b9b96c8035c464b539e872b9f5e6aea1426578f036f30590f97851 SHA512 01b8cfc7459df370bd73621d6dc9e0014193b17c2c3c4c4d0ba21214d95ed4ec6fdf11ff7c28e4177153d2bbd48122bce57c85f19139fa8a452b98bedf9f7c2d WHIRLPOOL 554f2bfdf481899c6c38ffb95a08df9d7d8b93b5e7a7d4a51da77f1e52869c6a14f8c4f08aadd1bf2f5851e5951fed942ff73551dcd25b4a6d6fe715d1b865fe
 DIST chromium-29.0.1547.41-testdata.tar.xz 108867764 SHA256 9238dcf62ebcfd81f179915909be947d9ebda1ab623eabdb0d2f29258a1e7ac5 SHA512 ce9feeb7197a9e2369ab93595f9181f522da9b4d9929187b552f4fcdee743e726c8ab0b4dbb8ec804eb4d5ddc546fcd5693a064c354270e77d4cc0b8f6820d51 WHIRLPOOL d653a0c4ee579e6eeef0e990ad05510748a9332ce846c2b52b60010f5d749262c35b99791ee21ca362a89dbfcf3e73696f80a7597ae80435a967624b9b3b1b3f
+DIST chromium-29.0.1547.57-lite.tar.xz 124488252 SHA256 30c949120f7fb2e1d020b4a9d755baf139cebc9a1dbcc32cb06db2314c917805 SHA512 5b697d106013132cf12daf7f8c636637ca2b42ba3fd7bd6e1cf7bc29958e9009ae66b1232f19021f6e6314004a75061d18c752150399a5c274e63291c8e5af27 WHIRLPOOL e8c62ea0816032786f875b909f18f20f884fe25ac94a7e99d11b4e28ad30431754a56918baac32da063fbc3c6dcdb700154882bec77fa870afc1b5bf50b0b6f8
+DIST chromium-29.0.1547.57-testdata.tar.xz 108866300 SHA256 76f73b00cfe8de9453a34f5b874761b55ceaab8a13501c2c630bfc4b38bdeb42 SHA512 7911b20072e22a7279d473d4b13f2d5fdffdec77dde4edcf1deb025d7cc63d3d28e72281ac76c4f2afea780ef69eeb7934de31aa29c7af94c038fd82fbc226fc WHIRLPOOL 0bc2119dc72a6cf4fb783d21da83cdbe2cc170b5d680b50533042c7ace431817414e01e952db9ccbcbaf17c1fb162b437f345631fa68837d02eeb8192d3d40fd
 DIST chromium-30.0.1588.0-testdata.tar.xz 108831920 SHA256 ef3106c7c2c6592cb682c53634460ec55fd7752de78373125ef631780dff8dd6 SHA512 4b77180836b1706b509b3d0885a84e75fb206c6a2efe3775fc26fc35dc78924f05945a774466c44e0116c4d0bb06d794176e6f431e59a54d8a7bf808cc011747 WHIRLPOOL c03e0a8e5576064b7387cc71ec6c9341be3878a5de1e22180c77d7a029aab630a7aadc6ef8b172668873925f295c25a2b689528be3ed8459e9f63b4ba08682d9
 DIST chromium-30.0.1588.0.tar.xz 190423912 SHA256 235cc44e3dc6fb7212548bad21697e341afa2f84ea732437eaea95d3e6158ccb SHA512 eb5cd9d524860b8fb805b56b2e96f4957d25bae6ad78d705d311fc05d7f7ceb7c6e062f21f1857c6dc3245e38844933657b9c926e00c7f00697c141c2e0a792b WHIRLPOOL e9c0960b823e725e9bdf27c8d6ed4e71a076f8915f2badc86007157772776f181adcdad6b0be38dcfc251e1b4f3b02b0bc295f58e807fe6dc9721db1499dc490
 DIST chromium-30.0.1599.0-testdata.tar.xz 108831056 SHA256 278bb78826abfa60732648d980dba0f90f4507d1c89f5443617e072d7ede73d2 SHA512 e589de95fd65f6b3d78f6c63b2b189fd511a1a5c1c198877d83ba1eda431b1696e21f8f9077a76bf50bc5da8530dd4631a48b7fc5cf19f960532cb20b608cd32 WHIRLPOOL 014917313ec86ccd485316eab7496a8cf1c9140511dff7b27153a6b912c438e8d9bb24e722a559a3726766795f7bd318e005e6c0d1f5e328df95205aea6290c3
@@ -35,16 +37,17 @@ DIST chromium-30.0.1599.0.tar.xz 158879916 SHA256 b32fa87680cb3123d95aa72bcafe68
 EBUILD chromium-28.0.1500.95.ebuild 17322 SHA256 12a30ca6db6ea0d9a5d2e2f2d004d235d5994261aea9bb980224ccf8c1d0d0b9 SHA512 45c68c81a6534c0a06f56302ca0715e88be1581de4b31c7989226d64bf85faffca70fc8f45dfe41d1f96d647e212f23c853a6af4f301a0af2380430c9049577b WHIRLPOOL dbada70a3f8bf6f0b852f31d0e7fc9f51d0eec52ef31cf6b36c2b3511cc8b9785f18caa8dac14d0c4ea5c06137710ea5496fc00c4d94b14770ddd9a162d7add1
 EBUILD chromium-29.0.1547.32.ebuild 17505 SHA256 ee6c483f2a9655843ffca5c078b960ab2c9034eced6cc892b600f692f4346a90 SHA512 468b19585764c1a25700bd77e343b606deb8ad46c6efc82b66a8638769afd9a7fdb44c07a41cb8b4091286c81e1edcc758c80b208854d5b31c0fc709b0b30f80 WHIRLPOOL 219806308173146a74a7ca82db549f182de1b304d5eb510b80bc5df358e2f85762db60ae8470c85642962d639df9b3189207daf6122d6f4464e44a46859b24c6
 EBUILD chromium-29.0.1547.41.ebuild 17327 SHA256 fc34fb433edea59df1dedb21ff28d9808e073146b8ef4b2ec3f2b7ee68e957b2 SHA512 77d6b0e8571877d1bbf6af78058dbc906854432722e18705525635762ab2f83bb858aa0a8240fbb30a4788b97a5045b54ca308b43ec3a3d1d4cea04670ee81d7 WHIRLPOOL a2a00568e54625ee23ebc4745c11f782de8c7f4456c09fa29447834fdef1f38069e17b7c9a4c29eb7a40a6dbea7511b37360cde19cd0a387f55b4d2ddba95f6b
+EBUILD chromium-29.0.1547.57.ebuild 17324 SHA256 ad0bbd98fb727b7bcdcfabfc0018c39fd923b6c248ed0bd58deb66d86495684f SHA512 6d4dfd34e73c33f3238424f1f909888f006ac845cd6d38b513949d5cd9f6803391bdd06311fc0dcee512682269231b813af54caee2ec189529b2a16a1aadcc30 WHIRLPOOL 131b74a117627f19acb37852bc1705648cfe9f704c6ab295920d70ee9e222f414ee897b8d605b27d347d0b98ec29ce3cac77f9b2a8a47334447785408225b063
 EBUILD chromium-30.0.1588.0.ebuild 17856 SHA256 a46ad330a1e370988b2cc71744a45d58dd0b893302d1c9a4af4d9c3de09a26e1 SHA512 927409341a82b69b9fb3d461b520f54d0e69f3dc0d4ec9d13b03e1c10f7d3bfef3351d8a012e096ca008e52f1a1b822601029b07120aae852f22f07128d549e6 WHIRLPOOL 2ace6cff3eaadc26b65ea1c53a563c56ea5b43b82f816fd02e74885cb743476742a72694a849a68dc7ac0e7acbe4a796bfb8444b5f082b382b2927607db17f94
 EBUILD chromium-30.0.1599.0-r1.ebuild 17766 SHA256 d9b61be532ce3c66efd63abade1475bb0901757aedf80286b1cad05367c1afe6 SHA512 9c7d074a44097aafcb50f36ed8f9cff6a344938d83391636fd6204c43a4f9c32f29e271d7144e7c3bbc4795fe2a26190b2512ef1adca8b8bc7a6c23c73f54c64 WHIRLPOOL 8ba9fbffe6c0dbf14ce2eec1ec7ea9375ca0453e13a98047b06233709cf158dc6e617f6e5373b72d8491e2637301cb1b8792cedcc2940ce152d3d12717508ef1
 EBUILD chromium-9999-r1.ebuild 19802 SHA256 e6dea266f90450409e66bdbb8b37a08ad37181ddfc805464d207a9771eed518b SHA512 c2368c5e3451c3fe52e394cafcd18bcfe8768dc77469365c690c03fd413954d92d623ec50f4e1d0747acdd4620d4a4d1759e55fbafd7002d5ed75ff2002faa24 WHIRLPOOL 64ca308301b86dec313058fbadf301dfc0d8b4c927a4c82191cdf953b8a325c8dcf565438eb3e034a0a5a46de89d682387d2536a912eda934f6d8f4b51c971ed
-MISC ChangeLog 79498 SHA256 2842d487ff8071baac9762a5e59a0497a776f262540bb2ebc82b491fb6787652 SHA512 ad8199c610ce9396ed6abf5bca7fb12f16a3e893ea88a4202ce11ce9573ab5745d91a483f6b6c2e4d81447badb4735b136958839f86e7463865a7e4038fa30ab WHIRLPOOL 609e1dcde32cec7dac03d2fe930c97f5b1f71119d3ffa9aab8b7565312d7d083546225bef4ec0fddfadc1ee6c987dfa27866d6b08011fd24b0ba307bf48ba1c3
+MISC ChangeLog 79640 SHA256 667ec6d94c7b80d3e18fbb7e285024b6a1ecfe6c5c93576b49d8acebdc4bb78d SHA512 437a01e1fe7fadf4451d5fa81cb10484cb4b68bf2753d8b9decaeb11641c0e78a441fd29d3f8c8e4d02578b69fadcc4318699d9b95ac23fa27979c468bca3300 WHIRLPOOL fb4c61edfd44e77d32e67c5a7698e46012708d8bb77064730b7134359c8590a82cab462756b8d2da81d0c690d0a7315cf67311b9bc558ebb4b94324ea2fdfe25
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
 MISC metadata.xml 703 SHA256 ab48e17b94dc6a8e77b4ef786b60e1518ec079a6b79a733586ac4f39c316ea7e SHA512 4e96d1190cc6d3f1bba5dfcae6bd5699cf9710b8c4c75a1ce66974824cb4f86fe0917f81838c9fb254f0be064e07ce9060d4677938a3a819cff7d1b24e33df1f WHIRLPOOL 4705ddaaecaf5dfd1c611ceabb905991495105078afcacf71b6f389cd3a0649ce46f954ce600ab9e6f66f05d55b4727f856e6c469b0995c2457c8c3715eba8b8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iF4EAREIAAYFAlIQMngACgkQC77qH+pIQ6S6XAEAuOcYTOdF/3VrirnDNX1kbQ9B
-V5FmxI3yo80CRi+uNY8A/iOo48q5AeNf9sQ/CTzbXgTp2X79258E3gycTImvbdoE
-=Ahdo
+iF4EAREIAAYFAlIUF44ACgkQC77qH+pIQ6QASwD+MXoe1MFgtR3TyXXkab8hx0OY
+ZCCs9DglcmV0XxdVJFMA/14m7UjwhNJXsWNkwe/maOFKNGN7CBtJUwgZ/vsjH/I+
+=9X9L
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-29.0.1547.57.ebuild b/www-client/chromium/chromium-29.0.1547.57.ebuild
new file mode 100644
index 000000000000..98113f1138c0
--- /dev/null
+++ b/www-client/chromium/chromium-29.0.1547.57.ebuild
@@ -0,0 +1,564 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-29.0.1547.57.ebuild,v 1.1 2013/08/21 01:27:40 floppym Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+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 multiprocessing \
+	pax-utils portability python-any-r1 toolchain-funcs versionator virtualx
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}-lite.tar.xz
+	test? ( https://commondatastorage.googleapis.com/chromium-browser-official/${P}-testdata.tar.xz )"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="bindist cups gnome gnome-keyring gps kerberos pulseaudio selinux +system-ffmpeg system-sqlite tcmalloc"
+
+# Native Client binaries are compiled with different set of flags, bug #452066.
+QA_FLAGS_IGNORED=".*\.nexe"
+
+# Native Client binaries may be stripped by the build system, which uses the
+# right tools for it, bug #469144 .
+QA_PRESTRIPPED=".*\.nexe"
+
+RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
+	app-arch/bzip2:=
+	app-arch/snappy:=
+	system-sqlite? ( dev-db/sqlite:3 )
+	cups? (
+		dev-libs/libgcrypt:=
+		>=net-print/cups-1.3.11:=
+	)
+	>=dev-lang/v8-3.19.17:=
+	=dev-lang/v8-3.19*
+	>=dev-libs/elfutils-0.149
+	dev-libs/expat:=
+	>=dev-libs/icu-49.1.1-r1:=
+	>=dev-libs/jsoncpp-0.5.0-r1:=
+	>=dev-libs/libevent-1.4.13:=
+	dev-libs/libxml2:=[icu]
+	dev-libs/libxslt:=
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.12.3:=
+	dev-libs/protobuf:=
+	dev-libs/re2:=
+	gnome? ( >=gnome-base/gconf-2.24.0:= )
+	gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2:= )
+	gps? ( >=sci-geosciences/gpsd-3.7:=[shm] )
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/flac:=
+	media-libs/harfbuzz:=[icu(+)]
+	>=media-libs/libjpeg-turbo-1.2.0-r1:=
+	media-libs/libpng:0=
+	media-libs/libvpx:=
+	>=media-libs/libwebp-0.2.0_rc1:=
+	media-libs/opus:=
+	media-libs/speex:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? ( || (
+		>=media-video/ffmpeg-1.0:0=[opus]
+		>=media-video/libav-9.5:=[opus]
+	) )
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	sys-libs/zlib:=[minizip]
+	virtual/udev
+	virtual/libusb:1=
+	x11-libs/gtk+:2=
+	x11-libs/libXinerama:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libXtst:=
+	kerberos? ( virtual/krb5 )
+	selinux? ( sec-policy/selinux-chromium )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	!arm? (
+		>=dev-lang/nacl-toolchain-newlib-0_p9093
+		dev-lang/yasm
+	)
+	dev-lang/perl
+	dev-perl/JSON
+	dev-python/jinja
+	dev-python/ply
+	dev-python/simplejson
+	>=dev-util/gperf-3.0.3
+	sys-apps/hwids
+	>=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 python, bug #344367.
+	python-any-r1_pkg_setup
+
+	chromium_suid_sandbox_check_kernel_config
+
+	if use bindist && ! use system-ffmpeg; then
+		elog "bindist enabled: H.264 video support will be disabled."
+	fi
+	if ! use bindist; then
+		elog "bindist disabled: Resulting binaries may not be legal to re-distribute."
+	fi
+}
+
+src_prepare() {
+	if ! use arm; then
+		mkdir -p out/Release/obj/gen/sdk/toolchain || die
+		# Do not preserve SELinux context, bug #460892 .
+		cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
+			out/Release/obj/gen/sdk/toolchain/linux_x86_newlib || die
+		touch out/Release/obj/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
+	fi
+
+	epatch "${FILESDIR}/${PN}-gpsd-r0.patch"
+	epatch "${FILESDIR}/${PN}-system-ffmpeg-r7.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_dx11/*' \
+		\! -path 'third_party/cacheinvalidation/*' \
+		\! -path 'third_party/cld/*' \
+		\! -path 'third_party/cros_system_api/*' \
+		\! -path 'third_party/ffmpeg/*' \
+		\! -path 'third_party/flot/*' \
+		\! -path 'third_party/hunspell/*' \
+		\! -path 'third_party/hyphen/*' \
+		\! -path 'third_party/iccjpeg/*' \
+		\! -path 'third_party/jstemplate/*' \
+		\! -path 'third_party/khronos/*' \
+		\! -path 'third_party/leveldatabase/*' \
+		\! -path 'third_party/libjingle/*' \
+		\! -path 'third_party/libphonenumber/*' \
+		\! -path 'third_party/libsrtp/*' \
+		\! -path 'third_party/libxml/chromium/*' \
+		\! -path 'third_party/libXNVCtrl/*' \
+		\! -path 'third_party/libyuv/*' \
+		\! -path 'third_party/lss/*' \
+		\! -path 'third_party/lzma_sdk/*' \
+		\! -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/pywebsocket/*' \
+		\! -path 'third_party/qcms/*' \
+		\! -path 'third_party/sfntly/*' \
+		\! -path 'third_party/skia/*' \
+		\! -path 'third_party/smhasher/*' \
+		\! -path 'third_party/sqlite/*' \
+		\! -path 'third_party/tcmalloc/*' \
+		\! -path 'third_party/tlslite/*' \
+		\! -path 'third_party/trace-viewer/*' \
+		\! -path 'third_party/undoview/*' \
+		\! -path 'third_party/usrsctp/*' \
+		\! -path 'third_party/v8-i18n/*' \
+		\! -path 'third_party/webdriver/*' \
+		\! -path 'third_party/webrtc/*' \
+		\! -path 'third_party/widevine/*' \
+		\! -path 'third_party/x86inc/*' \
+		\! -path 'third_party/zlib/google/*' \
+		-delete || die
+
+	# Remove bundled v8.
+	find v8 -type f \! -iname '*.gyp*' -delete || die
+}
+
+src_configure() {
+	local myconf=""
+
+	# Never tell the build system to "enable" SSE2, it has a few unexpected
+	# additions, bug #336871.
+	myconf+=" -Ddisable_sse2=1"
+
+	# Optional tcmalloc. Note it causes problems with e.g. NVIDIA
+	# drivers, bug #413637.
+	myconf+=" $(gyp_use tcmalloc linux_use_tcmalloc)"
+
+	# 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"
+
+	# It would be awkward for us to tar the toolchain and get it untarred again
+	# during the build.
+	myconf+=" -Ddisable_newlib_untar=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_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp (bug #459932).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+	myconf+="
+		-Duse_system_bzip2=1
+		-Duse_system_flac=1
+		-Duse_system_harfbuzz=1
+		-Duse_system_icu=1
+		-Duse_system_jsoncpp=1
+		-Duse_system_libevent=1
+		-Duse_system_libjpeg=1
+		-Duse_system_libpng=1
+		-Duse_system_libusb=1
+		-Duse_system_libvpx=1
+		-Duse_system_libwebp=1
+		-Duse_system_libxml=1
+		-Duse_system_libxslt=1
+		-Duse_system_minizip=1
+		-Duse_system_nspr=1
+		-Duse_system_opus=1
+		-Duse_system_protobuf=1
+		-Duse_system_re2=1
+		-Duse_system_snappy=1
+		-Duse_system_speex=1
+		-Duse_system_v8=1
+		-Duse_system_xdg_utils=1
+		-Duse_system_zlib=1
+		$(gyp_use system-ffmpeg use_system_ffmpeg)"
+
+	# TODO: patch gyp so that this arm conditional is not needed.
+	if ! use arm; then
+		myconf+="
+			-Duse_system_yasm=1"
+	fi
+
+	# TODO: re-enable on vp9 libvpx release (http://crbug.com/174287).
+	myconf+="
+		-Dmedia_use_libvpx=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 gps linux_use_libgps)
+		$(gyp_use gps linux_link_libgps)
+		$(gyp_use kerberos)
+		$(gyp_use pulseaudio)"
+
+	if use system-sqlite; then
+		elog "Enabling system sqlite. WebSQL - http://www.w3.org/TR/webdatabase/"
+		elog "will not work. Please report sites broken by this"
+		elog "to https://bugs.gentoo.org"
+		myconf+="
+			-Duse_system_sqlite=1
+			-Denable_sql_database=0"
+	fi
+
+	# Use explicit library dependencies instead of dlopen.
+	# This makes breakages easier to detect by revdep-rebuild.
+	myconf+="
+		-Dlinux_link_gsettings=1
+		-Dlinux_link_libpci=1
+		-Dlinux_link_libspeechd=1
+		-Dlibspeechd_h_prefix=speech-dispatcher/"
+
+	# TODO: use the file at run time instead of effectively compiling it in.
+	myconf+="
+		-Dusb_ids_path=/usr/share/misc/usb.ids"
+
+	# Enable SUID sandbox.
+	myconf+="
+		-Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox
+		-Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	myconf+="
+		-Dlinux_use_gold_binary=0
+		-Dlinux_use_gold_flags=0"
+
+	# Always support proprietary codecs.
+	myconf+=" -Dproprietary_codecs=1"
+
+	if ! use bindist && ! use system-ffmpeg; then
+		# Enable H.264 support in bundled ffmpeg.
+		myconf+=" -Dffmpeg_branding=Chrome"
+	fi
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info.
+	myconf+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+		-Dgoogle_default_client_id=329227923882.apps.googleusercontent.com
+		-Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu"
+
+	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
+			-Dsysroot=
+			-Darmv7=0
+			-Darm_neon=0
+			-Ddisable_nacl=1"
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf+=" -Dwerror="
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Prevent linker from running out of address space, bug #471810 .
+		if use x86; then
+			filter-flags "-g*"
+		fi
+	fi
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX RANLIB
+
+	# Tools for building programs to be executed on the build system, bug #410883.
+	export AR_host=$(tc-getBUILD_AR)
+	export CC_host=$(tc-getBUILD_CC)
+	export CXX_host=$(tc-getBUILD_CXX)
+	export LD_host=${CXX_host}
+
+	build/linux/unbundle/replace_gyp_files.py ${myconf} || die
+	egyp_chromium -f make ${myconf} || die
+}
+
+src_compile() {
+	# TODO: add media_unittests after fixing compile (bug #462546).
+	local test_targets=""
+	for x in base cacheinvalidation content crypto \
+		googleurl gpu net printing sql; do
+		test_targets+=" ${x}_unittests"
+	done
+
+	local make_targets="chrome chrome_sandbox chromedriver"
+	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 || 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 LC_ALL="en_US.utf8"
+
+	if ! locale -a | grep -q "${LC_ALL}"; then
+		eerror "${PN} requires ${LC_ALL} 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 ${LC_ALL} is not supported"
+	fi
+
+	# If we have the right locale, export it to the environment
+	export LC_ALL
+
+	# For more info see bug #370957.
+	if [[ $UID -eq 0 ]]; then
+		die "Tests must be run as non-root. Please use FEATURES=userpriv."
+	fi
+
+	# virtualmake dies on failure, so we run our tests in a function
+	VIRTUALX_COMMAND="chromium_test" virtualmake
+}
+
+chromium_test() {
+	# Keep track of the cumulative exit status for all tests
+	local exitstatus=0
+
+	runtest() {
+		local cmd=$1
+		shift
+		local IFS=:
+		set -- "${cmd}" "--gtest_filter=-$*"
+		einfo "$@"
+		"$@"
+		local st=$?
+		(( st )) && eerror "${cmd} failed"
+		(( exitstatus |= st ))
+	}
+
+	local excluded_base_unittests=(
+		"ICUStringConversionsTest.*" # bug #350347
+		"MessagePumpLibeventTest.*" # bug #398591
+		"TimeTest.JsTime" # bug #459614
+		"SecurityTest.NewOverflow" # bug #465724
+	)
+	runtest out/Release/base_unittests "${excluded_base_unittests[@]}"
+
+	runtest out/Release/cacheinvalidation_unittests
+
+	local excluded_content_unittests=(
+		"RendererDateTimePickerTest.*" # bug #465452
+	)
+	runtest out/Release/content_unittests "${excluded_content_unittests[@]}"
+
+	runtest out/Release/crypto_unittests
+	runtest out/Release/googleurl_unittests
+	runtest out/Release/gpu_unittests
+
+	# TODO: add media_unittests after fixing compile (bug #462546).
+	# 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
+		"CertDatabaseNSSTest.TrustIntermediateCa*" # http://crbug.com/224612
+		"URLFetcher*" # bug #425764
+		"HTTPSOCSPTest.*" # bug #426630
+		"HTTPSEVCRLSetTest.*" # see above
+		"HTTPSCRLSetTest.*" # see above
+		"*SpdyFramerTest.BasicCompression*" # bug #465444
+	)
+	runtest out/Release/net_unittests "${excluded_net_unittests[@]}"
+
+	runtest out/Release/printing_unittests
+
+	local excluded_sql_unittests=(
+		"SQLiteFeaturesTest.FTS2" # bug #461286
+	)
+	runtest out/Release/sql_unittests "${excluded_sql_unittests[@]}"
+
+	return ${exitstatus}
+}
+
+src_install() {
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome || die
+
+	doexe out/Release/chrome_sandbox || die
+	fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
+
+	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
+
+	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
+	if [[ -n ${CHROMIUM_SUFFIX} ]]; then
+		sedargs+=(
+			-e "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g"
+			-e "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g"
+			-e "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:"
+		)
+	fi
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# 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
+
+	if ! use system-ffmpeg; then
+		doexe out/Release/libffmpegsumo.so || die
+	fi
+
+	# 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
+}