Dev channel bump. Aura is now default. Use bundled icu.

Package-Manager: portage-2.2.7/cvs/Linux i686
Manifest-Sign-Key: 0x30427902

5 files changed, 702 insertions, 5 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index d7a0ec9591b4..ed4ec89cf535 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,13 @@
 # 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.1015 2014/01/28 04:03:06 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1016 2014/01/29 05:16:00 phajdan.jr Exp $
+
+*chromium-34.0.1809.0 (29 Jan 2014)
+
+  29 Jan 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +chromium-34.0.1809.0.ebuild, +files/chromium-depot-tools-r0.patch,
+  +files/chromium-system-jinja-r3.patch:
+  Dev channel bump. Aura is now default. Use bundled icu.
 
 *chromium-32.0.1700.102 (28 Jan 2014)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 2743d0d0f7e6..99eee6159b60 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -5,6 +5,7 @@ AUX chromium-blink-crash-r0.patch 533 SHA256 79a174c3ff58dd4e4b340a498f0f59b915a
 AUX chromium-browser.xml 407 SHA256 bc039012f8677468e9ce5df825f9d8096be6deb5813031c86a087c88105096ff SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca WHIRLPOOL be37cd2e7d02c510e84c484f32ab6ab2e1f38a2a03c0cdbc9b6b485d64feaf79944d8ce097f0838ae9bc71c42401b633350b847ad316b8e23cf5614e3913e7ec
 AUX chromium-build_ffmpeg-r0.patch 3142 SHA256 625f9a9695ba4960010bc96998798a1c7732fb6a1f4e375151ee2fb745489031 SHA512 da346f9f5e40385fc4a9b1ad8182b9676c1443ecfcc6efd76547389e2a6dca6814eaee75096e64e431d35069defade81a418559515a78d11476ef5d1a49add47 WHIRLPOOL 9d5350285c643e5ebd8fc5f9833fb8249efb327514177a8bd757fd724f9af9c46a6799469fce6c37ab5b34780fbdca9f60b8ca3bf0b2a8bd035d609d2c14944d
 AUX chromium-chromedriver-r0.patch 583 SHA256 83335c81bfe71023c5d577dff2b9314f6ba33dadb30cb949e7a687a74c4e5add SHA512 9496a1c9a979b7f19823a6dfac5deec36c67895de212311a752ebf549c3390a28285c11a9b0b1c9e65feee841d09c600984ae1b49f502545ed833834d855a36b WHIRLPOOL 1c4e41b1ed4685f7f6f4d465365a4cd5e7e9bd8558664808e437b4500aaea2cbdb79e7367f2efadaeb5f87415fb840a16fbbf004976e25227ed5fd0e6ef9e232
+AUX chromium-depot-tools-r0.patch 488 SHA256 14d86770eaaead42e244007ebe5a94d188f8668c2598fa6042ada87a90cae671 SHA512 0ed853976c2e6f2cfe3bc4a7e2cb89bc5e32e9ed1bcc6b5fa8abac1d6a9384526a5204a3dc8cbcfc23b86bcd984e73ac772ca1741eea0884237fd6846c516623 WHIRLPOOL ebe1d5c170fb5ced7b8f4a8fe3e59eca145af54ef847b19eb38b5ced14798067033b43e9988b64a940bf43d3322d7b5979d4019fd378293b17db8bba9e23b84a
 AUX chromium-gn-r0.patch 356 SHA256 a1145e83d775101b28dcdceb3ca076fc7e9a4b9f69a1a2236d0c97ad39afb3d3 SHA512 e91a59ed1865efb394614c13b7ecde10c72002b1daba5c40062b970529071419d461d07aab17cd60a5e06e382436384787b940edda5694c4b87b30423129eb63 WHIRLPOOL dec9ecd10253ccc6162557349c013db7a17f9c53f735f1ad8f5b3cbc1cd8e20e553a882ea111c6808be7864f258447b3f0fd2fc1cb46c89b9c593e4460527ef1
 AUX chromium-gn-r1.patch 380 SHA256 b1ca3f17959be4fb6c031563b1ee587b7e990166c41b9d5b9dce2f91bf01fe1c SHA512 9112a0b2688e0e1fdb27315873f1b829bfc0221320aed43ac92988b65c9ceb50f64af8e77c90c58efd670d3932c0b0e4555f06c25e35ed5a35de9f2316c0df00 WHIRLPOOL c967b0c8e9e2e5484a25903692dec33f3f2abb26ae4d814ccb3fe0aac205710f217627057c58ba21e92f466eb2e5917c8617e826390523ced633751a0655a4fc
 AUX chromium-gnome-keyring-r0.patch 881 SHA256 60bc75e6308d7348d1749e491a04918cc551e1bfdd2e204805bf956a91b33514 SHA512 ded33638266733a4a9dfe99ebae2ba4e4469fd8e275cd22e468aa75bade517641baf76e52cf6bfeb88bb40220a60ddeef519db32745486484d87d85ed0648fb4 WHIRLPOOL e028d271af1a9aca776711c70e2d716ca481430bd3aab18c3c05b7edf9d776204eda7f1bf71a0a3cfca22f5714604fa1608ee4119d3fe41bb48b70724877e333
