Dev channel bump.

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

5 files changed, 583 insertions, 10 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 1ba5db485578..71fdf8b84f16 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,13 @@
 # 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.815 2013/02/26 19:01:47 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.816 2013/02/27 22:41:02 phajdan.jr Exp $
+
+*chromium-27.0.1423.0 (27 Feb 2013)
+
+  27 Feb 2013; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +files/chromium-system-ffmpeg-r3.patch, +chromium-27.0.1423.0.ebuild,
+  chromium-9999-r1.ebuild:
+  Dev channel bump.
 
 *chromium-26.0.1410.12 (26 Feb 2013)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 620efb762a1b..129669df4671 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -22,6 +22,7 @@ AUX chromium-svnversion-r0.patch 480 SHA256 f265a9ea756810f623289523d58b0c58b4ea
 AUX chromium-system-ffmpeg-r0.patch 1427 SHA256 bc0a5df11c60fe176d8ee2735aa97d1d43b8d6319997ca131647a6d7767d5411 SHA512 2527526065edf214ac6ecaba5a5f7d553340d46ba606fb712eea4a538ba8ca7a4c114b8df2ea65499f5d365f49c2797d95874799c76f2b44d9dccd61ad1938be WHIRLPOOL 90ca7608e1b8e885e01d223b6b8fa0463af217f385d9add10a5c47d2cf2c8729db18b5a78c3e4ce846386e44b8d77e1c37793ecd85fc21a7a4d31746dfeb18d2
 AUX chromium-system-ffmpeg-r1.patch 3522 SHA256 937bdb5cd0b34142399c6ea438d48086c45a1f6f8753cc6faac7c197c2da872f SHA512 6f46af9d11f27784276cadfe89f9c30c578ae61090a7d78adeb28bc76ba8ecdbc7d7f3f155edfbb6e05605fc51fc78e55bb86dac3a1869ca484028c2bbf57175 WHIRLPOOL 4826deaf080cde0183ccd437ce2598911736358b697b5c0980e719f92843710efef4333914a3a3c049d5125f239a65daf6e5466adb1b3787c026ee6e63335da6
 AUX chromium-system-ffmpeg-r2.patch 7178 SHA256 bcb48a35559793cf82eb72e16c84d75995fddaa9efee934ae91582e573695774 SHA512 1b641903939855901d5260752dcad29c2bbd17972e2c4556f3828b892817e277af90ce6fca15bd2927217ed2fccde028829f4c9900bc9de5df739154f090b6b9 WHIRLPOOL acc2639086811580450427eaa26d57c5caa3abd19c4d9cd1b554570c3732bb845023f838b2de0a480c2df7712f8c2d4f6ba81b20f44502fbd86bffbefb9672a6
+AUX chromium-system-ffmpeg-r3.patch 1788 SHA256 975292f51278fdcf147db0703e53947d53a691077ea22e47f66364f3e88f3282 SHA512 53a4404f3ce58d935648081f4012293527c7318da9ad456f71cdfd2a040f444098067f12b938a8c679a6c5a53381371259f1120a1420bfd57a9bbac0568c93e4 WHIRLPOOL 2767da9a699b1035cfba0dde326e481e3f4ceae588ea325df3ff3d826042c4864aaf51e36ffc4ad53104a2722f09846345d838a2f6074e66e47c09ae0ac2ae22
 AUX chromium-system-icu-r0.patch 337 SHA256 d634929ca192d867588a8eeaecb0c36de3f146e72cbc056896ce64ca1967f8a2 SHA512 179ac2e36606f300f9a381586713d8a32e27a9c4c5471cb81017f826bd4bdd4a4500d6fe0f0d4086c398ab4f21aa92a4d91a6388b97921940e0fb0e0ee0196d6 WHIRLPOOL afcd379f0c4d7e91a19201fd49793926ddc45d836ba139d6223558b224d919381606086534273aa39d2b5e0a9b73552eb946b006ad004fb6001aa376223bfbf2
 AUX chromium-system-libpng-r0.patch 385 SHA256 d0a8b8f5b3d25be4bd2f060422c467dc827997a0b69dfc34a6d18dc9d2f36868 SHA512 cf055c7151113f8650d280c153548b86fd33910394a6ea0202073dffbca362a4601d7f56f48d5709c58f78647f4a52c2f62d44eb862fcecc28d3b2e962b290f1 WHIRLPOOL d4ecb4db97fa2b6e3360705236fc3553cff0c717082db51645399f0dd50ab2ef528c18c7e67aaed88ed4ca61d3820bcc00de7828972cd93c3393b44ff8c5ac6e
 AUX chromium-system-nspr-r0.patch 540 SHA256 f1a441b8890dcb880fda9533b0206f17f1e85ee3e84e542d9c8fba5e54c88226 SHA512 b79923850623152feb0af595c266fb2f5a5f68ceae5565e9b4908f11c0d75a1fb3a14c0c98a06f12402072088c4379c68a73c81e37816c0554a48dd89377954d WHIRLPOOL d7e4620a1df2575d6fca281278dcaa99714e205beb1c7a2835b93bbe69c5cf236472522667cbea650399adb1bb8bb692cf0c96d588f1524c1093ef432a2b843e
