Stable channel bump.

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

3 files changed, 615 insertions, 15 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 66779525af64..6bba18dff1ad 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1178 2015/01/14 20:01:29 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1179 2015/01/15 03:04:37 floppym Exp $
+
+*chromium-39.0.2171.99 (15 Jan 2015)
+
+  15 Jan 2015; Mike Gilbert <floppym@gentoo.org> +chromium-39.0.2171.99.ebuild:
+  Stable channel bump.
 
 *chromium-41.0.2272.3 (14 Jan 2015)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index fc87d1276e22..a42022e25ac8 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -10,33 +10,25 @@ AUX chromium-system-jinja-r7.patch 1611 SHA256 ff06a869615dd10ed3b26946b6a3113b3
 AUX chromium.default 148 SHA256 bdac1d32025d53158f96c8ad5bd71a58abdcf02f3a8759a43154e97e812fcdd1 SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739 WHIRLPOOL 2e51e864134426668cc73fc5081c35288677d8ce855b07dfbd3413397f9c43148a6d6096a9b7a617511388f87623a3ce7f3387103202db53876a74bccb9dbe6c
 AUX dot-gclient 174 SHA256 0ae6d69323d1d286de7ef1fa62c330536ada7280bda7564fefb5d071384ed324 SHA512 ea858464ee8732536633259ed3d11990822e8b8493c07b83218856a127320ba21b9cfc184f7e7a899739bc5f938fbca25224e559fb7db8558cb86fccc743a685 WHIRLPOOL 72a5a9af7955e653151090b555c6a67a261ff807871fdda16d7c3fabf4b52449ac9caae466ba51a17d2efed74a68adc32687599ea4287cc033e75f787d874b55
 DIST chromium-39.0.2171.65-lite.tar.xz 194778184 SHA256 889ea21ba9d627ba1917649c13990efe367678759bd949268d4f31c63e3d3498 SHA512 49347a92831e817a20a0eb5ffebde580840c2bff473522f8a71218ca15bba4435be1670e4aaa8916a39a0761bf31e58c35979a5b349883e2c328e185e436a74e WHIRLPOOL aa209f840290c6208819c3454d42b5fc814fe1eace47bdf16d884e5cb396d4547c00f9240259d8035ce8d047277cf375d95b9d5d7b673e58839ec30cd8ff4555
+DIST chromium-39.0.2171.99-lite.tar.xz 194774876 SHA256 791756066b169d4e3e42c47d6c2f85a166238d2b0c1fdac9e22481df01ee0736 SHA512 0cfa1242b3c599d4b1ec6df136ba354a6255f0cd10cdf5aaa7f1be1fbddb44c85ffe84f4ec32e0467ab77770b5116c5a388f856cc61a51386a5daa7302b98991 WHIRLPOOL 2c1ee68093a359adb1518efea7201c1d207a388e7a632723254f390d77034058f3ec0fee886ac7ad8808e57b967811b54860ffb2bc50dc155adc6f977f36eea9
 DIST chromium-40.0.2214.45-lite.tar.xz 227532932 SHA256 237441809549fae777a33aef8b23ac9fb960ac7b019c4e655b445e8d41035dd5 SHA512 2d4af32063bd3e3e7bc017d4a2334d2a65bfd6c54bf22e142574c43df238a4219e88232d970c7ee1d0462ae8ba5c1b3f1f21afbd12900b24d8f2f5ceccb55d0d WHIRLPOOL 0abf2713d0ebc22f82150b00db3f2d287f123b196fae07be39bbe8f4b19f7764e3bd24b1e822dbc206f300c7fb65d598a1d6c7bedf407394452dd5a9d23c51c0
 DIST chromium-40.0.2214.69-lite.tar.xz 227544004 SHA256 56bce2f92b6b143f790320b56176ddb65a3c01b365a8c7a45c486e13a1146b44 SHA512 ad43228222227f562543116f8322eff3e99fe06fd8d38e2299ac638a19078103ece29c997ad2a823df04558755bcfc52a378acc1aad8abad2b5e6f7fcbae3ca3 WHIRLPOOL 68341539bce127a3151dbffbc31fef438d09a71a37eaed54c98e30945398bb9a74780f9b4fa4aefa288f7ca8132082795ed54a2e1936a6d454f6ed57e9eec04a
 DIST chromium-41.0.2267.0-lite.tar.xz 235893692 SHA256 56435db3fb11ca7da97e18a504047f2029c4a59e16c5b31492fb333d27bdcd81 SHA512 618337faa44e8383bdfab33985c91b7bedef44b322fc7a0d46fc615ded0e81e45a57215de275f93ac70fca8d78dab9ebaecd741afd789f5975882cb5c2a8fc3d WHIRLPOOL 1735d3742dae060e7209ba21eb4b6ea6a43f04ee1062ea323c9d7374fde0d5a881e99ceb521fe1166c63a00da774275dcd59a35b3d1194d83e5c0408b88653a7
 DIST chromium-41.0.2272.3-lite.tar.xz 237751776 SHA256 fc3d64ab45b3c3ff6b714add779529f6e26902319872d4faa7679331ab00f36a SHA512 dd3f822b1fe231a7361e9c9ecbd4c72ab7d8d85b1b9570ea895ac221bd4bcfcb127d62dab6be42d1b3b1e4ba1ed12d97b6bea160831bd1a8768b2d8f63007b69 WHIRLPOOL 489433daf6fda378c8d6f7081a16dc6af66460fe6a323d081219ba0d695fc29c7359d598f145244b8191ae09668268ef6ae2ea685130bb4e785dc01cd2f3a051
 EBUILD chromium-39.0.2171.65.ebuild 18482 SHA256 7a34cdfbe54ed20a09f159d361522f6d1145466a54de5e7d35558e38c8c7436f SHA512 fb7c40324c754a9e282d81671c99f6a0931d0ac342d67e8ba7c7acfd89f1db8af0c487639d5d6aefc413e77434ae80c8352fa035beefd8102a795f6748592e19 WHIRLPOOL a9d77f89738a3d488f88c1d36d4663d1bd92dd82cdea10589c729f15e9369debef4400b385f5c1b6070b36e91f98e4aa280579027737fecbc8f3353417624624
