From 96f727806b8c8c84c94e848250b85267df40d503 Mon Sep 17 00:00:00 2001
From: Mike Gilbert <floppym@gentoo.org>
Date: Wed, 2 Oct 2013 01:48:19 +0000
Subject: Stable channel bump.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4
---
 www-client/chromium/ChangeLog                    |   8 +-
 www-client/chromium/Manifest                     |  16 +-
 www-client/chromium/chromium-30.0.1599.47.ebuild | 568 -----------------------
 www-client/chromium/chromium-30.0.1599.66.ebuild | 568 +++++++++++++++++++++++
 4 files changed, 583 insertions(+), 577 deletions(-)
 delete mode 100644 www-client/chromium/chromium-30.0.1599.47.ebuild
 create mode 100644 www-client/chromium/chromium-30.0.1599.66.ebuild

(limited to 'www-client')

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 7f5dd463b731..a5c50ea7ddcc 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.954 2013/09/28 22:31:42 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.955 2013/10/02 01:48:17 floppym Exp $
+
+*chromium-30.0.1599.66 (02 Oct 2013)
+
+  02 Oct 2013; Mike Gilbert <floppym@gentoo.org> +chromium-30.0.1599.66.ebuild,
+  -chromium-30.0.1599.47.ebuild:
+  Stable channel bump.
 
   28 Sep 2013; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   files/chromium-system-icu-r0.patch, chromium-31.0.1650.0.ebuild:
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index e4d4e91f02b8..2d5340982abb 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -16,28 +16,28 @@ DIST chromium-29.0.1547.57-lite.tar.xz 124488252 SHA256 30c949120f7fb2e1d020b4a9
 DIST chromium-29.0.1547.57-testdata.tar.xz 108866300 SHA256 76f73b00cfe8de9453a34f5b874761b55ceaab8a13501c2c630bfc4b38bdeb42 SHA512 7911b20072e22a7279d473d4b13f2d5fdffdec77dde4edcf1deb025d7cc63d3d28e72281ac76c4f2afea780ef69eeb7934de31aa29c7af94c038fd82fbc226fc WHIRLPOOL 0bc2119dc72a6cf4fb783d21da83cdbe2cc170b5d680b50533042c7ace431817414e01e952db9ccbcbaf17c1fb162b437f345631fa68837d02eeb8192d3d40fd
 DIST chromium-29.0.1547.65-lite.tar.xz 124478288 SHA256 670644008bd06715f8b37aaaf10f6967dc7dcfd9daf292996ca6bcdf625ce2b7 SHA512 f45a9646a3226f45f8d9de283effbd3a1eb1bc4f6e85c456dc491020ffe3e596829aefab2931b468a16f4c1b9cc4df5cc8932ae052663e683a1688392ba21d72 WHIRLPOOL 35a8dce77f91aaa9f1d48defa50c670c3cf5dc2eb009a6f916cad3e5518cb5341ebec1173a75dfbee202b808b404f25cf8c5f87e770365388ecb4c5ac3c55ea6
 DIST chromium-29.0.1547.65-testdata.tar.xz 108863692 SHA256 62616eb1c88d3d85e65f3a0e608a60d8a6bb5cd2e07c158508d1cabd8570d80b SHA512 050290bc6ad4748a9d6a807a147a424478dd531ab89981365a5ba5fda3e30a8c118613bae912d9c8b0390a4327bd9b141acfd09a366d796a34cc94c7eaf885d6 WHIRLPOOL a61e97e5b62df53b3cc05c907842005c81c44ba20946422de501c538d94b8c4d69c0cd9cd08bcfab819b16b4a6f0f06f5660538b8a7f0701216a8c4f0f6596c8
-DIST chromium-30.0.1599.47-testdata.tar.xz 108832312 SHA256 7db3357f76e1a988da0b6e4c23d1b7eb004206a21947838ac25f98acbf10882e SHA512 fd96a9cbee96bd2d4c81ebdc837764ff9487c4dd30a1585fe9d9443259259d1f61ba7db90b95e1d310af906038b4e1b09b3cd96e905ad6d1595284fd595e4a9d WHIRLPOOL bc7958a8df890794240e4d510e9832703364d3e8c39e21c971baa25fe8877fd7239d083824479633ecd19213033ade29acc28400a9462078b8f2bfff5201f3ea
-DIST chromium-30.0.1599.47.tar.xz 159071356 SHA256 4058e1680f15d08ab338ed0c5e6ac8464c126294de7612ce478f60adef0f6a28 SHA512 877e2c835c0d392ae2e57460b4203d383fd93173e58735da840cf935bae4775157ebb3b187127925e0861a6cfd198e91322cf2e4b53ee471558269588d655bc5 WHIRLPOOL 206a3b340fd0fb657d059fda9715b038cd105d4f668897b5b30f28153d405de8e2de8f4a63031b922b1eecdb6010c76122d48c13e0425137081e60b6bba3caa7
 DIST chromium-30.0.1599.65-testdata.tar.xz 108830108 SHA256 c125128aa8b5ed41efa2ccb64376b4621ac6c92315e2ffa3484feca6f56fc45a SHA512 b186f389af761ce1929942a096d58bace3806bbaf870720978e7d378ed39eeff08c267bed983f92c2854542439ff66235286f78440b983c46d63d388a475561e WHIRLPOOL 62599222d4abf6372f3e93cc65d1c75c3168ad05e2f2c5c748a55bb919686b564027973f9588af308dfed9c448956d9418c3a2caebf4870bdbe6e26fe75861f1
 DIST chromium-30.0.1599.65.tar.xz 159081024 SHA256 4708b80a995b0b92c705d75b12e7ae9df0a4f3cc5100220c70ba2ccd4f3010f1 SHA512 184e471a999197154ee3486f6cd9ce816406ef7f3e0cf57fd14f46543f052fb388c803c0e3d0db0282e16e2dfe4b1745c0bf872602d0aa878e86474b74339e06 WHIRLPOOL af92acd2b9344e380b784e6460fbb6e1772338d7609c9f57111f5cd5646b468610f2d0d0942b4c5e2095295e121458748700a1751905cc6380c39700fce5667d