@@ -15,6 +16,7 @@ AUX chromium-system-icu-r0.patch 828 SHA256 9bf164094ff33565f79807ab17cbd1d3f756
 AUX chromium-system-jinja-r0.patch 644 SHA256 024b597104d6aa480f964b5c003f0d0287f97c777dd67f45d9131bb481870cf5 SHA512 7fe9374c185df16b0cbc877dbd9e2e763e515af6e1774ee3e4b577f33d6df1b90d9a5f23cf4751bb33eefd86a150963fa1b4d5c3f8bfcc277dc682ba93b209ab WHIRLPOOL badc3db0ed47360531bfebbb04b5dd0440c219ba6926ecd22220df9352fd47d096659b0b10a37a51e94f24d2a37dd355980db48e3d79aadd2e322a1338788218
 AUX chromium-system-jinja-r1.patch 679 SHA256 81f7d24bf420d53003369c5b3ca034b183c25cfda2d5a7887cbbd348750eb79f SHA512 84eff44f0680139236ef7e7f7e7f43849932acf8f43e69bca39287a0b2829cda4d0f17f7be061ec9496913890b1601305a504caf15f50e339f4cf05ec272c1e8 WHIRLPOOL 9801d8ecf2f8372a6130e3fa3aff7f9798c9ec92ee73d93b877d831a39403e8c4019cfdb92d1052fa80db210831dfe1e297689ee3fc5adcadf3edc97c8f11f76
 AUX chromium-system-jinja-r2.patch 1343 SHA256 adc093302cdcf1823c82cb1f5e8f6b9df437275ac3ddc1bd554f8dc8bcb601f7 SHA512 32597b55adc1a2be667e45ae7ec54178582f3593093454e270e4904d2b0414ecb585d3f94117c6b857cb97edfaf4be32a222e8cbfd45ae3faf6fd6dbb1912fae WHIRLPOOL 1fbeb7e88fc4a5752395926bd890b80942b0fef10fd440241ca5989606117bc26b77455d834cc264c25cb14d8f9daa8724faf22d8f169091ee718b03f64573e2
