Dev channel bump.

Package-Manager: portage-2.2.8-r1/cvs/Linux i686
Manifest-Sign-Key: 0x4F1A2555EA71991D!

3 files changed, 623 insertions, 15 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 34ada3089d77..205c6459e252 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1126 2014/08/29 17:39:01 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1127 2014/08/29 18:28:00 phajdan.jr Exp $
+
+*chromium-39.0.2138.3 (29 Aug 2014)
+
+  29 Aug 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +chromium-39.0.2138.3.ebuild:
+  Dev channel bump.
 
 *chromium-38.0.2125.24 (22 Aug 2014)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 4f302c14f9bb..a9123b8ef896 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -43,26 +43,28 @@ AUX dot-gclient 174 SHA256 0ae6d69323d1d286de7ef1fa62c330536ada7280bda7564fefb5d
 DIST chromium-37.0.2062.94-lite.tar.xz 214372228 SHA256 c126568a10073ca79eeac8d3ea25386ddde00c50963e80925b6c6abaa3b4e017 SHA512 de463250623084934d7a7a10ed33a6b8b553aaaf629fc8a49ff9cc004a82f9aa53946de17be59386f18c1c6604738ea73ba23f38db42754ccd2fa641317a6fdc WHIRLPOOL bcaebd05724032b9f84c866e2ecea615ea4fc97681fcd87a06f7200a2b9a217d416a0f5c7c2895b5e46d98aca6a3e4cea741aec8f5b6430b62567b99489dba39
 DIST chromium-38.0.2125.0-lite.tar.xz 240854272 SHA256 8e7c6828daa42d871661835a64e7f7555a0fb4eb408bf88eaa5f5b7b232ac8b9 SHA512 bbc60eb03654947bf4fe01e4323e44d2c63a47ae93993fef4fd2d12abcf100852d6df128dc55fb775a34fbab3f3fe95bd212b8e47cae574efebb5b76f38bf5c4 WHIRLPOOL f4e173703c83c1af5b7f723f8b4ae1b25a023eb131c5ef43aca01a7cc84f19b02082e83fa9e26aff806c48bdb3cc2ab784c78915748c84d043cd6f265fbeae1c
 DIST chromium-38.0.2125.24.tar.xz 247960852 SHA256 fe8d7957e060fe09429069b4b40b82e61fc6c2594057f73e148d14a6cfdc641f SHA512 ad93687cbd0396a8de7051e290f29d8af912484af0cf657f792132feb74c63e51df95ff7a9bcf73df7d7dd0bf6ae586a7fcd9c9c750f4f8e47bd965101814ba7 WHIRLPOOL 1e9661a3c0912f7b03a3bd8e8746fc9539318e5cb8c8592d6fc688870818da2e111a0383bf033392420e89b5015e8e013390c931da7dd82f20c5b46704c85110