+DIST chromium-30.0.1599.66-testdata.tar.xz 108833456 SHA256 eca21bed4df5f0df5e75cccc8f057c54754dde88027cbe25cec21a31010102d6 SHA512 b342b9442a5962ff3e313ff50906178df6ae8609e0647b5f3febcda711a780b9957da769521ca93374c5a909471f4f504fc010113753600a2d84aa16329a9bbc WHIRLPOOL 46f27a16093ba801eadf9223f56872591ea12812f14b5c75fecb294408cf14b0b89586164336b5654271dddcb4a8e38b9ea768f6b6fe83c0866570cb546762d4
+DIST chromium-30.0.1599.66.tar.xz 159092232 SHA256 8fe8262fd69b59c759916d17eaf4225d1d5b64c468629cb9a684144d3cd15724 SHA512 76110071fbfb47205a97c9e0ffb7cd58c60309ab23d140779d2cb7db3dd1064f1bb74746217922b9e3097ea8f040c1462d5e316aa34df3b5f08466b53e594c4a WHIRLPOOL 35582368f8f368439a1af5c7bfa96f575f124d05b4294d40c25a8f2ce78a180b62bbfeb40ae8d81d5eb0080016b5e836896cef8f09eebe7dac0783430198ff17
 DIST chromium-31.0.1626.0-testdata.tar.xz 108886432 SHA256 3338a8d085dd0e535b5f5f3293aabe2fa5cc5e489782d4c505945a6748640b66 SHA512 b6b291ede35a9c809a29a2c9ec6f937216e31813b778713d4ec0fb4de8b26b0b7aabe7cf11d062970be242c5dcc912b86376505e168f6b8b3e2fc93484805986 WHIRLPOOL 6e17988c4a68e1035fbf464121f7ea1d4fbae15d7e5d1d5e3bfcec78891385d5f7002b4c264bf8bc0f7a559ea1996f4458dacc254ebf106cebdf3abebe760bca
 DIST chromium-31.0.1626.0.tar.xz 172964420 SHA256 b72692146c45dd523d520328df0cd7b9bafbc30de090c1089d37262d21822b97 SHA512 a7ff26dff029f1bbdbf2abfde3412645f0396f02b6de3e4e0241917ca0dd4b520e7f7b3266db650e36f5a3e1dd45d7be2a0e6195e792f3ee0c2c7b86ebb8c04c WHIRLPOOL dda039b80bc65f26de097d0b84df3e24cb477bb96bd89d2fa6e134ab25dac0bbbfbb3b95a9deeb0bb1877133579fe9dea86e0891a1760b0d6626c658bdea71cf
 DIST chromium-31.0.1650.0-testdata.tar.xz 111199168 SHA256 01bd838bfad36ae86f0d34e4828ce3b1c9d4e613aa96b3845a23904297f1b454 SHA512 3ed8427b53804c3b0972c07659a7d14ba24e451e217e2b8f4bd10434284d147dd49cee2cc63a8deff25a239a5bb734950ead0e4524bf8c6c828b2df37bb6854b WHIRLPOOL 47a2f962ac175ffe173cc21c5fa1977d5253398d5548a5df6536aff9d23fb2bc3bb4882a737fdaba6345e6b3ffb6be6d0e9406ce91178550415211a330f6429b
 DIST chromium-31.0.1650.0.tar.xz 174258344 SHA256 f2528d626cd75b593209f331b8a8fdd78f306b90930aeb29b14c9774363484c5 SHA512 daed6eefebc99052bdbbdfd68f030c906c676e205b270f421fa0ac33864da37ae4f2d365b622fdd4510024675a59ad44eb9677b984dd8a31e3794e3b88d55f09 WHIRLPOOL cfd98eeb96e143236f1d0607dddfca26d1d048a1e029bfbf3b606cbd6e1b3f09dbbe09554e6332b503eec10f1d2b74dd54452edb226b6c827f0eb2ce3d396867
 EBUILD chromium-29.0.1547.57.ebuild 17009 SHA256 5d20d17cc34665dc5096b51da4c542fda812294221fc1db4961b49bccaa2ff7b SHA512 9f2f18581409997ff0cd383dd9c574acb74873fba9e49314a9b841fb0b4e9cf3cdf4d0325611bc2024704bcf76c9390282e7ce6f1f5f20401bd62a0915c8bda9 WHIRLPOOL 398c215a8b8ac0fcb143ee15876bc27de2d6c607ebe8a9a7e46ffb6291f1de666c0d4fb394b68ca1e1e371c4441e6ad96cafd926e44274e0fa30d0c04d361e59
 EBUILD chromium-29.0.1547.65.ebuild 16988 SHA256 2ee70bc91ba3e139ac427dad623fcf99a6f082cbbb06b52426e5b0a55e673ea7 SHA512 90e5541540cc5dae858b91ec93ee93bb2368df12333d192c9b1e966000b54f4dd75cda5d32b9110e03243a21907435325a41be8fcd88bc4ded0ee6f7c30788b0 WHIRLPOOL c52e984bf5d5eaf12ddcaae023fc7570de8f7d672f662285516b14aa4c34d582bd2798165e998109e130886c6c33e83dfc41f750e77a7960bdcc2e87afa4dba6