+AUX chromium-system-jinja-r3.patch 1343 SHA256 1d5b5995b2c8df99fe32b9728c4ce0b1b2fff7e178eed00920c91d28af3b689d SHA512 5abc90d878c151d901e29fd28dfee801ed68c49af28a21e93eeb51663143d87fedcbaf6d3b86734c62202fbe4fc1516828240a5f1e7c8502401323d8f5d6669f WHIRLPOOL 58aa8812296d8b3db01acd9c8bd6cc56c6bf2799cf2fe0e5f086bea2b3a5aef505ceb67086c6a7f23ae772dbf8b6e6f767141566ec5cddfc33fd585eba4a4370
 AUX chromium-system-libjpeg-r0.patch 519 SHA256 c27541fac46eee3293df3ea86f4e9b4f2c0fc17eb576ca0f63496ce093f605ba SHA512 754c5e9a4c3a1dec80308b4f459725941d4b52fec19a1f522519fdc52e311ea1b9ded1fb6f0a9bdc89daf9efdf7067cd28da1330681a584d52f6346c33cac46d WHIRLPOOL 1abba75b40c884e08fa07b97de972ecbea76bffc0d29b5fe6ffca215388a801d81da5f0920e1f60a62f6873e66893a5c0a34a308a635dd7e00e507701eb961bf
 AUX chromium-system-ply-r0.patch 560 SHA256 a1d9a17d91edeea93a8745a677b8e79e36ea10569ab32e09b86e666262fb5ca6 SHA512 b54517042abe3f8de8a5b4d3fdf4c5da9ef94538d150b5c92349db43f221720be09a9e70818746d797cfcfb203c1129eea8e0eef026ce9c5fab8b74f9aa70b31 WHIRLPOOL 9feb572f887b6e819e2b97e97a0e6f864c3eea05b2cd185b972098dab997b59ea35ce1e6cf15e72cfb2874cb003f486ab369cb1cc3be665419f0a4cd2d88a5d0
 AUX chromium-system-ply-r1.patch 531 SHA256 b2269a9878121a1c6160b27412d13c534f2f6d15bc1bc23fab4fda2eff6edd32 SHA512 1fb1516959b3800e1f22416849aabca078a0350cda32cf7648f15edb8d1396599cb466801211b28ad6701f693ba881b9032a576da0e9de806499c55f3d901182 WHIRLPOOL ac1003b6ba64d2eb007e22ea18b3841b14d76bb2219be91ce43702ad42fb4a99776807bd1b89c2de34715c331af21e9b1d59c8a57d0c2b1258b2001099f0566c
@@ -30,18 +32,21 @@ DIST chromium-33.0.1750.46-lite.tar.xz 163240608 SHA256 897554e3faa3411a9a917feb
 DIST chromium-33.0.1750.46-testdata.tar.xz 112418412 SHA256 2a0d476af98ea0c8c5f8965f83b9b56b41f270779f13ad617039f4e9cbae0ea8 SHA512 bd939e7da27a0ca1bfee686afc44a15013d12e2e7e7256d664a057422efa9174b36780b6f9fb46afd6b0d7dd10bb2318b35e3ecda7bad896505cf9a21dd09615 WHIRLPOOL 972494315d6e2bc84fc0dc4d10996df2b23cacda0c00f04d5f81ca2512d651667336b6ba2bfdb243b86c510f84731a9c7daa39aeba40ecf053121d5a69a2f334
 DIST chromium-34.0.1788.0-lite.tar.xz 163886552 SHA256 eeacda86baad389c4d563fb76f02a23c75e2383190289ffbcf0311928f947a0b SHA512 8e62802277159fcccfc2c051e267496a4606bd1ad75e03361e542c616f697269b607b1abbacc9249fb826f85e308cc85e691590885376ee9a85930892a9c638a WHIRLPOOL 7819febcba73b583b8a859ae77f17641dcfbfaa313715d562520f03fdbb87063087d6cf60d3b19fe85b13aa04940ba5337c8725bb53b4a7b553b15f850b839ae
 DIST chromium-34.0.1788.0-testdata.tar.xz 112545088 SHA256 e74c8132e4c80a8b3f8371de9579f94726f761a7e19ae428951e87587fc1ae89 SHA512 a7b091ff8fd452a5687a64093a361ac66638a4b443390ff54a9ad4cf9a45aa99f8082dad70dc79aa94fb77700d8c3365682faf3ada4b506065c5cf6b6bd5827f WHIRLPOOL ed0981a868daa473e7ffba4697e37a0791f0bf434b06357d1e434afb691a7743e25155ede7c372e9e98b383a88b02037ad7194a8dca8768f5e67d8ab2c159e0c
