Dev channel bump.

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

3 files changed, 652 insertions, 22 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index e8a41bd136ad..67317f4a5686 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,12 @@
 # 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.1197 2015/02/09 10:39:40 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1198 2015/02/09 19:50:51 phajdan.jr Exp $
+
+*chromium-42.0.2292.0 (09 Feb 2015)
+
+  09 Feb 2015; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +chromium-42.0.2292.0.ebuild:
+  Dev channel bump.
 
   09 Feb 2015; Jason A. Donenfeld <zx2c4@gentoo.org>
   chromium-40.0.2214.111.ebuild, chromium-40.0.2214.91.ebuild,
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 3d3eb0b51802..408bd2a29bd8 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX chromium-browser.xml 407 SHA256 bc039012f8677468e9ce5df825f9d8096be6deb5813031c86a087c88105096ff SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca WHIRLPOOL be37cd2e7d02c510e84c484f32ab6ab2e1f38a2a03c0cdbc9b6b485d64feaf79944d8ce097f0838ae9bc71c42401b633350b847ad316b8e23cf5614e3913e7ec
 AUX chromium-cups-r0.patch 2122 SHA256 1ea8a1fd5d4ad7ed61d23864cb57e9b69ab8e2814f6da53598ccfbb596c01c93 SHA512 43aadb71adafe9bc8253b8085e2c8ecce963b97af2efc08f20f7224cc63b60aa756fa3e082c1753d3bcdfa71d2c7338a9fdcad9be292a0b1dfd7b078e706d70a WHIRLPOOL 0da59643edb7d246625115192cf3c2283c2351b89278606c8c0175e68db6e5b04476865c1c319deb57393a358df28f695c081b3e9e37745c8ea992e3661a32f4
 AUX chromium-gcc-4.7-r0.patch 634 SHA256 6732e9f8cef0def250ed397ae77050812b08f28ac20e2928fb46f456800b974d SHA512 7998bbe57e8cfc948f5e441307e3cb5df6f07c401196c09644b107d78e3c41d0f557c5c23aff33f8aec618cd1c87747da687764574f902259debe1c336ad0e14 WHIRLPOOL f88609044b61fd1ce10c1745074e0d84baaa82447952a41be394f32b6d85b6b60d9893b3b1a9dce56134a4588b16ad1953474b0b3b213b001f37975490769621
@@ -19,6 +16,7 @@ DIST chromium-41.0.2272.12-lite.tar.xz 237786236 SHA256 7093674377a99a4c8f64e185
 DIST chromium-41.0.2272.16-lite.tar.xz 237800940 SHA256 f90eaac9d316829f78069cc28f679bff31187026ba12e9910110829127743141 SHA512 b112dd131a0fedad761057b9e103f866ee72c8a199c2e489f1615f23eccb1502b7c54a59c8c2226d62f3f3dc9d9273b9546956a83d13e66e8005797e46ed63a2 WHIRLPOOL c5279b7cd15a73216f1de61fe960fc99dcae9c966ed01f08af3d8c3e7d4daa3e8882c16b6770b74f14c7e28f2d0d246b0230488de58d27d022c27d62db0eb6a6
 DIST chromium-41.0.2272.35-lite.tar.xz 238139316 SHA256 7cb69ee8ecb1a16bb22999f1d33d309a022a27448cc5094f654c979910165698 SHA512 7e4f900e216775e58950c703a487022b84873af0c8813bfdd9d9a8801d90c99ed79de5796966583e1fe9c6ef064213040f5cb0be336bd237f86d563119f8be9f WHIRLPOOL 423400d406b2b3df14b5bc941ac5abd6e61e80d69cb5c81b01bf341c17ef6624f68091c114456808211b0e56441f81621789089a420c51456abcdf888a6da545
 DIST chromium-42.0.2288.6.tar.xz 300774976 SHA256 f5295d0f00c5aca27bdbaf909e8c7cd7fff06b7a02c8d87ba2d77440e595fd16 SHA512 624cc4c358edfb7dd57de7ab22c901270ae0d0687a8ee54954fc675bb1927f54fe26348cae813ac6ce6a55b2939a4a650e258ea92cf798459c5ca96682f693f5 WHIRLPOOL 6838cb22b4a042e911abc4853bbfe8340157dbf1a9f45e9f0fb655c96a5e1f7a342263ba8007c7b93f97e50990708ddc8af3257a5a7a5db5cbf25f898faab69d