-EBUILD chromium-30.0.1599.47.ebuild 17494 SHA256 93fa5afc1d7dbc269c61b710d4166437cac78a719475752d0638596a0c9e57de SHA512 849fbe1d9c5737c5c48c31538b5840ab743ddb91f52c4947bbac21a7882489bfd027820106f0ce2b8bdaf75f5fab06640a77383bb87c906a0d1e7e5c5bea0656 WHIRLPOOL 8a5775721a5a451bf2f79ce42b9aab1106c72ef7c97f48b8eb314ef496a03bc4a8384bdf3a3616f332a043623c432cb5789607b6678163957a1ede4003eff0e4
 EBUILD chromium-30.0.1599.65.ebuild 17494 SHA256 c286b16f1ae42102d6252a725215909a631834823ab02d9024183eef9b4dd5c4 SHA512 0d0c45af352e2485ae0392f94db17a32f3b2c5e4476a234163caf1b98d7a7dc4feffa8463c3b78d40420b89d4dc830f3a9459e6dee90ac97dc5143eebc180590 WHIRLPOOL 91c65aaa2d35af7a056f6a1285783505872066b2c6df3cbf807b45b38ad198a17bd559f68677c57cdb13dff7cc591112d4675cfbe769abafe14faa79ff418202
+EBUILD chromium-30.0.1599.66.ebuild 17494 SHA256 f27903a7f6c0520a771308ad208057f0536a1ef42c2967f19a8029499e5e6dcf SHA512 77db9d3e666941a8bbde255593860a55d1d87c5f2b532c82a2bc5788be1d383ca49a718f91ceaffff8b907292b2bc20642909133218797184394adee20d5ebc1 WHIRLPOOL eddb61a677483256ac2d802ca36c88e6541bf08c18ab1c8b9fe61eea3d4bd485cd8b22cf6f23ecfbf75db4375cd076f0e4bb782b12238139b89e959dd73ae8f3
 EBUILD chromium-31.0.1626.0.ebuild 16828 SHA256 d3b00970356ff4e8159b7d971bcb9b059f61b1a6747ea87555cab7471127aacc SHA512 2e92127066f835622003f127fa89cda3a9790f97dd9e894bec62c36cfcc7ea21cac96917a78cecb5f50bf7a96e92b031a4415bc2da610f391c98b40a9bcfdc5e WHIRLPOOL a8f87fbddc81cf89719ad2625eff12297677d9fc8549a319fba2ce291579804530cc7d6bc47ced07c4eeda4d1d341d42bb9bb958158e8c9dd93d0ccac53e5889
 EBUILD chromium-31.0.1650.0.ebuild 17079 SHA256 fdb08067655fa39ef4a1703823c98b8d7837a8724a001be1587ecc567534f8c2 SHA512 de8162bed2e8fbdf6d8f73e93e0019d69eed8f6de86185c07e281de201ba0a2a8c6a6b93ea6935c526ffd7826372d936139a1bcd30e9690d457760adc855c4dd WHIRLPOOL 6adeaa05509039a456d935cfaf8be8ceca97e7c18a508178ddd666bceb3e4c217ff0342e8e9ff0e0c7c7ef3fddb92394e10fdbd5928efe8aa13c3b9261c46ea8
 EBUILD chromium-9999-r1.ebuild 18901 SHA256 df7870e91ca9eeeac6712346823bdbd748838a94d215571e5cad9ff3fa01bf42 SHA512 755f65abaa9c83ab057dcae47e2b782ae1a2b25d4fa3d567450ddda765d555c9296bfd5610fcdbe002c61bfddb6dc30fc01cfff5a54130421d969e8952abf9ec WHIRLPOOL c4e92c6826807d7a1322b9504b52167b7d164c00a526febd7bf081c9247ed06363eec35c1b2d6dd1a8e106ad0224ff8451799b654e26e5adfc6a431254f43c32