+EBUILD chromium-39.0.2171.99.ebuild 18488 SHA256 22c047bd2f1c5d9d2b7d3bca7191ede6afa119c24c3801ecdca8ae873ca5973d SHA512 4c0d8bdfb9febef8b1f52e91862f6ac3d792c71e3bbf7fee1f0ce9c7cd27cd75f6f80fbad36bf3f447bc7e6fafbc4b4c9236756b06553b57627312642210a5b7 WHIRLPOOL 21a966c91bd96aa3851eff13e174ae379a6b7ef963c21f03f159d35ed74a467391fc305289f24b4ac2c5e1bb590870282c039f97d1b6d98b9440fc9c26ca6f10
 EBUILD chromium-40.0.2214.45.ebuild 18759 SHA256 a02d19e85f65e236fe1acd061a095a6cf9fc92ea4dccf87a92e79c2d37d6a64b SHA512 a7b41fdd1c3880126cdaa0a378f034ac6d5ccb35028e90eeea2faa9b2ee00f125cd17af7c956a7ec20c92c1680adc86d46fad962b123780ef565f3c575050f7d WHIRLPOOL fa6391f706a48699859df27e1d226ee9897e1fdba126cb3dfdbf58fa099599c43eb918ee5d339e5184267be018bcd5044f2c64868a783fd1d15ae09c0bd98daf
 EBUILD chromium-40.0.2214.69.ebuild 18759 SHA256 ad1dcd664bc039f87a4bef07896afe688776154679a29dad399560199866ec02 SHA512 def88a022c6b8a620cbb6cc63fb31ce0bf7ff24eb537dbd3acc2aeedac41bcaa7d3522de8db329f71a5d8e3845a446f97b3d266a8b98f5f41820654aa20fd1f6 WHIRLPOOL 8f2dc6709eaa26d55bcd270b419d0aadf00245441125d696112ff88a49ae9974316345bca3f6754c6c3e66924430661d4de1d95bbc09b14b47d4c6a3eb508e05
 EBUILD chromium-41.0.2267.0.ebuild 18837 SHA256 216d074d91a27c04df9267b7feae2949e41bbf31361eb999b057d7b951f4b2fc SHA512 75a6d51a5a48efceec48cd0629ac3cb47f4134d5103abbba7b88edc1c2047d404fa75ab91c029f27d6f9785d9719274a98bcad1f7975440c08ac908d5ebffb39 WHIRLPOOL ca1710040b7df982a6bd00ee0a19776b3143d5c538c482b9ab5c8677376cb92a1dd1e9406f3d8ea087da6af0e2754f52123bfc90aab4b1657d371f5506e5406b
 EBUILD chromium-41.0.2272.3.ebuild 18883 SHA256 f88259002bb3126bd031a64f66c29567599b1de3235ac390dd8d74f0587ecddc SHA512 ed62dc6894eeaa6764900f2a1196c403eb11a63bfe0664e1ae78d5eb2d1926673974e8bde6a84559eedbe144356c1174caef711bf291a15700321ac49644b3bd WHIRLPOOL a0dddd95de9a02affdd25e95d995b731b9c55ceb5d6570592403f4a3f556afdee7198fd2b81761a63052a06465a6c5b6b6d5469b1415b5c3a67aba41131da17e