+DIST chromium-39.0.2138.3.tar.xz 246126128 SHA256 46543aff7d2cfecf81104e477c8ade3b828de61b1d33c5f215e0e5e6c9feb329 SHA512 d347083d3c2ede92bde28810923a8a038ca45d72791140b60f899f0d555695392a552dc592eaef34eb67d2032b0a3c41613db04ccda8fa5164c4da3dc192a77d WHIRLPOOL c6d2c890a85e09f853b76fcfdfb01d9399be38f06e0c77b71dddcecb0c963f7476dbdcb3f4a6ed823432496b26d8a3cbc493e389b528459cb9b08e4d3d0ef3ef
 EBUILD chromium-37.0.2062.94.ebuild 17703 SHA256 29d5bc1715baf7e54634521b7c5706d1a207745b7012984ad4bcc5b157c84ec1 SHA512 903b7e73a45d43987487f07ba1d21aad8db066dfb94c6e34d0050fec158b0bcce61037d1311ef22915a7715ee3e150ab50b16c3be4d67991da6591f218b2877d WHIRLPOOL 8c0bfecb75cab03f00e9446ed8d7c5536d8101b03868a01a8d256fad319a4bc1afe6578382b9759c369aadcd4ff4d31e52c1f7c31da8be5a60c44af54f70cbf9
 EBUILD chromium-38.0.2125.0.ebuild 18289 SHA256 c3f626f4ecee6dc96b191a7fe70e375cf01a8459a104d833a1b64b87082a09c0 SHA512 9562dfb85d48146e7ae63ec9615e8be1c8db7dca69b7e25fcb1ec4ac976197fde84721eb6c2248fbc5610d525883e68b219b438e0c0fb3227cfa18eec3edaf82 WHIRLPOOL 75c50af5d2679a6b5993db16dd38aa222ab4be91ec74a6edd412e91f27480fa4ab02de9c49370a5518306d0848043ba46b628d19eb0aabb1b1aeed529e242f1b
 EBUILD chromium-38.0.2125.24.ebuild 18287 SHA256 48b784aae21e45574a63233650cbc82a39dc3cf65ffe3efabed20d69755f1934 SHA512 ccfeb5eaf959d3e5509281a82de1723028af64decd35a16b2aedff81d8079193d853748f448c19d288873dfd883ad0febf02d9b35594ae75e8bd14d9afd3f979 WHIRLPOOL b28312266eb7392b532ede79a1273955a682b299b41ae48b4a2827d14bbe8185449f8febc9fc7e29f7b443b659bc2a47b7410621739fb47a3977d8fe52696a65