+DIST chromium-42.0.2292.0.tar.xz 301045668 SHA256 1a45158e3cfc8ed9f4cbb5eca6e46f3e1d5aa84d2517739ea04a3618898855fb SHA512 65f98a50efa0254fea44ed5f3b24649fd32c3a87ddbbf18eb34c837f901718c515a27e3aeebca8eeef1ec1f579e664c04a97dc34d42f18a5ed41a135a12de7a6 WHIRLPOOL 6ae5b6a4479c9df652479a76e5024ace2dbde6c6b5b17a599a8a8c93098dac2ceecec952ad8ef01e91c05a529537814cfe6f7d37f0c2b85a042aa741a0448e74
 EBUILD chromium-40.0.2214.111.ebuild 19986 SHA256 07e6d48f9dcf0c3f372188db7d0a53921747f6659dade2bea1d65bd67f925a5d SHA512 f8fa2b03e008584980af38661e865140055e2ae7c39cd71f80796878b12f4ba976ec13709c5ff9d3b9e382e580d346d12b3cd816fd505aa2bd13e8a9f92c3429 WHIRLPOOL f2d13647864cdee8f37fef99363637c0e62b50e6155061e6d934a2367758c7f0f1485913230a34f57ae27e08543f15642f044139680f4a580926dfe13aa2c8cd
 EBUILD chromium-40.0.2214.91.ebuild 19979 SHA256 f5ae696a28535f4380d8f50c594242d2b931063e0c157f18dd803642e1732bb9 SHA512 6f1e861ab5fbae99acd8431856c2e0774c4852db2a707bdfa8a7314a53af5f5407807db4446d946cd728757940a3ecdb684e9658165cac55715a66189245f144 WHIRLPOOL 8a4a1fac6813dcb9de43b2fa565618abe035586134b8abbeda7bfafcec5e3b5ec2e839ec4b3a545ce980abeee9955cebd16455df2ae642eb1199439503ae4ccb
 EBUILD chromium-40.0.2214.93.ebuild 19986 SHA256 7359ac7b75bfe93272f06ab48b92bf655dc5d8c1aa2b716d9d393df05882e079 SHA512 2968d3764bba37ad8938b5972f5a8e50e63768203b7c1c7d67fd4ee78c5080c91f1730741c75cbd0e2cd1b4cf157aaaa00b6d0a7411a826c390817ed8b7b9758 WHIRLPOOL 3b55d1f59a062e9bb5fa1194101c90b152684cec1364be6e48abfa246c557fa27e9ee85b244e0034b654033074ebbd5651d8ef716eed945e99e1c8c6590f97c5
@@ -26,24 +24,8 @@ EBUILD chromium-41.0.2272.12-r1.ebuild 20149 SHA256 06bccb824cb5857ececade7be1f4
 EBUILD chromium-41.0.2272.16.ebuild 20146 SHA256 a519e26a6a8e86eaf442595fd68df312b4708aa99d11d2cd5cceb99355793a39 SHA512 c008987c884800ec34f609d36464be6394cd9b0b346535d1d50a84c474d1ba01656870b9ca9b1e03f10df454c247c3b96f1b760d924b0a5fcbe50ce5f98e71e7 WHIRLPOOL 29bfcb5bca03cd9dbbef0257c4e3822d91cb13aa957267f50152b14268ba001ca24a0a3c129535c9f1947ecd1e9b1901a14322417771b073eab9e79d21097ad6
 EBUILD chromium-41.0.2272.35.ebuild 20146 SHA256 513a82dd6127bbdb38d60f4ae6f76a86552a998f2d150de2d0a4b0ea71fec551 SHA512 ede2d3a2572cd23e11003488ca80ab932d07a4055a8d1e7c2f8438907764e44dbcb32ffdaebcb97fcecc0d1fe9fda3bb95b93e1e3d12c17f01e89e7ffa74ac50 WHIRLPOOL 2b7990a640e3f2beb43dbbe370b69cbf2a776cb2955eab93d82cc3ba0941d4245e46b8918aaa06adf802e8c6daa75a53a5dba404dc820feafbe816894b63ef16
 EBUILD chromium-42.0.2288.6.ebuild 20191 SHA256 d73b4f5fcd33df482c426aaab9aeae7c2602dd59a9e02773b858ebe9dcb926c9 SHA512 4ee347c48ba9225020ac5043d8bc826db7dbdfd73a369a06b80e7774017885bfd21e7bb7207794f7eb6995d935362560f4b02880c92232d73ef121229f4c730e WHIRLPOOL 8aad6ce9a811d6c4b4033bd33bfe22fef8de071ce4b7e4eda52e7d316813be5504e7b87ef315abf0b9397dc78fe69c34ad1db3a68cc61a15e750d4c634e2fbbb