@@ -38,19 +39,19 @@ AUX dot-gclient 253 SHA256 8c5750251ff681044cc584ef3768fe39c56c7877ade5fb9107298
 DIST chromium-25.0.1364.97-lite.tar.bz2 125698044 SHA256 f39861718cc1a0bde0ffbe15ce7957404881f0881640eb3fd2f92e2f344a20d2 SHA512 7bc1f3cd31059aba3ed12e89b90139f2dfefb0b7a57557372602eb14281ff64d259f0b973c37d7c4e2d12af1698b3a701115c7d4b8ca3e6cc104d7edcbf2a5ba WHIRLPOOL 56dad03ffc44f25170d220794b46a545fb6a5ad19670ed5ef3d855a39e77aea917032838cfa4c377db716ef5cf2701bc7eb70bbf4c545317ccebc4f536222a8d
 DIST chromium-26.0.1410.12.tar.xz 140786668 SHA256 b242b2c6e1d65cf3582e7e164bb2b6717e9d49cbeb17edb91ca5bedf28dddfb1 SHA512 b47e6dd6df3b14c4aaa2daa48eb50f57b3e766ae8f6702849e2aec9cc5963f567e46813df7f3472c5db9582dd2b97667634361b2a6094a11189d8a5a6b547517 WHIRLPOOL 764d37e67aede3f864e543b3574623929198699e736f047b023aad4b0c48d8086a5c74c2e9744ecbd878a58c5dbec3b9a3caad8df894035c7cefaed30d1d64af
 DIST chromium-26.0.1410.5.tar.xz 140737820 SHA256 235c2cceee85412459b8c80995777dd38f895210e8b68490a41fb94b7040acbf SHA512 f00a3b90fad051023b3e34b8b5ca248ccfd9e27b396ccc826a24a0e6ac6ca9548ab1c26b9b4d3d3462508c5dca58c53c00ccf5c81558b6040eaaab2d6ad2e994 WHIRLPOOL f08714b42391c55fa6719bab54200bdafdc4aaa9cc108ca40f8b046ddae544f315deebc09419dc34bb650ce098e013c6a4e0e64a889275b852c74faa918abefd