+DIST chromium-34.0.1809.0-testdata.tar.xz 112805912 SHA256 328ed2cee73d248ee572bec2ee39c7b25b9c905656d96e1da38e8dff8d4a8ffa SHA512 81fe1a0de92df10512070cc71928fb52f06633af37fc7a5ab459e9c7a2ada8427bf5d96665df0da4fc31a73c6e27d50f980adb271e5393bf3588d633eda0b906 WHIRLPOOL 3285f78909c76a823721176c51a2d810d4b5e70bf0228e958b5faed04d4f76fbc7fc56fe4241ebd3944b5a426f4c28fa8ee9e231ed4b53bfcf8987fe5eee3218
+DIST chromium-34.0.1809.0.tar.xz 189819936 SHA256 08f92f8b7f7197bb3c54b40687ada00a404dc1612bcd5bc4987f7d2830c6d843 SHA512 27ccffb422c720b897424f0ee8187f7adc7b9ce680b4607088a66f11a727a7d80c313155e822da1e3da154c1e7755ea98f3429388e6d8bd530dff2ddea9e45f7 WHIRLPOOL 534f2c4807858a1eeda11bbe975321208033c0b1d2d883bb4d8aff5297c09b4cb5785c24c9a4e6552bd5af9f3d538170078b02a89d6ae87dcc9689870aa93d86
 EBUILD chromium-32.0.1700.102.ebuild 18731 SHA256 f8b330d4f95ca6c8d8d657ed52ebc77021d023fd9359cd6e6f65f5c89dc9295f SHA512 dc6b336016854ab47c5a7d07acb3ce95223eac61b707e5dd426283b0135e60fb73b4ef4d840d17f5c213595a416c30b721f7a9c794acf844e6a1e75e8fbef836 WHIRLPOOL 30e58a82a7dee851504d3de31b707df5bf5c8ac3a8d9e7dac2456cb2906b90d659e067ed88e8cab81faacba4b2627241eb3503350c3db0b5740e36d0e0e8443c
 EBUILD chromium-32.0.1700.77.ebuild 18866 SHA256 b996533dc939202e6f3e9429956710c7ddb4fd9ac013d5c366e6c24ff1c62824 SHA512 58ed620155b6a465edd647ae6e4a0dd8e16a615840696a268ec00b0ea254ac0c60a7ee18e19a776080235b6bdf9971dffe4d999907ad826026121fb1e89d78d2 WHIRLPOOL 9736222e46f450ba163dfe7f73c7e402fe272062dd997ee15582134b79c6fed101b94490f686f61a86055dc7c95cb3119aa1235fbb0e3454e7b86571b2a5988d
 EBUILD chromium-33.0.1750.29.ebuild 19283 SHA256 56ea118f1656cbafd6cad31235eaf4ae2ffe095936ceda11001219152a1503ff SHA512 7402a30e3ac54e36ca030fb68e6646fb0efb85a3b4f0cb92a84eade9e9712688749be8631af5ba46a7e2568233fa6f737776560f0e09d240988bfefb5f9f9fe4 WHIRLPOOL dc24d42d46154a8fa17b3e35b6dcff1eb64ba425c6167367417617a76ada9c198b769b6b2293dce3d7edbe6c1559a7aae70deb349208eeb6a692ee5de5d0c8f8
 EBUILD chromium-33.0.1750.46.ebuild 19280 SHA256 6ce88f7af8d8cec02ec03a3eafda580bb57627e9195f116ccf1b018c23baabd6 SHA512 1697bb2776915cd4e3a03579d7417b45dec2000166b9ed0655ce253dc0ffbf6302b08bb237ae7c6ee0fc88a69974cca09b01e7dc0858a525bcf6978c69335f00 WHIRLPOOL e46e1f6a89fa93a5b5a65c25e258149c3e2a414d904ffdd933f70ad3501a821a6ce809c5bd8498bae2a2821ed768d62dd8e13523d12c94ca5056acbabd9907e5
 EBUILD chromium-34.0.1788.0.ebuild 19360 SHA256 20fb04e216d67fe18040b7c6efa74f49b2bba65590a1b1925e1f5413dc4a9d34 SHA512 472cb5080e1ee4a93e8e56be70cff9177974e985817e35acff7794404f6035b06b75b1b2430406a3fc1379ce65721bd9cf397991e77589eadf6378a41d27b0fc WHIRLPOOL 54621d16814214fbb650836e9e21017f1799af7dc0cbb64772fdb920c54e640330bd51a67114828486be2ace2f02ef9493744c3dd2ba234ac1100b597e62cf70