-MISC ChangeLog 114101 SHA256 ef0206124007e9afed2522b9ef0a87e89ff823c82c14c746e4ad63000c71ddd6 SHA512 b8f0411580dc8474d23b911b4eb4465aeb732c29845e0cfd9768001611fc4e1b052f7855ff5c2a3ed278e83849a7d9b33476787293e6d421908d16cf43c27f80 WHIRLPOOL 80b2f379d72952b8f0a228c67332e33e319175cad6e3f6888fd60990a8ed5bf8f072d32af0311f56c1f1c14c322b45f40f158d5af1d34297b903e13a3d2c6bed
+EBUILD chromium-39.0.2138.3.ebuild 18327 SHA256 ff69819d6a5a9d95f6a0d70aff0372065adef22cb139828eca186c2c5484bba6 SHA512 c28f1e7d17cd7d4967c0c567fac71edf4eca0183cb2de51feade4690954f8e65acb9cba16521a89293eceb1084af4b90428563376314ceb1914c3d04aa91a71b WHIRLPOOL e365d3bc0cafd6f848fedaf16daa4c49b4e50b5a3777ec5bf30dcb38839c7714e0548e4e7a3c9352d6ed5703e6f6dca5bd5578f00e1dc305531cdb3eec75b673
+MISC ChangeLog 114246 SHA256 b05e8e0c435dcb967aeabfd25f05c89d29856c16cc2896ffdc75b202a27f0a90 SHA512 541c1ccf9e04ba3259345c3d9b383b121974bd676ab967ea01ce7a464761f6aa8c290762cace796843168b95d2aa5419d891c8646be1fc4ee0f9c973f29c65cd WHIRLPOOL 827d56d85e4d897c224530b24e80be829b7496e04b07b8982828bd5eac3c47e587389f2c2fa71544da7a432c860dac1803a1aa679fb6127f2111e8d705d4997c
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
 MISC metadata.xml 518 SHA256 821944f32fcf203b2573c164aeaa52fbc69e5f651d366cdda66901633461f5ef SHA512 01d29c4ce93a8a624fc8926e7e72e8bf124b91ae6fdbf6e7179e9d6ddd6db33d73acde62541777118da1c9d197c83d6c615c247d785e76a8ab560f915abd08d5 WHIRLPOOL f9b21a0d032d1f78b6aeb78f759b9f126b1b1cc118a5edd3a08eefcb2d7b51ff406abb95323fe05b4c04468aca68dddd3d39ce7edfb9b352abc1bc3890d7e1ab
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT9vb9AAoJEE8aJVXqcZkdCG4P/0wF7+fGqlHbnmW1mygGUKMK
-shCNswt1k2kUB5Hbn7B2DUEW6nk0hGKTvxE7pVyOCu9cnO3ZU56ozY6Jd8ovbRZI
-LOkwgRWU/LbDiqxyR9Uop1wACDz/RpV/BT3XdV73IQZX7gx2tkBkAz4D6xGQzG4q
-fkgVijSjcYspdddYIJYUaGHrWLUrfto6In5TGLxnXbQN50tL6PhlPUfhtbfk7tFq
-acTpOlyZUiaTwC9I0nKMU7Ybs7GhPQ8tUD85tPfQkFuJNmMnw8uE2Lc0rSk3fWQV
-m6R26F+OupvS1ltOLRr2zkilINWuR//pRAvh2nHrzWecLD9e/vYONWMUAy8jvsdj
-J/5Qu3UyKoBvNHcfy7VxZh3XUXv9wal4zSEKLXqqJonODUF8ePt4BHU7hDS1P+Eu
-+oYzDSmKDnJYkjk0xq1z/TcbgElnjxuV8TG5VvplRPMqa52jA9VUhdgkv88/BeOw
-vIBJc8/EDDb4LSCLOB/pxtHbgxeEbMdIbVpHbq1crJjgHW7NCKC7Efi7He9Xy1x8
-uiIcWLYwcs9011RR03rZxCwgR6t9oPkBxfUs9+JL5Q/i0PMEjVj0gKcpivnT22ZY
-V3/32knpg9YOtJp06lu4FxIsp/VnSNgL7wN64CUTglYrJf6csw9dVsaJ8r3AqzML
-IPHZn0gQ0GgjfSfTTmr9
-=kAbu
+iQIcBAEBCAAGBQJUAMY4AAoJEE8aJVXqcZkdMNYP/2eNoUrVOmF7wFqSoH7YRvFm
+D93XrepmB9RKYZiJotkxEoJMl7IVhqrxoRleOPmZKM2Zx+bJ3565NzLp8gvyyLiv
+CghzZ74za2ZTKSzhRR2OEybPJM+Pkt5svztUjVx3KdyLB0pUrHIpNHXxyxGi4WlJ
+/9CWpDn5adEFq2MX/8j7JCveDztlLe7peL1V1lxxHxuLORkki5VCw5Tvyu6PoUTC
+f8DcQ//XOfFd8qApPSrdUgpBPUK+72QtISS64ffZ7eDfh4P2MnC9VUxA4Dl9PCB3
+PpyzJo9te0iSPL14y/ESISE5+hFfuKcB5RfFmI0Hex0WFPe28jGXRvY1yt4Rmmzf
+begEEmb4zFWP18xLjsFGLEztBs0j/gjaT6sf1fXIO2udBeziyGQLTvvs5923/4od
+kvAkTwu4PeeJ1ti02fb7ohcEBh1tXNMYOESt20d6QFnXblLedwL7bAoQczVMLRHj
+scmZO3AoHzr00VBmoJ6SR7xS849UmMmx1ci75u/8HVGyWr8/8IkCttYNjNlEop1T
+NzmtjODLProl2pcxd5yPLc1NDMNBpnlJ5ynu7FYViNbTEy3b3PDGZcuho6phardp
+2UYzCrDnahRQT/tBIXbL12VlgYrGMC3yspH3Peck5S09U6NhRRhH4fDn0DhRUmDl
+TPbdQ+Q4E25AVHkicF7w
+=2XUa
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-39.0.2138.3.ebuild b/www-client/chromium/chromium-39.0.2138.3.ebuild
new file mode 100644
index 000000000000..574bb54ab5bd
--- /dev/null
+++ b/www-client/chromium/chromium-39.0.2138.3.ebuild
@@ -0,0 +1,600 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-39.0.2138.3.ebuild,v 1.1 2014/08/29 18:28:00 phajdan.jr 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 readme.gentoo 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}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="bindist cups gnome gnome-keyring kerberos neon pic pulseaudio selinux +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:=
+	cups? (
+		dev-libs/libgcrypt:0=
+		>=net-print/cups-1.3.11:=
+	)
+	>=dev-libs/elfutils-0.149
+	dev-libs/expat:=
+	dev-libs/glib:=
+	dev-libs/icu:=
+	>=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.14.3:=
+	dev-libs/re2:=
+	gnome? ( >=gnome-base/gconf-2.24.0:= )
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/flac:=
+	media-libs/fontconfig:=
+	media-libs/freetype:=
+	media-libs/harfbuzz:=[icu(+)]
+	media-libs/libexif:=
+	>=media-libs/libjpeg-turbo-1.2.0-r1:=
+	media-libs/libpng:0=
+	>=media-libs/libwebp-0.4.0:=
+	media-libs/speex:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	>=sys-libs/libcap-2.22:=
+	sys-libs/zlib:=[minizip]
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:=
+	x11-libs/gtk+:2=
+	x11-libs/libdrm
+	x11-libs/libX11:=
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXext:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXinerama:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libXtst:=
+	x11-libs/pango:=
+	kerberos? ( virtual/krb5 )
+	selinux? ( sec-policy/selinux-chromium )"
+DEPEND="${RDEPEND}
+	!arm? (
+		dev-lang/yasm
+	)
+	dev-lang/perl
+	dev-perl/JSON
+	>=dev-util/gperf-3.0.3
+	dev-util/ninja
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig"
+# For nvidia-drivers blocker, see bug #413637 .
+RDEPEND+="
+	!=www-client/chromium-9999
+	!<www-plugins/chrome-binary-plugins-37
+	x11-misc/xdg-utils
+	virtual/opengl
+	virtual/ttf-fonts
+	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )"
+
+# Python dependencies. The DEPEND part needs to be kept in sync
+# with python_check_deps.
+DEPEND+=" $(python_gen_any_dep '
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/ply[${PYTHON_USEDEP}]
+	dev-python/simplejson[${PYTHON_USEDEP}]
+')"
+python_check_deps() {
+	has_version "dev-python/jinja[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/ply[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/simplejson[${PYTHON_USEDEP}]"
+}
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/bitstream-cyberbit
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+Depending on your desktop environment, you may need
+to install additional packages to get icons on the Downloads page.
+
+For KDE, the required package is kde-base/oxygen-icons.
+
+For other desktop environments, try one of the following:
+- x11-themes/gnome-icon-theme
+- x11-themes/tango-icon-theme
+"
+
+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; 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
+	#	mkdir -p out/Release/gen/sdk/toolchain || die
+	#	# Do not preserve SELinux context, bug #460892 .
+	#	cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
+	#		out/Release/gen/sdk/toolchain/linux_x86_newlib || die
+	#	touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
+	# fi
+
+	epatch "${FILESDIR}/${PN}-system-jinja-r6.patch"
+
+	epatch_user
+
+	# Remove most bundled libraries. Some are still needed.
+	build/linux/unbundle/remove_bundled_libraries.py \
+		'base/third_party/dmg_fp' \
+		'base/third_party/dynamic_annotations' \
+		'base/third_party/icu' \
+		'base/third_party/nspr' \
+		'base/third_party/superfasthash' \
+		'base/third_party/symbolize' \
+		'base/third_party/valgrind' \
+		'base/third_party/xdg_mime' \
+		'base/third_party/xdg_user_dirs' \
+		'breakpad/src/third_party/curl' \
+		'chrome/third_party/mozilla_security_manager' \
+		'courgette/third_party' \
+		'crypto/third_party/nss' \
+		'net/third_party/mozilla_security_manager' \
+		'net/third_party/nss' \
+		'third_party/WebKit' \
+		'third_party/angle' \
+		'third_party/angle/src/third_party/compiler' \
+		'third_party/brotli' \
+		'third_party/cacheinvalidation' \
+		'third_party/cld_2' \
+		'third_party/cros_system_api' \
+		'third_party/cython/python_flags.py' \
+		'third_party/dom_distiller_js' \
+		'third_party/dom_distiller_js/package/proto_gen/third_party/dom_distiller_js' \
+		'third_party/ffmpeg' \
+		'third_party/fips181' \
+		'third_party/flot' \
+		'third_party/hunspell' \
+		'third_party/iccjpeg' \
+		'third_party/jstemplate' \
+		'third_party/khronos' \
+		'third_party/leveldatabase' \
+		'third_party/libaddressinput' \
+		'third_party/libjingle' \
+		'third_party/libphonenumber' \
+		'third_party/libsrtp' \
+		'third_party/libusb' \
+		'third_party/libvpx' \
+		'third_party/libvpx/source/libvpx/third_party/x86inc' \
+		'third_party/libwebm' \
+		'third_party/libxml/chromium' \
+		'third_party/libXNVCtrl' \
+		'third_party/libyuv' \
+		'third_party/lss' \
+		'third_party/lzma_sdk' \
+		'third_party/mesa' \
+		'third_party/modp_b64' \
+		'third_party/mt19937ar' \
+		'third_party/npapi' \
+		'third_party/opus' \
+		'third_party/ots' \
+		'third_party/pdfium' \
+		'third_party/pdfium/third_party/logging.h' \
+		'third_party/pdfium/third_party/macros.h' \
+		'third_party/pdfium/third_party/numerics' \
+		'third_party/pdfium/third_party/template_util.h' \
+		'third_party/polymer' \
+		'third_party/protobuf' \
+		'third_party/qcms' \
+		'third_party/readability' \
+		'third_party/sfntly' \
+		'third_party/skia' \
+		'third_party/smhasher' \
+		'third_party/sqlite' \
+		'third_party/tcmalloc' \
+		'third_party/tlslite' \
+		'third_party/trace-viewer' \
+		'third_party/trace-viewer/third_party/jszip' \
+		'third_party/trace-viewer/third_party/tvcm' \
+		'third_party/trace-viewer/third_party/tvcm/third_party/d3' \
+		'third_party/trace-viewer/third_party/tvcm/third_party/gl-matrix' \
+		'third_party/trace-viewer/third_party/tvcm/third_party/polymer' \
+		'third_party/undoview' \
+		'third_party/usrsctp' \
+		'third_party/webdriver' \
+		'third_party/webrtc' \
+		'third_party/widevine' \
+		'third_party/x86inc' \
+		'third_party/zlib/google' \
+		'url/third_party/mozilla' \
+		'v8/src/third_party/kernel' \
+		'v8/src/third_party/valgrind' \
+		'v8/third_party/fdlibm' \
+		--do-remove || 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"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf+=" -Ddisable_nacl=1"
+
+	# 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_libvpx (http://crbug.com/347823).
+	# TODO: use_system_libusb (http://crbug.com/266149).
+	# TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077).
+	# TODO: use_system_protobuf (bug #503084).
+	# 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_libwebp=1
+		-Duse_system_libxml=1
+		-Duse_system_libxslt=1
+		-Duse_system_minizip=1
+		-Duse_system_nspr=1
+		-Duse_system_re2=1
+		-Duse_system_snappy=1
+		-Duse_system_speex=1
+		-Duse_system_xdg_utils=1
+		-Duse_system_zlib=1"
+
+	# Needed for system icu - we don't need additional data files.
+	myconf+=" -Dicu_use_data_file_flag=0"
+
+	# TODO: patch gyp so that this arm conditional is not needed.
+	if ! use arm; then
+		myconf+="
+			-Duse_system_yasm=1"
+	fi
+
+	# 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 tcmalloc use_allocator tcmalloc none)"
+
+	# 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"
+
+	# Save space by removing DLOG and DCHECK messages (about 6% reduction).
+	myconf+="
+		-Dlogging_like_official_build=1"
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	myconf+="
+		-Dclang=0
+		-Dhost_clang=0
+		-Dlinux_use_bundled_binutils=0
+		-Dlinux_use_bundled_gold=0
+		-Dlinux_use_gold_flags=0"
+
+	# Always support proprietary codecs.
+	myconf+=" -Dproprietary_codecs=1"
+
+	ffmpeg_branding="Chromium"
+	if ! use bindist; then
+		# Enable H.264 support in bundled ffmpeg.
+		ffmpeg_branding="Chrome"
+	fi
+	myconf+=" -Dffmpeg_branding=${ffmpeg_branding}"
+
+	# 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
+		target_arch=x64
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = x86 ]] ; then
+		target_arch=ia32
+		ffmpeg_target_arch=ia32
+	elif [[ $myarch = arm ]] ; then
+		target_arch=arm
+		ffmpeg_target_arch=$(usex neon arm-neon arm)
+		# TODO: re-enable NaCl (NativeClient).
+		local CTARGET=${CTARGET:-${CHOST}}
+		if [[ $(tc-is-softfloat) == "no" ]]; then
+
+			myconf+=" -Darm_float_abi=hard"
+		fi
+		filter-flags "-mfpu=*"
+		use neon || myconf+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}"
+
+		if [[ ${CTARGET} == armv[78]* ]]; then
+			myconf+=" -Darmv7=1"
+		else
+			myconf+=" -Darmv7=0"
+		fi
+		myconf+=" -Dsysroot=
+			$(gyp_use neon arm_neon)
+			-Ddisable_nacl=1"
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	myconf+=" -Dtarget_arch=${target_arch}"
+
+	# 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="
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf+=" -Ddisable_fatal_linker_warnings=1"
+
+	# 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}
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -m 755 "${TMPDIR}" || die
+
+	local build_ffmpeg_args=""
+	if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+		build_ffmpeg_args+=" --disable-asm"
+	fi
+
+	# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+	einfo "Configuring bundled ffmpeg..."
+	pushd third_party/ffmpeg > /dev/null || die
+	chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+		--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+	chromium/scripts/copy_config.sh || die
+	chromium/scripts/generate_gyp.py || die
+	popd > /dev/null || die
+
+	third_party/libaddressinput/chromium/tools/update-strings.py || die
+
+	einfo "Configuring Chromium..."
+	build/linux/unbundle/replace_gyp_files.py ${myconf} || die
+	egyp_chromium ${myconf} || die
+}
+
+eninja() {
+	if [[ -z ${NINJAOPTS+set} ]]; then
+		local jobs=$(makeopts_jobs)
+		local loadavg=$(makeopts_loadavg)
+
+		if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
+			NINJAOPTS+=" -j ${jobs}"
+		fi
+		if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
+			NINJAOPTS+=" -l ${loadavg}"
+		fi
+	fi
+	set -- ninja -v ${NINJAOPTS} "$@"
+	echo "$@"
+	"$@"
+}
+
+src_compile() {
+	local ninja_targets="chrome chrome_sandbox chromedriver"
+
+	# Build mksnapshot and pax-mark it.
+	eninja -C out/Release mksnapshot || die
+	pax-mark m out/Release/mksnapshot
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release ${ninja_targets} || die
+
+	pax-mark m out/Release/chrome
+}
+
+src_install() {
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome || die
+
+	newexe out/Release/chrome_sandbox 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
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver${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
+	doexe out/Release/libpdf.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
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+	readme.gentoo_print_elog
+}