+DIST chromium-27.0.1423.0.tar.xz 141869340 SHA256 d346820b07acdd5e828329fb1cd6256987e26124c7b2fde369a41a8440cdd588 SHA512 49f9ee0fdb33fdf1131c4c3862aba0a056fb855631e272e54fa2942dab4ee990b7fc1886a08d8c6917bf9d3d442c128aa2273068ea6f76be43aed6d5f0f73b4f WHIRLPOOL 53e01b6029e6c5c818537e9948ba08f79921f2c6cc3c279a4374592d2176045a3a0ae93b1ce0ed7cfa1b442e1bc7e5711c4a68bce42b1a5d84996c6e18a82b66
 EBUILD chromium-25.0.1364.97.ebuild 16217 SHA256 e24e128b98d30457d34f87eea73cad3bad3149dfcb34ee27d59279fac277516d SHA512 5e718c82d9653719df8ec4bb23781ec593a25c349f68316cb2591f2797e3baa5674ccc22b8c6e5ac5eb6657ba62a3b422c8d9ec958a7eb8f7b7542c6a57921e0 WHIRLPOOL de343741d0bf1160b27abc02b65d971c4acb73c3aabf17215e20cf6bb3048d78f52c4ff634a66c2ee363b3b5285c21ecf0da7e0ba12be13f7cbc35140560c711
 EBUILD chromium-26.0.1410.12.ebuild 15741 SHA256 1e7eb65a9565fa6b5af042dc4357be5b8e919e2105478ea67f875afef2ec31ae SHA512 24177a004ba6705a2e858196a365940d11547cc60168a5cdb8224fa1e4e76af1a50df3309c82b6a7d4a25b3fb58dde5d9b52b5286c814ba6d3dc3fcca3f567c2 WHIRLPOOL 29b60fa15e508edc370ec9e0984eb47f2e562abac3f72ee6363c02e4936de838db47e1c92c0f2e203e8fce46887cb9558f0caefa6a87728b40fe72702bcd11eb
 EBUILD chromium-26.0.1410.5.ebuild 15798 SHA256 d9896a493a52195684bb03ed27dfd2e024c2e90ab20a2f2968128d9920bfb85a SHA512 bb9e2838359684e4cabd527526058a2fbd0bddafeb9d4869c3b5ef94c24671315c5d325385cbfa86555c3dfb27a31978cfdff46fa7c20809fa2513f391931afe WHIRLPOOL 771650b913a3fbb67676c865b5fb3ddba9499576b9e5893d0ee64745c6e4c5c7eaa9325d5780db4ec0f461ab60ae4ade689827af58ac7c9187a8b1fa573ac6be