-MISC ChangeLog 95350 SHA256 c47be8401a9d206b46d55116b9a339d7a59e6ea22c62c261e71e493fa15f2224 SHA512 169916d49ccf38bba686b927520df5b00ea6722bc85474eb445b5e884b11041fee99fcac2649072ddc72a85dc6555d55dc8c6bb79e328fdf59ef112f673c2c6a WHIRLPOOL 941fd5b4eafd30a6b3bd6db67658fa5f0e53be245ba396c8c29c8db4ff4aaa0f0025c6d7a48c2cdcbc522ce5de91eb992e7e4701e7f558eb40f60e811090c31d
+EBUILD chromium-34.0.1809.0.ebuild 19412 SHA256 2e495f3949c167f05e33dcc6061c2fc7a8b424289d5014d14d1c7eee3da23bf4 SHA512 ed9259d085b00014672ff8d71d2bccbf1ffd10d1c7d4833d4d98856456a87a2f7693ea0565c2c525e45ef09bad84ee1c513138748ab54329b52446785aa47bc5 WHIRLPOOL 4e123abe9f0c9052cf6abbfe2967544a88d1aae1d21ee2c06178c7cc6217b543e0ad0bd40899eda52df791fef4ea3d55de7f50bcba6974539bee3441911a5c85
+MISC ChangeLog 95615 SHA256 c9b71cc911e84adfa0b28ed269dca4ad002b986f9b588ad22be3d09e103c219e SHA512 48621c49b21dbf4df5f1bd10d9fb7fb1a328900834286eedf989dc509e35cdcc3ce94ef5a31692c53548f7beb853c7a2d40918c6b20c2c8ae7827d38f91b59f8 WHIRLPOOL 764dfbf13401fc4799ff8243ebcc121fb263c713c905a3b3033ab9e7fbaa6c798a0a410ae603353c94f9223ed2c9aa78fb28b8389c29e0a0f1f3b527c0b5ab58
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
 MISC metadata.xml 599 SHA256 445f23a3d80f257019d11074a593608bc3f3abd22b6985b89f533d94f7799008 SHA512 606d4ead8b6e9c4852110a5b5efe5a5d6219d2e9d546ad114f01d496f4966df0238b8c1fdec93916715887a08e7737c138b6c0a22267256616edded58914c951 WHIRLPOOL d6273eb9bdc89b4a08a572a27708128985094bd684323c2c17587e80364bc446762b325d31977bed1bdbaec31e5dc6d22c29b5bc49c9943e99e837bf529bbea5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlLnK/0ACgkQC77qH+pIQ6TG3QEAp5Rg59se1bX7GYjsFql3BQGl