-MISC ChangeLog 84029 SHA256 cb36fe09dcc6c55a10a7b30c70a947a52e590d887c1307ea0e44e2c1cb89679a SHA512 412d345c64f4c86a255f2351d8054ad5a0296bc5127e6d43abfe34e124bd142a93f1f69d68feedecf5bc2f70d551bfc358590d9f04969159eaf011dc4eadb4ca WHIRLPOOL 782a6db3b8eb48fe902b7f485720f1277ee0a3dd6e17fc3b53f38c1914d205d813ff545601f7b9dd9108d918eec3a719109974117b718d4f36140f3119639995
+MISC ChangeLog 84201 SHA256 9bc83e6514cf642698d0e11a8916b3434a029202c1b9a0d03d6f4d20a1d2ceab SHA512 6e673d649ecc891560ebdc10f5f96bd4eb072c0970083a667904b55da6ef619372ed7c924e23977cd2be9e2646b1ef566990b6d0364b5b01a456e45b839b2c4a WHIRLPOOL f3d8d497354f186daa5530d1c37e6bbf90961f5785bd7359e2062488c1e8263453d8816c756f65002ac4e16c10426afbf872a4dbed006dba9af33997cac078f1
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
 MISC metadata.xml 622 SHA256 0cc15c6cfce29d9372d650e883075630c844e262bb354a64c96d7e51580d25c9 SHA512 957d3b569ce2259d250681d91edf31d7dcea412d84c79017413866691d3b6fe27076f7d0d7c14f41421254438064d15c90d84940a3c6aa9c307c4db4277eadd1 WHIRLPOOL d621daeca803c0aa06b7abff6207a16cb9122c7ae6f7b02b57be88dd551ef4410fd20d592ea8ee7062bbef54ce09079dacd51e514febdebb16da24d8fb55f823
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iEYEAREIAAYFAlJHWNYACgkQuUQtlDBCeQJmjgCghIuXOKMK2gFAouNjXgCrmMTA
-JUsAn1bYATCS43Zy9VCYXlibkjMqZ5UP
-=TuCS
+iF4EAREIAAYFAlJLe2IACgkQC77qH+pIQ6RnKgEAymmpCdoRTWT/LxTRU60wD+0p
+IRHgLL5julsfKCRkbHYBAL0jV5uEqqE7iBb7GP6VgWNIKmY4hQcYjvm4r0ju55wk
+=jMT6
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-30.0.1599.47.ebuild b/www-client/chromium/chromium-30.0.1599.47.ebuild
deleted file mode 100644
index 3361000e9136..000000000000
--- a/www-client/chromium/chromium-30.0.1599.47.ebuild
+++ /dev/null
@@ -1,568 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-30.0.1599.47.ebuild,v 1.1 2013/09/25 18:54:10 floppym Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh_CN zh_TW"
-
-inherit chromium eutils flag-o-matic multilib multiprocessing \
-	pax-utils portability python-any-r1 toolchain-funcs versionator virtualx
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
-	test? ( https://commondatastorage.googleapis.com/chromium-browser-official/${P}-testdata.tar.xz )"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="bindist cups gnome gnome-keyring gps kerberos neon pulseaudio selinux system-sqlite tcmalloc"
-
-# Native Client binaries are compiled with different set of flags, bug #452066.
-QA_FLAGS_IGNORED=".*\.nexe"
-
-# Native Client binaries may be stripped by the build system, which uses the
-# right tools for it, bug #469144 .
-QA_PRESTRIPPED=".*\.nexe"
-
-RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
-	app-arch/bzip2:=
-	app-arch/snappy:=
-	system-sqlite? ( dev-db/sqlite:3 )
-	cups? (
-		dev-libs/libgcrypt:=
-		>=net-print/cups-1.3.11:=
-	)
-	>=dev-lang/v8-3.19.17:=
-	=dev-lang/v8-3.20*
-	>=dev-libs/elfutils-0.149
-	dev-libs/expat:=
-	>=dev-libs/icu-49.1.1-r1:=
-	>=dev-libs/jsoncpp-0.5.0-r1:=
-	>=dev-libs/libevent-1.4.13:=
-	dev-libs/libxml2:=[icu]
-	dev-libs/libxslt:=
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.12.3:=
-	dev-libs/protobuf:=
-	dev-libs/re2:=
-	gnome? ( >=gnome-base/gconf-2.24.0:= )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2:= )
-	gps? ( >=sci-geosciences/gpsd-3.7:=[shm] )
-	>=media-libs/alsa-lib-1.0.19:=
-	media-libs/flac:=
-	media-libs/harfbuzz:=[icu(+)]
-	>=media-libs/libjpeg-turbo-1.2.0-r1:=
-	media-libs/libpng:0=
-	media-libs/libvpx:=
-	>=media-libs/libwebp-0.3.1:=
-	media-libs/opus:=
-	media-libs/speex:=
-	pulseaudio? ( media-sound/pulseaudio:= )
-	sys-apps/dbus:=
-	sys-apps/pciutils:=
-	sys-libs/zlib:=[minizip]
-	virtual/udev
-	x11-libs/gtk+:2=
-	x11-libs/libXinerama:=
-	x11-libs/libXScrnSaver:=
-	x11-libs/libXtst:=
-	kerberos? ( virtual/krb5 )
-	selinux? ( sec-policy/selinux-chromium )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	!arm? (
-		dev-lang/yasm
-	)
-	dev-lang/perl
-	dev-perl/JSON
-	dev-python/jinja
-	dev-python/ply
-	dev-python/simplejson
-	>=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-python/pyftpdlib )"
-RDEPEND+="
-	!=www-client/chromium-9999
-	x11-misc/xdg-utils
-	virtual/ttf-fonts"
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-pkg_setup() {
-	if [[ "${SLOT}" == "0" ]]; then
-		CHROMIUM_SUFFIX=""
-	else
-		CHROMIUM_SUFFIX="-${SLOT}"
-	fi
-	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
-
-	# Make sure the build system will use the right python, bug #344367.
-	python-any-r1_pkg_setup
-
-	chromium_suid_sandbox_check_kernel_config
-
-	if use bindist; 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}-gpsd-r0.patch"
-	epatch "${FILESDIR}/${PN}-system-ply-r0.patch"
-
-	epatch_user
-
-	# Remove most bundled libraries. Some are still needed.
-	find third_party -type f \! -iname '*.gyp*' \
-		\! -path 'third_party/WebKit/*' \
-		\! -path 'third_party/angle_dx11/*' \
-		\! -path 'third_party/cacheinvalidation/*' \
-		\! -path 'third_party/cld/*' \
-		\! -path 'third_party/cros_system_api/*' \
-		\! -path 'third_party/ffmpeg/*' \
-		\! -path 'third_party/flot/*' \
-		\! -path 'third_party/hunspell/*' \
-		\! -path 'third_party/iccjpeg/*' \
-		\! -path 'third_party/jstemplate/*' \
-		\! -path 'third_party/khronos/*' \
-		\! -path 'third_party/leveldatabase/*' \
-		\! -path 'third_party/libjingle/*' \
-		\! -path 'third_party/libphonenumber/*' \
-		\! -path 'third_party/libsrtp/*' \
-		\! -path 'third_party/libusb/*' \
-		\! -path 'third_party/libxml/chromium/*' \
-		\! -path 'third_party/libXNVCtrl/*' \
-		\! -path 'third_party/libyuv/*' \
-		\! -path 'third_party/lss/*' \
-		\! -path 'third_party/lzma_sdk/*' \
-		\! -path 'third_party/mesa/*' \
-		\! -path 'third_party/modp_b64/*' \
-		\! -path 'third_party/mongoose/*' \
-		\! -path 'third_party/mt19937ar/*' \
-		\! -path 'third_party/npapi/*' \
-		\! -path 'third_party/openssl/*' \
-		\! -path 'third_party/ots/*' \
-		\! -path 'third_party/pywebsocket/*' \
-		\! -path 'third_party/qcms/*' \
-		\! -path 'third_party/sfntly/*' \
-		\! -path 'third_party/skia/*' \
-		\! -path 'third_party/smhasher/*' \
-		\! -path 'third_party/sqlite/*' \
-		\! -path 'third_party/tcmalloc/*' \
-		\! -path 'third_party/tlslite/*' \
-		\! -path 'third_party/trace-viewer/*' \
-		\! -path 'third_party/undoview/*' \
-		\! -path 'third_party/usrsctp/*' \
-		\! -path 'third_party/webdriver/*' \
-		\! -path 'third_party/webrtc/*' \
-		\! -path 'third_party/widevine/*' \
-		\! -path 'third_party/x86inc/*' \
-		\! -path 'third_party/zlib/google/*' \
-		-delete || die
-
-	# Remove bundled v8.
-	find v8 -type f \! -iname '*.gyp*' -delete || die
-}
-
-src_configure() {
-	local myconf=""
-
-	# Never tell the build system to "enable" SSE2, it has a few unexpected
-	# additions, bug #336871.
-	myconf+=" -Ddisable_sse2=1"
-
-	# Optional tcmalloc. Note it causes problems with e.g. NVIDIA
-	# drivers, bug #413637.
-	myconf+=" $(gyp_use tcmalloc linux_use_tcmalloc)"
-
-	# Disable 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_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_icu=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_opus=1
-		-Duse_system_protobuf=1
-		-Duse_system_re2=1
-		-Duse_system_snappy=1
-		-Duse_system_speex=1
-		-Duse_system_v8=1
-		-Duse_system_xdg_utils=1
-		-Duse_system_zlib=1"
-
-	# TODO: patch gyp so that this arm conditional is not needed.
-	if ! use arm; then
-		myconf+="
-			-Duse_system_yasm=1"
-	fi
-
-	# TODO: re-enable on vp9 libvpx release (http://crbug.com/174287).
-	myconf+="
-		-Dmedia_use_libvpx=0"
-
-	# Optional dependencies.
-	# TODO: linux_link_kerberos, bug #381289.
-	myconf+="
-		$(gyp_use cups)
-		$(gyp_use gnome use_gconf)
-		$(gyp_use gnome-keyring use_gnome_keyring)
-		$(gyp_use gnome-keyring linux_link_gnome_keyring)
-		$(gyp_use gps linux_use_libgps)
-		$(gyp_use gps linux_link_libgps)
-		$(gyp_use kerberos)
-		$(gyp_use pulseaudio)"
-
-	if use system-sqlite; then
-		elog "Enabling system sqlite. WebSQL - http://www.w3.org/TR/webdatabase/"
-		elog "will not work. Please report sites broken by this"
-		elog "to https://bugs.gentoo.org"
-		myconf+="
-			-Duse_system_sqlite=1
-			-Denable_sql_database=0"
-	fi
-
-	# Use explicit library dependencies instead of dlopen.
-	# This makes breakages easier to detect by revdep-rebuild.
-	myconf+="
-		-Dlinux_link_gsettings=1
-		-Dlinux_link_libpci=1
-		-Dlinux_link_libspeechd=1
-		-Dlibspeechd_h_prefix=speech-dispatcher/"
-
-	# TODO: use the file at run time instead of effectively compiling it in.
-	myconf+="
-		-Dusb_ids_path=/usr/share/misc/usb.ids"
-
-	# 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"
-
-	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
-		myconf+=" -Dtarget_arch=x64"
-	elif [[ $myarch = x86 ]] ; then
-		myconf+=" -Dtarget_arch=ia32"
-	elif [[ $myarch = arm ]] ; then
-		# 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+=" -Dtarget_arch=arm
-			-Dsysroot=
-			$(gyp_use neon arm_neon)
-			-Ddisable_nacl=1"
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf+=" -Dwerror="
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Prevent linker from running out of address space, bug #471810 .
-		if use x86; then
-			filter-flags "-g*"
-		fi
-	fi
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX RANLIB
-
-	# Tools for building programs to be executed on the build system, bug #410883.
-	export AR_host=$(tc-getBUILD_AR)
-	export CC_host=$(tc-getBUILD_CC)
-	export CXX_host=$(tc-getBUILD_CXX)
-	export LD_host=${CXX_host}
-
-	build/linux/unbundle/replace_gyp_files.py ${myconf} || die
-	egyp_chromium ${myconf} || die
-}
-
-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
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	ninja -C out/Release -v -j $(makeopts_jobs) ${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=(
-		"ICUStringConversionsTest.*" # bug #350347
-		"MessagePumpLibeventTest.*" # bug #398591
-		"TimeTest.JsTime" # bug #459614
-		"SecurityTest.NewOverflow" # bug #465724
-	)
-	runtest out/Release/base_unittests "${excluded_base_unittests[@]}"
-
-	runtest out/Release/cacheinvalidation_unittests
-
-	local excluded_content_unittests=(
-		"RendererDateTimePickerTest.*" # bug #465452
-	)
-	runtest out/Release/content_unittests "${excluded_content_unittests[@]}"
-
-	runtest out/Release/crypto_unittests
-	runtest out/Release/gpu_unittests
-
-	# TODO: add media_unittests after fixing compile (bug #462546).
-	# runtest out/Release/media_unittests
-
-	local excluded_net_unittests=(
-		"NetUtilTest.IDNToUnicode*" # bug 361885
-		"NetUtilTest.FormatUrl*" # see above
-		"DnsConfigServiceTest.GetSystemConfig" # bug #394883
-		"CertDatabaseNSSTest.ImportServerCert_SelfSigned" # bug #399269
-		"CertDatabaseNSSTest.TrustIntermediateCa*" # http://crbug.com/224612
-		"URLFetcher*" # bug #425764
-		"HTTPSOCSPTest.*" # bug #426630
-		"HTTPSEVCRLSetTest.*" # see above
-		"HTTPSCRLSetTest.*" # see above
-		"SpdyFramerTests/SpdyFramerTest.CreatePushPromiseCompressed/2" # bug #478168
-		"*SpdyFramerTest.BasicCompression*" # bug #465444
-	)
-	runtest out/Release/net_unittests "${excluded_net_unittests[@]}"
-
-	runtest out/Release/printing_unittests
-
-	local excluded_sql_unittests=(
-		"SQLiteFeaturesTest.FTS2" # bug #461286
-	)
-	runtest out/Release/sql_unittests "${excluded_sql_unittests[@]}"
-
-	return ${exitstatus}
-}
-
-src_install() {
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome || die
-
-	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/*.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
-}
diff --git a/www-client/chromium/chromium-30.0.1599.66.ebuild b/www-client/chromium/chromium-30.0.1599.66.ebuild
new file mode 100644
index 000000000000..9ab7c7d83db1
--- /dev/null
+++ b/www-client/chromium/chromium-30.0.1599.66.ebuild
@@ -0,0 +1,568 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-30.0.1599.66.ebuild,v 1.1 2013/10/02 01:48:17 floppym Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh_CN zh_TW"
+
+inherit chromium eutils flag-o-matic multilib multiprocessing \
+	pax-utils portability python-any-r1 toolchain-funcs versionator virtualx
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
+	test? ( https://commondatastorage.googleapis.com/chromium-browser-official/${P}-testdata.tar.xz )"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="bindist cups gnome gnome-keyring gps kerberos neon pulseaudio selinux system-sqlite tcmalloc"
+
+# Native Client binaries are compiled with different set of flags, bug #452066.
+QA_FLAGS_IGNORED=".*\.nexe"
+
+# Native Client binaries may be stripped by the build system, which uses the
+# right tools for it, bug #469144 .
+QA_PRESTRIPPED=".*\.nexe"
+
+RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
+	app-arch/bzip2:=
+	app-arch/snappy:=
+	system-sqlite? ( dev-db/sqlite:3 )
+	cups? (
+		dev-libs/libgcrypt:=
+		>=net-print/cups-1.3.11:=
+	)
+	>=dev-lang/v8-3.19.17:=
+	=dev-lang/v8-3.20*
+	>=dev-libs/elfutils-0.149
+	dev-libs/expat:=
+	>=dev-libs/icu-49.1.1-r1:=
+	>=dev-libs/jsoncpp-0.5.0-r1:=
+	>=dev-libs/libevent-1.4.13:=
+	dev-libs/libxml2:=[icu]
+	dev-libs/libxslt:=
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.12.3:=
+	dev-libs/protobuf:=
+	dev-libs/re2:=
+	gnome? ( >=gnome-base/gconf-2.24.0:= )
+	gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2:= )
+	gps? ( >=sci-geosciences/gpsd-3.7:=[shm] )
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/flac:=
+	media-libs/harfbuzz:=[icu(+)]
+	>=media-libs/libjpeg-turbo-1.2.0-r1:=
+	media-libs/libpng:0=
+	media-libs/libvpx:=
+	>=media-libs/libwebp-0.3.1:=
+	media-libs/opus:=
+	media-libs/speex:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	sys-libs/zlib:=[minizip]
+	virtual/udev
+	x11-libs/gtk+:2=
+	x11-libs/libXinerama:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libXtst:=
+	kerberos? ( virtual/krb5 )
+	selinux? ( sec-policy/selinux-chromium )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	!arm? (
+		dev-lang/yasm
+	)
+	dev-lang/perl
+	dev-perl/JSON
+	dev-python/jinja
+	dev-python/ply
+	dev-python/simplejson
+	>=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-python/pyftpdlib )"
+RDEPEND+="
+	!=www-client/chromium-9999
+	x11-misc/xdg-utils
+	virtual/ttf-fonts"
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+pkg_setup() {
+	if [[ "${SLOT}" == "0" ]]; then
+		CHROMIUM_SUFFIX=""
+	else
+		CHROMIUM_SUFFIX="-${SLOT}"
+	fi
+	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
+
+	# Make sure the build system will use the right python, bug #344367.
+	python-any-r1_pkg_setup
+
+	chromium_suid_sandbox_check_kernel_config
+
+	if use bindist; 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}-gpsd-r0.patch"
+	epatch "${FILESDIR}/${PN}-system-ply-r0.patch"
+
+	epatch_user
+
+	# Remove most bundled libraries. Some are still needed.
+	find third_party -type f \! -iname '*.gyp*' \
+		\! -path 'third_party/WebKit/*' \
+		\! -path 'third_party/angle_dx11/*' \
+		\! -path 'third_party/cacheinvalidation/*' \
+		\! -path 'third_party/cld/*' \
+		\! -path 'third_party/cros_system_api/*' \
+		\! -path 'third_party/ffmpeg/*' \
+		\! -path 'third_party/flot/*' \
+		\! -path 'third_party/hunspell/*' \
+		\! -path 'third_party/iccjpeg/*' \
+		\! -path 'third_party/jstemplate/*' \
+		\! -path 'third_party/khronos/*' \
+		\! -path 'third_party/leveldatabase/*' \
+		\! -path 'third_party/libjingle/*' \
+		\! -path 'third_party/libphonenumber/*' \
+		\! -path 'third_party/libsrtp/*' \
+		\! -path 'third_party/libusb/*' \
+		\! -path 'third_party/libxml/chromium/*' \
+		\! -path 'third_party/libXNVCtrl/*' \
+		\! -path 'third_party/libyuv/*' \
+		\! -path 'third_party/lss/*' \
+		\! -path 'third_party/lzma_sdk/*' \
+		\! -path 'third_party/mesa/*' \
+		\! -path 'third_party/modp_b64/*' \
+		\! -path 'third_party/mongoose/*' \
+		\! -path 'third_party/mt19937ar/*' \
+		\! -path 'third_party/npapi/*' \
+		\! -path 'third_party/openssl/*' \
+		\! -path 'third_party/ots/*' \
+		\! -path 'third_party/pywebsocket/*' \
+		\! -path 'third_party/qcms/*' \
+		\! -path 'third_party/sfntly/*' \
+		\! -path 'third_party/skia/*' \
+		\! -path 'third_party/smhasher/*' \
+		\! -path 'third_party/sqlite/*' \
+		\! -path 'third_party/tcmalloc/*' \
+		\! -path 'third_party/tlslite/*' \
+		\! -path 'third_party/trace-viewer/*' \
+		\! -path 'third_party/undoview/*' \
+		\! -path 'third_party/usrsctp/*' \
+		\! -path 'third_party/webdriver/*' \
+		\! -path 'third_party/webrtc/*' \
+		\! -path 'third_party/widevine/*' \
+		\! -path 'third_party/x86inc/*' \
+		\! -path 'third_party/zlib/google/*' \
+		-delete || die
+
+	# Remove bundled v8.
+	find v8 -type f \! -iname '*.gyp*' -delete || die
+}
+
+src_configure() {
+	local myconf=""
+
+	# Never tell the build system to "enable" SSE2, it has a few unexpected
+	# additions, bug #336871.
+	myconf+=" -Ddisable_sse2=1"
+
+	# Optional tcmalloc. Note it causes problems with e.g. NVIDIA
+	# drivers, bug #413637.
+	myconf+=" $(gyp_use tcmalloc linux_use_tcmalloc)"
+
+	# Disable 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_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_icu=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_opus=1
+		-Duse_system_protobuf=1
+		-Duse_system_re2=1
+		-Duse_system_snappy=1
+		-Duse_system_speex=1
+		-Duse_system_v8=1
+		-Duse_system_xdg_utils=1
+		-Duse_system_zlib=1"
+
+	# TODO: patch gyp so that this arm conditional is not needed.
+	if ! use arm; then
+		myconf+="
+			-Duse_system_yasm=1"
+	fi
+
+	# TODO: re-enable on vp9 libvpx release (http://crbug.com/174287).
+	myconf+="
+		-Dmedia_use_libvpx=0"
+
+	# Optional dependencies.
+	# TODO: linux_link_kerberos, bug #381289.
+	myconf+="
+		$(gyp_use cups)
+		$(gyp_use gnome use_gconf)
+		$(gyp_use gnome-keyring use_gnome_keyring)
+		$(gyp_use gnome-keyring linux_link_gnome_keyring)
+		$(gyp_use gps linux_use_libgps)
+		$(gyp_use gps linux_link_libgps)
+		$(gyp_use kerberos)
+		$(gyp_use pulseaudio)"
+
+	if use system-sqlite; then
+		elog "Enabling system sqlite. WebSQL - http://www.w3.org/TR/webdatabase/"
+		elog "will not work. Please report sites broken by this"
+		elog "to https://bugs.gentoo.org"
+		myconf+="
+			-Duse_system_sqlite=1
+			-Denable_sql_database=0"
+	fi
+
+	# Use explicit library dependencies instead of dlopen.
+	# This makes breakages easier to detect by revdep-rebuild.
+	myconf+="
+		-Dlinux_link_gsettings=1
+		-Dlinux_link_libpci=1
+		-Dlinux_link_libspeechd=1
+		-Dlibspeechd_h_prefix=speech-dispatcher/"
+
+	# TODO: use the file at run time instead of effectively compiling it in.
+	myconf+="
+		-Dusb_ids_path=/usr/share/misc/usb.ids"
+
+	# 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"
+
+	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
+		myconf+=" -Dtarget_arch=x64"
+	elif [[ $myarch = x86 ]] ; then
+		myconf+=" -Dtarget_arch=ia32"
+	elif [[ $myarch = arm ]] ; then
+		# 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+=" -Dtarget_arch=arm
+			-Dsysroot=
+			$(gyp_use neon arm_neon)
+			-Ddisable_nacl=1"
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf+=" -Dwerror="
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Prevent linker from running out of address space, bug #471810 .
+		if use x86; then
+			filter-flags "-g*"
+		fi
+	fi
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX RANLIB
+
+	# Tools for building programs to be executed on the build system, bug #410883.
+	export AR_host=$(tc-getBUILD_AR)
+	export CC_host=$(tc-getBUILD_CC)
+	export CXX_host=$(tc-getBUILD_CXX)
+	export LD_host=${CXX_host}
+
+	build/linux/unbundle/replace_gyp_files.py ${myconf} || die
+	egyp_chromium ${myconf} || die
+}
+
+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
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	ninja -C out/Release -v -j $(makeopts_jobs) ${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=(
+		"ICUStringConversionsTest.*" # bug #350347
+		"MessagePumpLibeventTest.*" # bug #398591
+		"TimeTest.JsTime" # bug #459614
+		"SecurityTest.NewOverflow" # bug #465724
+	)
+	runtest out/Release/base_unittests "${excluded_base_unittests[@]}"
+
+	runtest out/Release/cacheinvalidation_unittests
+
+	local excluded_content_unittests=(
+		"RendererDateTimePickerTest.*" # bug #465452
+	)
+	runtest out/Release/content_unittests "${excluded_content_unittests[@]}"
+
+	runtest out/Release/crypto_unittests
+	runtest out/Release/gpu_unittests
+
+	# TODO: add media_unittests after fixing compile (bug #462546).
+	# runtest out/Release/media_unittests
+
+	local excluded_net_unittests=(
+		"NetUtilTest.IDNToUnicode*" # bug 361885
+		"NetUtilTest.FormatUrl*" # see above
+		"DnsConfigServiceTest.GetSystemConfig" # bug #394883
+		"CertDatabaseNSSTest.ImportServerCert_SelfSigned" # bug #399269
+		"CertDatabaseNSSTest.TrustIntermediateCa*" # http://crbug.com/224612
+		"URLFetcher*" # bug #425764
+		"HTTPSOCSPTest.*" # bug #426630
+		"HTTPSEVCRLSetTest.*" # see above
+		"HTTPSCRLSetTest.*" # see above
+		"SpdyFramerTests/SpdyFramerTest.CreatePushPromiseCompressed/2" # bug #478168
+		"*SpdyFramerTest.BasicCompression*" # bug #465444
+	)
+	runtest out/Release/net_unittests "${excluded_net_unittests[@]}"
+
+	runtest out/Release/printing_unittests
+
+	local excluded_sql_unittests=(
+		"SQLiteFeaturesTest.FTS2" # bug #461286
+	)
+	runtest out/Release/sql_unittests "${excluded_sql_unittests[@]}"
+
+	return ${exitstatus}
+}
+
+src_install() {
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome || die
+
+	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/*.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
+}
-- 
cgit v1.2.3-65-gdbad