-EBUILD chromium-9999-r1.ebuild 17485 SHA256 f30641b5649c3b4db36f9a3ba2c9b1076e663ad334ca244e1ba7aed51e7ea949 SHA512 7ffae482c11d533e9a3013439d4205279fe2603bcafc56c461e82e2f974a87979a4af3e7d028548ae955851d9615920271982a002b8b2ec8c81f004f20fa0c27 WHIRLPOOL 095010cfbaf9c285080de303f7d0b7972529d9289357989fabe0cf08bfa63e62333014250c0eccbe24ca90022899114b74c09e71e9b69cb207da5fef63a27712
-MISC ChangeLog 55189 SHA256 96613538bab8c52bc5008a1c778dac4019e60e2040677a56f276614d59e3bdc1 SHA512 1ce37dbb43d45e7ceaad602c4cef824e224669ac1ff471efa31e863fa295af6aea94b310ee779d71841fe4a079bc9046101777777ea2cd721afa9118e40fe2b3 WHIRLPOOL 6dcc016375af3b2db0ab42f5fa86391997c78e0831e648b78e2299864c8f3cd78ed21a5a57dd6d5a91c5b979b0745de6d5f4c377fdbd35f27985bb04086701ba
+EBUILD chromium-27.0.1423.0.ebuild 15740 SHA256 d6d5007c9e0627d963993405d8b6ee8fa4f2c873d9439e217028e3756b3be1d6 SHA512 bf2b29b9915c9bce01b0a7d1a539fced09d5350b3de7d34d953aa3aaab9865030dd09809bd288ff5440d15c6125db9ee3c2f23bf307af21e530dd456a5bf6fb6 WHIRLPOOL 182c04dae716aefb60d572b40eae2fd58e0eebdf3d5e3e5871d8f5cc981791dcc2af30477f2dcbc21644d089053ae5691817ee860a2c1bb9a7ec26aa544a9a68
+EBUILD chromium-9999-r1.ebuild 17485 SHA256 3614100fff6c456803d41cc74b4261d109c8ce2ef6a1a3dca55b3b0c3e9b650f SHA512 304d9359c769125e43a70792f75bc717dacd964c7f7d02daaf840e930d79d8d35eb74259575f22f58332fa24097203ebdb972ee988feafc1ccdabad8ee0b5054 WHIRLPOOL cce0bca41e5c340bd44702ab7d58bbf6ce81421c997c783371e1bef272bf643c538e6d7df516a62d1fd59eadf495b8295f2d1e6e85be3876f3cdc3e8486ea423
+MISC ChangeLog 55401 SHA256 fbce6797270a9d46c5ae43916bbcf8155d49037018e405c94c7d6c40ba5ba4fc SHA512 73e277e867e860d174f9aeda5f2535d543e51534c57db79af6593f2aa84c6fbe5a2e3fecb0a451556b7235e739d05c6de816e48afc467fad4ea4ae486d31741b WHIRLPOOL 30f8ac603c28e821933e40a3a1b20b5db31aa09402777afeb1b170071f04acdb4151d3f09ccc5b7311e06a875486aee8d2885f330f05c0480134dc0716ad1b21
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
-MISC chromium-9999-r1.ebuild.orig 17541 SHA256 3054c2bc54f63e1b8cf865fcc140e01a574e360b92e8ee06f3ab6effa3e8e629 SHA512 3b3e812ca940c243f7a9a4d38263dacbb3e97189fb23ac18613a7a9e6cb19c8427038b2b59684f172fadcd1924edfe10ea6b25a362d58faf626199433e881a73 WHIRLPOOL ddfb7f1a4b0e82e0c7ab3539b83cc74711076bf3eb38c0b699a3016d94749fb1f315c37c96e1a0b350ef8352de6b48e9098cbfbe54bf3ab4fe6e6754d95775d5
-MISC chromium-9999-r1.ebuild.rej 421 SHA256 9b61b9c90c8ae4eeebba5c88ba4fca768d030e0b42501327bdeb1e03b9b21bb1 SHA512 98e9a919a73b1aa89a3fdbc3a2d77478e13736d3fe8636616ad037e6b3eb1503e4ee8ab98f9fb9d1f1651a464bd893f643cb1d59aeb4b74e917baf578a9366f3 WHIRLPOOL 2f528e7e6978a4df1c739800930157878f5e2f4ba251ac2caf3436d92f471cd2617145bcd6ef1398a5fbcfe344e0c0ffab27cac5cef180f28276c0e19f8bb459
 MISC metadata.xml 516 SHA256 e5ca0cf3ef65ca054555c35bbb492d02b40138a907fae82aaa236f774fdef32f SHA512 580852722eb6ce8c660ea05b4b9a6a6ca04582c1438401e92425b6733e7a9423f048818153f59394081df6f89bee349da2b3c97a61e030f995df5ae00bc41b58 WHIRLPOOL 03ac4c1574b769bdeebe082281809af638223bdcbdea1bc2faef86f484e0f26298be769f6311023642257d49eb3d31f223c445b07dba5c6aa699775fcedff8ad
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEtBqIACgkQuUQtlDBCeQJ8DwCfemIpt5qcvOUGatvEv9g1PqaC
-e+4AnRfrYVT+mCMhQeS4iTNtm2S6K2I+
-=lR9d
+iEYEAREIAAYFAlEui4YACgkQuUQtlDBCeQKpygCdFkn1utlUTGe5FdoBP52W7auh
+b7UAnRg92NuhbEhURa3K1AExjd7NbuPl
+=MBf2
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-27.0.1423.0.ebuild b/www-client/chromium/chromium-27.0.1423.0.ebuild
new file mode 100644
index 000000000000..f7f392dbf4cb
--- /dev/null
+++ b/www-client/chromium/chromium-27.0.1423.0.ebuild
@@ -0,0 +1,513 @@
+# 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-27.0.1423.0.ebuild,v 1.1 2013/02/27 22:41:02 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 \
+	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"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bindist cups gnome gnome-keyring gps kerberos pulseaudio selinux system-ffmpeg tcmalloc"
+
+RDEPEND="app-accessibility/speech-dispatcher
+	app-arch/bzip2
+	cups? (
+		dev-libs/libgcrypt
+		>=net-print/cups-1.3.11
+	)
+	>=dev-lang/v8-3.16.11.1:=
+	>=dev-libs/elfutils-0.149
+	dev-libs/expat
+	>=dev-libs/icu-49.1.1-r1:=
+	dev-libs/jsoncpp
+	>=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
+	>=media-libs/libjpeg-turbo-1.2.0-r1
+	media-libs/libpng
+	>=media-libs/libwebp-0.2.0_rc1
+	!arm? ( !x86? ( media-libs/mesa[gles2] ) )
+	media-libs/opus
+	media-libs/speex
+	pulseaudio? ( media-sound/pulseaudio )
+	system-ffmpeg? ( >=media-video/ffmpeg-1.0[opus] )
+	>=net-libs/libsrtp-1.4.4_p20121108
+	sys-apps/dbus
+	sys-apps/pciutils
+	sys-libs/zlib[minizip]
+	virtual/udev
+	virtual/libusb:1
+	x11-libs/gtk+:2
+	x11-libs/libXinerama
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	kerberos? ( virtual/krb5 )
+	selinux? (
+		sec-policy/selinux-chromium
+		sys-libs/libselinux
+	)"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	!arm? (
+		>=dev-lang/nacl-toolchain-newlib-0_p9093
+		dev-lang/yasm
+	)
+	dev-lang/perl
+	dev-python/ply
+	dev-python/simplejson
+	>=dev-util/gperf-3.0.3
+	sys-apps/hwids
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	>=sys-devel/make-3.81-r2
+	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
+
+	if ! use selinux; then
+		chromium_suid_sandbox_check_kernel_config
+	fi
+
+	if use bindist && ! use system-ffmpeg; then
+		elog "bindist enabled: H.264 video support will be disabled."
+	fi
+	if ! use bindist; then
+		elog "bindist disabled: Resulting binaries may not be legal to re-distribute."
+	fi
+}
+
+src_prepare() {
+	if ! use arm; then
+		mkdir -p out/Release/obj/gen/sdk/toolchain || die
+		cp -a /usr/$(get_libdir)/nacl-toolchain-newlib \
+			out/Release/obj/gen/sdk/toolchain/linux_x86_newlib || die
+		touch out/Release/obj/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
+	fi
+
+	# Fix build without NaCl glibc toolchain.
+	epatch "${FILESDIR}/${PN}-ppapi-r0.patch"
+
+	epatch "${FILESDIR}/${PN}-gpsd-r0.patch"
+	epatch "${FILESDIR}/${PN}-system-v8-r0.patch"
+	epatch "${FILESDIR}/${PN}-system-ffmpeg-r3.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/*' \
+		\! -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/hyphen/*' \
+		\! -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/libvpx/*' \
+		\! -path 'third_party/libxml/chromium/*' \
+		\! -path 'third_party/libXNVCtrl/*' \
+		\! -path 'third_party/libyuv/*' \
+		\! -path 'third_party/lss/*' \
+		\! -path 'third_party/mesa/*' \
+		\! -path 'third_party/modp_b64/*' \
+		\! -path 'third_party/mongoose/*' \
+		\! -path 'third_party/mt19937ar/*' \
+		\! -path 'third_party/npapi/*' \
+		\! -path 'third_party/openmax/*' \
+		\! -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/v8-i18n/*' \
+		\! -path 'third_party/webdriver/*' \
+		\! -path 'third_party/webrtc/*' \
+		\! -path 'third_party/widevine/*' \
+		\! -path 'third_party/x86inc/*' \
+		-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 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_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+	# TODO: use_system_libvpx (http://crbug.com/174287).
+	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_libsrtp=1
+		-Duse_system_libusb=1
+		-Duse_system_libwebp=1
+		-Duse_system_libxml=1
+		-Duse_system_minizip=1
+		-Duse_system_nspr=1
+		-Duse_system_opus=1
+		-Duse_system_protobuf=1
+		-Duse_system_re2=1
+		-Duse_system_speex=1
+		-Duse_system_v8=1
+		-Duse_system_xdg_utils=1
+		-Duse_system_zlib=1
+		$(gyp_use system-ffmpeg use_system_ffmpeg)"
+
+	# TODO: Use system mesa on x86, bug #457130 .
+	if ! use x86 && ! use arm; then
+		myconf+="
+			-Duse_system_mesa=1"
+	fi
+
+	# 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 gps linux_use_libgps)
+		$(gyp_use gps linux_link_libgps)
+		$(gyp_use kerberos)
+		$(gyp_use pulseaudio)
+		$(gyp_use selinux selinux)"
+
+	# 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"
+
+	# TODO: use the file at run time instead of effectively compiling it in.
+	myconf+="
+		-Dusb_ids_path=/usr/share/misc/usb.ids"
+
+	if ! use selinux; then
+		# Enable SUID sandbox.
+		myconf+="
+			-Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox
+			-Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
+	fi
+
+	# 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 && ! use system-ffmpeg; then
+		# Enable H.624 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).
+		myconf+=" -Dtarget_arch=arm
+			-Dsysroot=
+			-Darmv7=0
+			-Darm_neon=0
+			-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
+	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.
+	tc-export_build_env BUILD_AR BUILD_CC BUILD_CXX
+
+	egyp_chromium ${myconf} || die
+}
+
+src_compile() {
+	local test_targets
+	for x in base cacheinvalidation crypto \
+		googleurl gpu media net printing sql; do
+		test_targets+=" ${x}_unittests"
+	done
+
+	local make_targets="chrome chromedriver"
+	if ! use selinux; then
+		make_targets+=" chrome_sandbox"
+	fi
+	if use test; then
+		make_targets+=$test_targets
+	fi
+
+	# See bug #410883 for more info about the .host mess.
+	emake ${make_targets} BUILDTYPE=Release V=1 \
+		CC.host="${BUILD_CC}" CFLAGS.host="${BUILD_CFLAGS}" \
+		CXX.host="${BUILD_CXX}" CXXFLAGS.host="${BUILD_CXXFLAGS}" \
+		LINK.host="${BUILD_CXX}" LDFLAGS.host="${BUILD_LDFLAGS}" \
+		AR.host="${BUILD_AR}" || 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 mylocale='en_US.utf8'
+	if ! locale -a | grep -q "$mylocale"; then
+		eerror "${PN} requires ${mylocale} 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 ${mylocale} is not supported"
+	fi
+
+	# For more info see bug #370957.
+	if [[ $UID -eq 0 ]]; then
+		die "Tests must be run as non-root. Please use FEATURES=userpriv."
+	fi
+
+	runtest() {
+		local cmd=$1
+		shift
+		local filter="--gtest_filter=$(IFS=:; echo "-${*}")"
+		einfo "${cmd}" "${filter}"
+		LC_ALL="${mylocale}" VIRTUALX_COMMAND="${cmd}" virtualmake "${filter}"
+	}
+
+	local excluded_base_unittests=(
+		"ICUStringConversionsTest.*" # bug #350347
+		"MessagePumpLibeventTest.*" # bug #398591
+	)
+	runtest out/Release/base_unittests "${excluded_base_unittests[@]}"
+
+	runtest out/Release/cacheinvalidation_unittests
+	runtest out/Release/crypto_unittests
+	runtest out/Release/googleurl_unittests
+	runtest out/Release/gpu_unittests
+
+	# TODO: re-enable when we get the test data in a separate tarball.
+	# 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
+	#	"URLFetcher*" # bug #425764
+	#	"HTTPSOCSPTest.*" # bug #426630
+	#	"HTTPSEVCRLSetTest.*" # see above
+	#	"HTTPSCRLSetTest.*" # see above
+	#)
+	# runtest out/Release/net_unittests "${excluded_net_unittests[@]}"
+
+	runtest out/Release/printing_unittests
+	runtest out/Release/sql_unittests
+}
+
+src_install() {
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome || die
+
+	if ! use selinux; then
+		doexe out/Release/chrome_sandbox || die
+		fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
+	fi
+
+	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
+
+	newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die
+	if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
+		sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" \
+			-i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
+		sed "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g" \
+			-i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
+		sed "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:" \
+			-i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
+	fi
+
+	# 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
+
+	if ! use system-ffmpeg; then
+		doexe out/Release/libffmpegsumo.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
+}
diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index a32adf858492..5403fafa0061 100644
--- a/www-client/chromium/chromium-9999-r1.ebuild
+++ b/www-client/chromium/chromium-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-9999-r1.ebuild,v 1.170 2013/02/26 19:01:47 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.171 2013/02/27 22:41:02 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -185,7 +185,7 @@ src_prepare() {
 	# Fix build without NaCl glibc toolchain.
 	epatch "${FILESDIR}/${PN}-ppapi-r0.patch"
 
-	epatch "${FILESDIR}/${PN}-system-ffmpeg-r2.patch"
+	epatch "${FILESDIR}/${PN}-system-ffmpeg-r3.patch"
 
 	epatch_user
 
diff --git a/www-client/chromium/files/chromium-system-ffmpeg-r3.patch b/www-client/chromium/files/chromium-system-ffmpeg-r3.patch
new file mode 100644
index 000000000000..d8917af0df22
--- /dev/null
+++ b/www-client/chromium/files/chromium-system-ffmpeg-r3.patch
@@ -0,0 +1,52 @@
+diff --git a/media/filters/ffmpeg_glue.h b/media/filters/ffmpeg_glue.h
+index 17241b9..8a92312 100644
+--- a/media/filters/ffmpeg_glue.h
++++ b/media/filters/ffmpeg_glue.h
+@@ -28,9 +28,9 @@
+ #include "base/basictypes.h"
+ #include "base/memory/scoped_ptr.h"
+ #include "media/base/media_export.h"
++#include "media/ffmpeg/ffmpeg_common.h"
+ 
+ struct AVFormatContext;
+-struct AVIOContext;
+ 
+ namespace media {
+ 
+diff --git a/media/media.gyp b/media/media.gyp
+index df217d2..fde3830 100644
+--- a/media/media.gyp
++++ b/media/media.gyp
+@@ -363,6 +363,9 @@
+           'dependencies': [
+             '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
+           ],
++          'export_dependent_settings': [
++            '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
++          ],
+         }, {  # use_ffmpeg == 0
+           # Exclude the sources that depend on ffmpeg.
+           'sources!': [
+diff --git a/webkit/media/webkit_media.gypi b/webkit/media/webkit_media.gypi
+index 81b770c..7b6d673 100644
+--- a/webkit/media/webkit_media.gypi
++++ b/webkit/media/webkit_media.gypi
+@@ -24,6 +24,7 @@
+       'dependencies': [
+         '<(DEPTH)/base/base.gyp:base',
+         '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
++        '<(DEPTH)/media/media.gyp:media',
+         '<(DEPTH)/media/media.gyp:shared_memory_support',
+         '<(DEPTH)/media/media.gyp:yuv_convert',
+         '<(DEPTH)/skia/skia.gyp:skia',
+--- a/media/ffmpeg/ffmpeg_common.cc.orig	2013-01-17 00:07:51.635057013 +0000
++++ b/media/ffmpeg/ffmpeg_common.cc	2013-01-17 00:15:50.867406811 +0000
+@@ -10,6 +10,8 @@
+ #include "media/base/video_frame.h"
+ #include "media/base/video_util.h"
+ 
++#undef SampleFormat
++
+ namespace media {
+ 
+ // Why FF_INPUT_BUFFER_PADDING_SIZE? FFmpeg assumes all input buffers are