-MISC ChangeLog 4552 SHA256 6311e6bc07291f5ab12982f811b7e418e6b0b0db63a3123fa954a08c15a4327d SHA512 6ec12869deae24d6b319aeb642e786068e25de818c2ec00aa5f83282c3a2fe13be49f27aae551de0639bbefb62bdad1022ae31351d74766d6f1533106697cb55 WHIRLPOOL edea0bd61e880e0b9a434bc235f922b733e3fe4b905632ee113e76a6a7c41d90f90683db57af2eec90e6f627f641b531abc7909ee91a9916c4252774877cce27
+EBUILD chromium-42.0.2292.0.ebuild 20196 SHA256 1f2a988a0b2ed8cc0fa1de2869281dd94b4eeb77865d33aa45154e07e612e29c SHA512 e1055f0161db5f4a6335f2b4469e541c1bae3addd7eb75a5b39e9491f8fe508b5ee72048944655cb689bd429c2ec65f97ee1e4858d1742a26a771dc5c68d27af WHIRLPOOL 37522bd738b315b43159c8f019c7393f3e729c620b5f8f7e2847b02410fb0cf096b50f568cb13b77523d0b4410a37198cce64888f8664a2aaf69d5864fb5e9cd
+MISC ChangeLog 4702 SHA256 1eb0b85f06ebc5e79459b021ab44f17b934827528da20ade17ac0a044cc19032 SHA512 4b15c7a95eddc61a334ce87efadfdb5e49ac8656f7516326f753a4cd39f3f298411b3af15a0887d77caa82290c234497bcb0b81a29e1e2910b266587f3855b05 WHIRLPOOL 62a78695994f398111c79d6c3b76658ddaf01f03f0e69f09e7d7026c20e2669b4a418a369fb387c9c908adc7cd09845c90e7624d9f89c22fd2a212ca5ddc26e6
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
 MISC ChangeLog-2014 123105 SHA256 f67108708d3d21b4acfca327aca42ceb4cc31201772dff496babfacb50acc4eb SHA512 bf6464e7e6ccdee81a4c26949176ebfb705f99e85a0120eea77f52b862fa3b8142abb006462f31e5a9053777836d4d9fdb69926d2b01b49463553740aecdbc43 WHIRLPOOL 114181b4c8e700a56bdf76b4de2e94998436b1b27df9182348ab88afd352085938686359369ffa4af929936e9ad88305efc97e22afd3b4c50b0dcf9669286fea
 MISC metadata.xml 711 SHA256 1e18c739e77946b63028931cb8b11f10deb618965e33cff6f653607f7464983d SHA512 284d32a4db3451ffd522fd6db99cdd7d4130fe186a7a5b746d238f3d7d6677f0a49613cc95b52bad2d26f02877b0b8668a5eaf6f98c8e56a8967b045c23fd77b WHIRLPOOL f035f1168195c7858659ee32e33d4f1aaecf6e761ae756291c2dbcf8deddac6ffafab6b1c8d984eeb4b08efd28a36a0acdf9294918141328f6d68313f3fa2235
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJU2I5uAAoJEEn8cBKl3gOuc50QAJbse7Fo5jpaOKlTn9QQ6t/y
-lszfrR4hUltvZ6t6ir0TwXipP592qbmvQZlyHIex5HmuC8FPebXp8yTX7qRviyXV
-admYE12AAQjY/C2jLQb+oYpDM2aj9WEOsK/AgBT+sfyUL4PzSJNEMPZbgQXavy8Y
-NJXVZIAmS4CTUxuLaVzYniFGiRiT90NZDm6gg16m40a2gd6jCNl025aIir4bT936
-1a50EJUmhpXb1EbEPqm1B/3eqkIqpQNZDO4Dgzp8jsN8RARjBc3ZnRESQkmVVZcT
-0g8RMYZMxJxb+41bB0JbHK8VK62TAThtsLOtwCjwKTrprob273RJioJr7jTarQ36
-/q6bRxExBDRkRlQ6vSUcozYFAvT1yEDVW7MNaXZGO8xM5DqtrPdGvNkiE6NnwuVD
-HJU0Blb8m4/yQBgz2WrFRkFASjH6C9ZswpHRfEWrBACBLt9MFYXDBmADYmDfxJvq
-94KRdwvmBY0CUNrdqOGqoEp+t0cGpQqJNDaLbnoY3olviaOineQNmjH+K22O9GP8
-jLPUqv+TUVCIUmrZw2GfBP9bQS383snHZsZzsrJz+WvQ6SBjK0wqniWPPNHyi6Wq
-uHsNGXle4l3KFJvvQ+grXIQmscHseVsLT5WcEYJuklLe6V9x4j/maRkEp9aoirBp
-wPZk5pvNKXDhMMuvqRjP
-=N/N9
------END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-42.0.2292.0.ebuild b/www-client/chromium/chromium-42.0.2292.0.ebuild
new file mode 100644
index 000000000000..51edbe883d15
--- /dev/null
+++ b/www-client/chromium/chromium-42.0.2292.0.ebuild
@@ -0,0 +1,642 @@
+# 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-42.0.2292.0.ebuild,v 1.1 2015/02/09 19:50:51 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 hidpi kerberos neon pic pulseaudio selinux +tcmalloc widevine"
+RESTRICT="!bindist? ( bindist )"
+
+# 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:=
+	app-crypt/libsecret:=
+	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 )"
+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
+	widevine? ( www-plugins/chrome-binary-plugins[widevine] )"
+	# We build-dep on having widevine, because the patch
+	# below must extract the current version.
+
+# 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_pretend() {
+	if [[ $(tc-getCC)$ == *gcc* ]] && \
+		[[ $(gcc-major-version)$(gcc-minor-version) -lt 48 ]]; then
+		die 'At least gcc 4.8 is required, see bugs: #535730, #525374, #518668.'
+	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; 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-r7.patch"
+	epatch "${FILESDIR}/${PN}-libsecret-r0.patch"
+
+	if use widevine; then
+		local WIDEVINE_VERSION="$(< "${ROOT}/usr/$(get_libdir)/chromium-browser/widevine.version")"
+		[[ -z $WIDEVINE_VERSION ]] && die "Could not determine Widevine version."
+		sed -e "s/@WIDEVINE_VERSION@/${WIDEVINE_VERSION}/" "${FILESDIR}/${PN}-widevine.patch" > "${T}/${PN}-widevine-${WIDEVINE_VERSION}.patch"
+		epatch "${T}/${PN}-widevine-${WIDEVINE_VERSION}.patch"
+		local WIDEVINE_SUPPORTED_ARCHS="x64 ia32"
+		local arch
+		for arch in $WIDEVINE_SUPPORTED_ARCHS; do
+			mkdir -p third_party/widevine/cdm/linux/$arch
+			cp "${ROOT}/usr/$(get_libdir)/chromium-browser/libwidevinecdm.so" third_party/widevine/cdm/widevine_cdm_*.h third_party/widevine/cdm/linux/$arch/ || die "Could not copy headers for Widevine."
+		done
+	fi
+
+	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/google_input_tools' \
+		'third_party/google_input_tools/third_party/closure_library' \
+		'third_party/google_input_tools/third_party/closure_library/third_party/closure' \
+		'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/libudev' \
+		'third_party/libusb' \
+		'third_party/libvpx' \
+		'third_party/libvpx/source/libvpx/third_party/x86inc' \
+		'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/mojo' \
+		'third_party/mt19937ar' \
+		'third_party/npapi' \
+		'third_party/openmax_dl' \
+		'third_party/opus' \
+		'third_party/ots' \
+		'third_party/pdfium' \
+		'third_party/pdfium/third_party/bigint' \
+		'third_party/pdfium/third_party/freetype' \
+		'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/components/polymer' \
+		'third_party/trace-viewer/third_party/d3' \
+		'third_party/trace-viewer/third_party/gl-matrix' \
+		'third_party/trace-viewer/third_party/jszip' \
+		'third_party/trace-viewer/third_party/tvcm' \
+		'third_party/trace-viewer/third_party/tvcm/third_party/beautifulsoup/polymer_soup.py' \
+		'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/fdlibm' \
+		'v8/src/third_party/kernel' \
+		'v8/src/third_party/valgrind' \
+		--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 #525560).
+	# 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 hidpi enable_hidpi)
+		$(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/*.bin || die
+	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
+	if use widevine; then
+		doexe out/Release/libwidevinecdmadapter.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
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+	readme.gentoo_print_elog
+}