-yxGzsSiduJzwihoGpIsA/1Z+KuHMVfgY/mZ746hpqVAI1PWC8s5JwXhCkNose3tL
-=e7uy
+iEYEAREIAAYFAlLojpgACgkQuUQtlDBCeQJoowCeIikZVJSnKnV3yGHFQJSFA3Wv
+MYsAoIUwZq4plqyW66kUYxF2RKAvrF/9
+=Qt4o
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-34.0.1809.0.ebuild b/www-client/chromium/chromium-34.0.1809.0.ebuild
new file mode 100644
index 000000000000..a37395c77599
--- /dev/null
+++ b/www-client/chromium/chromium-34.0.1809.0.ebuild
@@ -0,0 +1,647 @@
+# 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-34.0.1809.0.ebuild,v 1.1 2014/01/29 05:16: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
+	test? ( https://commondatastorage.googleapis.com/chromium-browser-official/${P}-testdata.tar.xz )"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+aura bindist cups gnome gnome-keyring kerberos neon 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:=
+		>=net-print/cups-1.3.11:=
+	)
+	>=dev-libs/elfutils-0.149
+	dev-libs/expat:=
+	>=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:=
+	dev-libs/re2:=
+	gnome? ( >=gnome-base/gconf-2.24.0:= )
+	gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2:= )
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/flac:=
+	media-libs/harfbuzz:=[icu(+)]
+	>=media-libs/libjpeg-turbo-1.2.0-r1:=
+	media-libs/libpng:0=
+	>=media-libs/libvpx-1.3.0:=
+	>=media-libs/libwebp-0.4.0:=
+	media-libs/opus:=
+	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/gtk+:2=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXinerama:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libXtst:=
+	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
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig
+	test? (
+		dev-libs/openssl:0
+	)"
+# For nvidia-drivers blocker, see bug #413637 .
+RDEPEND+="
+	!=www-client/chromium-9999
+	x11-misc/xdg-utils
+	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-2.7[${PYTHON_USEDEP}]
+	dev-python/ply[${PYTHON_USEDEP}]
+	dev-python/simplejson[${PYTHON_USEDEP}]
+	test? ( dev-python/pyftpdlib[${PYTHON_USEDEP}] )
+')"
+python_check_deps() {
+	has_version ">=dev-python/jinja-2.7[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/ply[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/simplejson[${PYTHON_USEDEP}]" && \
+		{ ! use test || has_version "dev-python/pyftpdlib[${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-r3.patch"
+	epatch "${FILESDIR}/${PN}-gn-r1.patch"
+	epatch "${FILESDIR}/${PN}-depot-tools-r0.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/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' \
+		'crypto/third_party/nss' \
+		'net/third_party/mozilla_security_manager' \
+		'net/third_party/nss' \
+		'third_party/WebKit' \
+		'third_party/angle' \
+		'third_party/brotli' \
+		'third_party/cacheinvalidation' \
+		'third_party/cld' \
+		'third_party/cros_system_api' \
+		'third_party/ffmpeg' \
+		'third_party/flot' \
+		'third_party/hunspell' \
+		'third_party/iccjpeg' \
+		'third_party/icu' \
+		'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/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/ots' \
+		'third_party/polymer' \
+		'third_party/pywebsocket' \
+		'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/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/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_icu (resolve startup crash).
+	# TODO: use_system_libsrtp (bug #459932).
+	# TODO: use_system_libusb (http://crbug.com/266149).
+	# 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_jsoncpp=1
+		-Duse_system_libevent=1
+		-Duse_system_libjpeg=1
+		-Duse_system_libpng=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_openssl=1
+		-Duse_system_opus=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"
+
+	# 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 aura)
+		$(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 linux_use_tcmalloc)"
+
+	# 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.
+	myconf+="
+		-Dlinux_use_gold_binary=0
+		-Dlinux_use_gold_flags=0"
+
+	# Always support proprietary codecs.
+	myconf+=" -Dproprietary_codecs=1"
+
+	# Set python version and libdir so that python_arch.sh can find libpython.
+	# Bug 492864.
+	myconf+="
+		-Dpython_ver=${EPYTHON#python}
+		-Dsystem_libdir=$(get_libdir)"
+
+	if ! use bindist; 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
+		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="
+
+	# 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
+
+	# 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.sh linux ${ffmpeg_target_arch} "${PWD}" config-only || die
+	chromium/scripts/copy_config.sh || die
+	popd > /dev/null || 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() {
+	# TODO: add media_unittests after fixing compile (bug #462546).
+	local test_targets=""
+	for x in base cacheinvalidation content crypto \
+		gpu net printing sql; do
+		test_targets+=" ${x}_unittests"
+	done
+
+	local ninja_targets="chrome chrome_sandbox chromedriver"
+	if use test; then
+		ninja_targets+=" $test_targets"
+	fi
+
+	# Build mksnapshot and pax-mark it.
+	eninja -C out/Release mksnapshot.${target_arch} || die
+	pax-mark m out/Release/mksnapshot.${target_arch}
+
+	# 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
+	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=(
+		"OutOfMemoryDeathTest.ViaSharedLibraries" # bug #497512
+	)
+	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/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
+		"SpdyFramerTests/SpdyFramerTest.CreatePushPromiseCompressed/2" # bug #478168
+		"HostResolverImplTest.BypassCache" # bug #498304
+		"HostResolverImplTest.FlushCacheOnIPAddressChange" # bug #481812
+		"HostResolverImplTest.ResolveFromCache" # see above
+		"ProxyResolverV8TracingTest.*" # see above
+		"SSLClientSocketTest.ConnectMismatched" # see above
+		"UDPSocketTest.*" # see above
+		"*EndToEndTest*" # see above
+	)
+	runtest out/Release/net_unittests "${excluded_net_unittests[@]}"
+
+	runtest out/Release/printing_unittests
+	runtest out/Release/sql_unittests
+
+	return ${exitstatus}
+}
+
+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
+
+	# 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/icudtl.dat || 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
+
+	# 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
+}
diff --git a/www-client/chromium/files/chromium-depot-tools-r0.patch b/www-client/chromium/files/chromium-depot-tools-r0.patch
new file mode 100644
index 000000000000..19b92ce40d07
--- /dev/null
+++ b/www-client/chromium/files/chromium-depot-tools-r0.patch
@@ -0,0 +1,11 @@
+--- build/gyp_chromium.orig	2014-01-29 01:22:52.527247671 +0000
++++ build/gyp_chromium	2014-01-29 01:23:49.857623290 +0000
+@@ -38,8 +38,6 @@
+ sys.path.insert(1, os.path.join(chrome_src, 'third_party', 'WebKit',
+     'Source', 'build', 'scripts'))
+ 
+-import find_depot_tools
+-
+ # On Windows, Psyco shortens warm runs of build/gyp_chromium by about
+ # 20 seconds on a z600 machine with 12 GB of RAM, from 90 down to 70
+ # seconds.  Conversely, memory usage of build/gyp_chromium with Psyco
diff --git a/www-client/chromium/files/chromium-system-jinja-r3.patch b/www-client/chromium/files/chromium-system-jinja-r3.patch
new file mode 100644
index 000000000000..f78a0a3a5133
--- /dev/null
+++ b/www-client/chromium/files/chromium-system-jinja-r3.patch
@@ -0,0 +1,27 @@
+--- third_party/WebKit/Source/bindings/generated_bindings.gyp.orig	2014-01-29 01:37:10.832866464 +0000
++++ third_party/WebKit/Source/bindings/generated_bindings.gyp	2014-01-29 01:37:29.082985891 +0000
+@@ -74,11 +74,6 @@
+ 
+     'compiler_module_files': [
+         'scripts/idl_compiler.py',
+-        '<(DEPTH)/third_party/ply/lex.py',
+-        '<(DEPTH)/third_party/ply/yacc.py',
+-        # jinja2/__init__.py contains version string, so sufficient for package
+-        '<(DEPTH)/third_party/jinja2/__init__.py',
+-        '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
+         '<(DEPTH)/tools/idl_parser/idl_lexer.py',
+         '<(DEPTH)/tools/idl_parser/idl_node.py',
+         '<(DEPTH)/tools/idl_parser/idl_parser.py',
+--- third_party/WebKit/Source/build/scripts/scripts.gypi.orig	2014-01-29 01:37:58.853180703 +0000
++++ third_party/WebKit/Source/build/scripts/scripts.gypi	2014-01-29 01:38:06.423230239 +0000
+@@ -1,10 +1,6 @@
+ {
+     'variables': {
+         'scripts_for_in_files': [
+-            # jinja2/__init__.py contains version string, so sufficient as
+-            # dependency for whole jinja2 package
+-            '<(DEPTH)/third_party/jinja2/__init__.py',
+-            '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
+             'hasher.py',
+             'in_file.py',
+             'in_generator.py',