-MISC ChangeLog 920 SHA256 866ebf5cf26173fb66dfb3365f0389aa5f19a05aae451909456ce79cdd26e562 SHA512 0b5b0a7aa1e5a03765a0b3c27961157b2fcc736597b066e31836a068e6b44c3e9a241c8f1ecae33e2fea63292913f0204ef2c4c7d72ae0a0cead465eca7273e5 WHIRLPOOL be3a817e14e34a2e9fca12e4663f4b7a85c41d4fb08f259cfa0caa6417e0304df6b09a37557b0b8951e256055b399841b7e1f0aeefa8459eca02f2cc5236f3ca
+MISC ChangeLog 1059 SHA256 15e2db9df158b2294ef02c6fb8e2b4af9a16c2999b7bd5eab00220ff313abaa3 SHA512 4e6ccdbdfbf090146da42130a7af8e3b9ed2cdd80dfc1fe0cd922900765798d6d031d94dc63dcb4fe387d8a3f8584a57753e6232ce90d2d4fb50aaf19f51bba2 WHIRLPOOL ce4af9a16d0176689abd2afd8f08b112bfaa6a33a0de95ca11273c167831a0c9f03aeaf846c60d2b66f9742bcda07d8e0ee4a5cbdcff6603c038f7116277c454
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
 MISC ChangeLog-2014 123105 SHA256 f67108708d3d21b4acfca327aca42ceb4cc31201772dff496babfacb50acc4eb SHA512 bf6464e7e6ccdee81a4c26949176ebfb705f99e85a0120eea77f52b862fa3b8142abb006462f31e5a9053777836d4d9fdb69926d2b01b49463553740aecdbc43 WHIRLPOOL 114181b4c8e700a56bdf76b4de2e94998436b1b27df9182348ab88afd352085938686359369ffa4af929936e9ad88305efc97e22afd3b4c50b0dcf9669286fea
 MISC metadata.xml 518 SHA256 821944f32fcf203b2573c164aeaa52fbc69e5f651d366cdda66901633461f5ef SHA512 01d29c4ce93a8a624fc8926e7e72e8bf124b91ae6fdbf6e7179e9d6ddd6db33d73acde62541777118da1c9d197c83d6c615c247d785e76a8ab560f915abd08d5 WHIRLPOOL f9b21a0d032d1f78b6aeb78f759b9f126b1b1cc118a5edd3a08eefcb2d7b51ff406abb95323fe05b4c04468aca68dddd3d39ce7edfb9b352abc1bc3890d7e1ab
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUtssrAAoJEE8aJVXqcZkd2VEP/iAiVOkOvvusarXd8zewq5Mk
-ufGuNk267KdH8UAAT2BPMV4mLoOBabdvcotuDs4TImiJOkhBnIZvW37iYp08BFx8
-SZtLmW0HiaW0PHRrvmO3SDTM9fCGGlLfaPqoQ9gHOgVd2MHzdZAjLhfTQvA/G/eT
-VJX0RpJpAziOXBOBDLDS8mZF8KPjeyVByht774bVEA+gFHrpY4lFEFLaN4G6qB5I
-tnJwMGobd0rbJD8qe+2B3xFjzL0vVDvfRC3+2FyiLfOvdgFyroRKP0Ij4i/dP5ET
-FSmQybrQpGD2qgBxfLJ+mPcPa8GKRQvpZoIxPKjMxfBYGjaCBR2u5Vx3v6UEUy/P
-vo+zoPbkMik5GNBmoZKAZ8uJjIKk6PdEnIx5AE6kTDw4J9GET6phZ3STv3x3Jy1/
-Csj3m3IWqMKwbyyz8PLD3xHLFfOejYKZmbL6WM6vMSfZupnLN9CgFsW+E4nuwlKW
-eaDdSCO/uVWQxxdNLrurM2L5ONuPZde7qsFlnGqs7BeVYNoDrF8WGOw/K+3PFBlp
-trT0E+ejtVk0kYwdd22cThvdBW1PitNiiYf/U2N0StOWVkBT62GQOoZjRAwAlkh5
-j7+8oaQzuB0V8oDPWZAbzqy2zuJbSPG5jLHpk0w3jXf7+w0JBNzNDfiIvlLFqVRB
-+JgWTMQ9YNEqC+UpgV+U
-=vx9W
+iF4EAREIAAYFAlS3LkYACgkQC77qH+pIQ6SaoQD/T7mP9G1FH6es4BQ+6A0BPf1T
+Zvv3vrqk3YrEw+thTwoBAI5GPSZoCpaEae0vPdCLmhaZJCXQiWQu+dRD5LGNTM9a
+=1BFI
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-39.0.2171.99.ebuild b/www-client/chromium/chromium-39.0.2171.99.ebuild
new file mode 100644
index 000000000000..4963c6d00c30
--- /dev/null
+++ b/www-client/chromium/chromium-39.0.2171.99.ebuild
@@ -0,0 +1,603 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-39.0.2171.99.ebuild,v 1.1 2015/01/15 03:04:37 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 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}-lite.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/protobuf-2.5.0-r1:=
+	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 )"
+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
+	selinux? ( sec-policy/selinux-chromium )
+	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/beautifulsoup:python-2[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/ply[${PYTHON_USEDEP}]
+	dev-python/simplejson[${PYTHON_USEDEP}]
+')"
+python_check_deps() {
+	has_version "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" && \
+		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}-gcc-4.7-r0.patch"
+	epatch "${FILESDIR}/${PN}-system-jinja-r7.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/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_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_protobuf=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
+}