Version bump for dev channel release.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

5 files changed, 490 insertions, 7 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 240e2630737c..a7729442247b 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.676 2012/07/22 16:52:26 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.677 2012/07/24 03:27:28 floppym Exp $
+
+*chromium-22.0.1215.0 (24 Jul 2012)
+
+  24 Jul 2012; Mike Gilbert <floppym@gentoo.org> +chromium-22.0.1215.0.ebuild,
+  +files/chromium-libyuv-system-libjpeg-r0.patch, chromium-9999-r1.ebuild:
+  Version bump for dev channel release.
 
   22 Jul 2012; Mike Gilbert <floppym@gentoo.org> chromium-20.0.1132.57.ebuild,
   chromium-21.0.1180.41.ebuild, chromium-21.0.1180.49.ebuild,
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 54faeaf19913..3d1812157574 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -7,6 +7,7 @@ AUX chromium-expat-r0.patch 513 SHA256 af117c11c385a8d401601118ed0d31ea7486684c0
 AUX chromium-glib-r0.patch 451 SHA256 42469853c5cb1d4376567419f78af848b0f4a1b9f68ce9b5c8ce8c0b3d506193 SHA512 cddac3fa7a2b9b62e73a3ae36d67a29469d76d8c48378a7c08db617325c2b193d0f4ebb81b3b0c9a375ef6d9bd922e9f4d8a3177083ce260bf94336f17792432 WHIRLPOOL d31c9fbcaa7561e8f44273966740f63be93970518c177a449ff6164a2dd0792aba2e171b3df3187960388ce4c5a1e677017951d96d44ff40b1f35e7ec03735bd
 AUX chromium-gyp-settings-r0.patch 383 SHA256 709e4c8937d7f839f0dd16db905e1834a502bc2cf192329d720b508ef006cfc6 SHA512 7d1d640ea6c5e442f1fce20b3689bdebc108ea3a03444f5a638b21a9a73cfc8739b7e01351fc9a724eb006f78b1c2ea7277c1a44f0a6ac10e7c8f5b820d99e53 WHIRLPOOL e35acd35e2ca208bb9c1852cc4b4299eb4df574fe70d172961303dd0f30b97675482157755662f304a6021199293c4e33f45c8af1e0984cd4265b87e9559d9cc
 AUX chromium-launcher-r2.sh 940 SHA256 842e121bbfa33513ca964744f0ba8401401946e672cd6a0a95bc80a28212e87e SHA512 64ec5e0a4f524bd6164fe33a022419d6cf54822754b172e85ea003c47f9bfe6ed996353af707a4e16369a68d2f2e7d51f186397a48da42f13eb3dccb7e4ae4f8 WHIRLPOOL 4a2284957bb462ded600f14b1aaa7e29389181cda149b9090cb7b6fe8303dc5692519da6281769925b2122578ba2ea0ef8a1563077a62d7cdf7ca243c165805a
+AUX chromium-libyuv-system-libjpeg-r0.patch 808 SHA256 ee975e87a9cc1a139eb8f79d80f28a9a031c95371fe09e41631d4f3d2e806fad SHA512 244fad5b76c1101374098489868bce8dc55232c48fdf6c716c4b8f9aa71ad14af7f45549885b5ac047b88dbb964360700eea4298f1a7e2392b97ba124354b2ca WHIRLPOOL 940ed6bc73421858a984e2af550f233d992a0dbc1146b44cee3410cd117fdee69300ac3ba4c46e9924f648008685465db7c2da152d0dfc2a45c4645ad3ab3596
 AUX chromium-media-no-sse-r0.patch 519 SHA256 71751bf5913da1eec3c88c433044224c869b0abd5a29172cf239bddbb4eff761 SHA512 61477be531137dd2a9b86cea8069bd7b7da14ab8d4bfab07ea73f83c114644a6c3c6e75a03b5240693a3aa1d7ad4d314dbcf3b0f4f9aa7e0e234afbe0de74e62 WHIRLPOOL c10d0e9b26fee210843a3d91aa82fa5db7ad2248fbbb540a495040c4ceba016b1ab6090190bc3d7eb8dc8c4e47b823f8904ccc3f8a3f47dac0397bee547fd540
 AUX chromium-ppapi-r0.patch 422 SHA256 1f4b57670d317959bc2dc60e5d2a44aa8fc6028f7ed540cdb502fa0aa99c81bd SHA512 c809500724543e6a32a995ad547f19a8768f4e59ee4f4c9d7ad0b11dfbdc2a4795db2d5f272356a879bb31f305401b898c942f11207bb281430bc7c0c218f4a9 WHIRLPOOL 1e648552d740da7e1bd36fdd28f30464f725283d08c5293317a546d69b75144c383f74614dae29405581fb17bc2a52e6dfeb0c139fb62117dbead20b4d4db6fa
 AUX chromium-revert-jpeg-swizzle-r2.patch 2233 SHA256 d99162aa6bae562f116a42347254bbec3752464f0a3e4d8675e2b287b2a838a2 SHA512 587c892ef76bd3042fb12daf4a52aace556674207b2b3164d20d46037b26e7b06b56dc8b7f176f8640d08a980276182c346b2e2b24808c3dbf0526db2e4b1596 WHIRLPOOL dde8d31c1ebbc535b67f695efc1cf87e2df5db7c399b61bb0489d090577aea97588f8313933fbd8e05111ea24c4b3da07dc0888cba2c2cf6c82ecb13c2306f23
@@ -24,20 +25,22 @@ DIST chromium-21.0.1180.41.tar.bz2 192334646 SHA256 8a0c4824403bd618d14bb197a5b9
 DIST chromium-21.0.1180.49.tar.bz2 192245691 SHA256 505e6cb92f41bfdae8c08e1a1dae31ed41a9bb2650d9564837bafb062e91d081 SHA512 839a6b8bbf13dfc966d83fa0dc8849ba7d40bda79870feffec82a37e62fb1bfe26aa61d6052c28732e7b60ce89cb831d4257ac831903d76492aa28b7090a0913 WHIRLPOOL 0b5bc1dec4a23ace417811ad2db8fd4337e57c225528a46677070bb699c347353e97b6bef7067cc3ac2d04b454a73864d99185c7b7ea261d21e98389da897f28
 DIST chromium-22.0.1201.0.tar.bz2 192832381 SHA256 5f52531cdf63b56fd504a44ad11c55bd71ecbc754c78c2ebe2342ba1eb0b3341 SHA512 ecd7fd5bd4e9ddf47d3a3b7693d2bcb30815a4a0585b5a14e852ef12128ff454f3a1c04cc12cb8d86fe5916109d5934dc121195e21a4c9e001e2180e31bc3ac7 WHIRLPOOL 57497d56ee7b1b556d80ceeee696812d8800bed3f97de90d9a0deaa0df57f8044371b64d1cc5f71b3409f75daf42928b1606b8c1bae04f7cebf6732a274ca6c2
 DIST chromium-22.0.1207.1.tar.bz2 193255393 SHA256 97c6eaa00ca046cf1f5eeafa338ae742534fa051145977b8d3bc86ff9952ffcf SHA512 90a83db412d93a71a8a060003e823f8fdb51af4a040b2c235fd8e8ce1495e77ac06cf692e0300fec4091e87fd56357dbc778551c02cd9b3b862766dcead5514d WHIRLPOOL 562117e5a8e6caa92f39ee5a2fcf53bbb45f4f2b2b1e8e07007e7b30c016369ca389d7d9c623a163174346667745b5f81dbdb62309eb2cff70daa465a1567d24
+DIST chromium-22.0.1215.0.tar.bz2 193757702 SHA256 ab0643419ecde9128a8472276d2178972d9480029e2459a0e8c4c91c85f8b389 SHA512 a74ff3d19428a783f774b3df68e64d38fd79df9e8eb64130152d9c6686a28059694116d912aae18016e74cef3888c607a51ca95d330988332c495ef0337b7c96 WHIRLPOOL 24219d0d2ee27fd52514d6427a39424bc54f3c056f7a23c816cbe346b114f1b24dc517c4e333b4342d74917cdb1f437fce3426d3725547831a0b9a9bed796c3a
 EBUILD chromium-20.0.1132.57.ebuild 13721 SHA256 b20c6082323eb69ba07bc8efb29d11211461cf9d3f23c926056bce414c705c65 SHA512 3f7374aa30e8880b061153b95cf0e268ee921ae0a168af210460f5881743bf259f001ced768c112d635882d34aa5840e7ff44c99387765a08eef19ac8e967b20 WHIRLPOOL fde252cafd43fb4cc414f19425b39303459e3d3a40a909bb723bd4b182da7667621f5015efe5ec2f564029abac0e5630a43366c804fea6f625313ce5f12cf570
 EBUILD chromium-21.0.1180.41.ebuild 13827 SHA256 d840a3fc2a3c93550b8dbfdf76fdb739bb7ea8c0e73daac85e4e98010f200f04 SHA512 ead4c927f489f363f9e68e6cef353a589a78721eed4a45425f4f16a1e847be684cc34d1abb80ff66afe16977b4eaf654bc7a11cf3840b4ee50a5844556a6eac1 WHIRLPOOL 9143a49940ac0205993cf582f6552a632c3438927fce9aa81c5c6aa5ed3713a2dbe23551612343013d2b823558d410f0f8da7aaf2df9ae029d0cc99ca337c84f
 EBUILD chromium-21.0.1180.49.ebuild 13827 SHA256 195fb99b6a8114b4030fac33edfaabaec025ef814ae98a8dc9bddd88e85419ee SHA512 4308f2e9c08f875abfd9dff5897fa3ff1fbf0e2fcf293a5f287ed703634e886b09a5ec42119b60fa4aa303f072f0f25203cf1509619ddacd613ec7e6c173be43 WHIRLPOOL 19527c32cd4cf9faa538457b7821d07151a3d8434c709d6ca10ba0e183aec606fa103216e9b531f5b0a937a0841381858069704cefada8b3dfd7d66b107bfe2f
 EBUILD chromium-22.0.1201.0.ebuild 13786 SHA256 9373b364546a430776ca10184b1e4cb9f7306086f3dfb6db30b3c2547b7fa4bc SHA512 6002153a82cd2733d686e2fd87670af3cedd2c6ad1a7d1915b2ea25cab5a6bc793f448622b050ca546397dc43b579fde61d64f10eee83c7eb9acbd020c563321 WHIRLPOOL d241d08c0781e5641c91553a7dd3c862ce2e42e0a5c2f3c4fd3b55da4c46098c8df5eb937f01f9bec874b041879d79b9b6bfd6b3d35a6a6aa2706846ab6dcb9c
 EBUILD chromium-22.0.1207.1.ebuild 13786 SHA256 748b459b1475aefb51806fccc84d5be23fb9c9d92e77e48d8b0e4e6f827c0b0a SHA512 21dbb277a0cc39c468e90cbb5c704f24b6de447f6db198ca0452eb11e98ccc9a232f50da495cbbcefce40fdf27f5478b50bd210dafa59f5a37efdcfd72257318 WHIRLPOOL 5acb5302c795f1bbb7be34364587e09c15045bee029082dfa64ba38da03f6db1fa55e665c671c5feac2200f40cc53d680b4d903af0ee578e97ec4702ed00ee4e
-EBUILD chromium-9999-r1.ebuild 15330 SHA256 2d7ea8280f7c56537d9f30f86f6cf9e1d202de5372384124fe826d79b6c2a045 SHA512 aa09be5239153cf68b9f3111e2a02b5e95a2a6da2c8dfe766b97d595e62f3ea4e81300edfe24b64a8bef15baf545c7a9e04c866a0848b294d3796c6ce8bfd42a WHIRLPOOL 483a35991796ba7b5c6d43729f9b671ebf0704e78afe351942b266dbb4405996f3bc5df38ea995120570e22baa339bf3a91b5c49c52d3f98271b83d9ac82dccb
-MISC ChangeLog 29741 SHA256 15fd95fe68b0c46fa4c70a3eb785eabda8922d0937ba606f36454295c26e6e0e SHA512 ad195bfc5040485a7389e92d6ed36990ab0ecc54720b1478365900e3ddd3d247aa4dccc93c8656c5b6f30742c7f893b356db4d533affdcb48d47aabeef2a09fe WHIRLPOOL 80b70eee07cc8a319da60ae4776f1ef433ed5e2e66319ff183322d6dd9d6db9ce7dc494efee58afdaf437355d42636d1dd2b153af949cf4d87e9ab9b01d7887e
+EBUILD chromium-22.0.1215.0.ebuild 13882 SHA256 bd2c7f95cc682d332ec03928438fe5a4ff4a5bf52abad2ff3c1dbb0c7d8c869a SHA512 343889c2680510df1c85a9bb6343687d940a77f1bd6697dfe3e80b46bb49db900470abad6b4549c5bacd29b5223611255a05f27f78aaf23f0592b8a75c5f8a3e WHIRLPOOL b364099073a38214aa84b7ce37fd42e216ce5675cb3fdd98772e7c4d25fceb9f50d80e760d93ea983130b1f753563226aad08e6083b51fb013f17e88b2f865b0
+EBUILD chromium-9999-r1.ebuild 15366 SHA256 7a32392b9cf2c40ccbac67616921b986d4eecd290d81e7d991cf7ac92a0688b7 SHA512 9c4013312bd5a384783dc8b064e4beecddcadf072b952950dcac178b6981696f8226674a1842c5f4e83c41c9ed84fee6f534424c7ea0a6e8aed8aa968a8cab26 WHIRLPOOL 6bd0ab83ef4cd6cb73005da6056abb7216c43cb17c56054eae1aaee28e94d70e14a2feb248856edb4264210c81b0d85cba1f9600cc2de68432cfad786977e994
+MISC ChangeLog 29973 SHA256 f67a1c2b9ac2c364a197b69bd46d699268863bc2671bf254329fe8a0db396c7c SHA512 3717431c9bd8373908e2334c7b59e2b952cb6a68b93f7921cf99863de84a711839f76f2dae8aa78eb544df53c21a20d1aa6ce3d42826f7a15a53eb93ff0f18cc WHIRLPOOL 6952eb87a4a7d26b5f80b3fbb33c2beccc37051568725bb5dae0fe6b02ef3fc989da7a6c975e831b63cd12053f51fa7f5085002c29e467d6d78beb2ca84d6d40
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
 MISC chromium-20.0.1132.57.ebuild.orig 13698 SHA256 75102fdb614046b23386fbb6a00213b87a7336cbdc1c3f90a989c5cacb7ab54a SHA512 02f0e28f5f7f585f08cd67e7fcc5bc6f3855ee306200a5c19af9d6a305f44205e4ce305b6a282e8bf36cad506249db8b6ac3be9a95e3c6508deac054f268b436 WHIRLPOOL b15f5dcfd3b6f38072276e7ae4cc7c6fabbc6d341aa134ddde89544edd8927cce62955cd00c1f4f1a913ffb44c9e99fdd632499ab1cfacc5866ebff450ee4081
 MISC metadata.xml 267 SHA256 4e6afae33f60d6752cacf2785f7f9a396b8711cce605b73d0d752a4af7d01fc8 SHA512 f6d64d50bfbfad74db0ca0454fcba335a1744d11a44f921f19545c478219c507994cfcaba13160215cbb5a77d0bc82cdbf64a90a4b1b169184e404e404f9029e WHIRLPOOL 66a5cdeac3a86b910040d4c601fef50465fb0e0a0805e6b1c22cde2a83a63a2a1d441643af5454775becdfc65c71116d00b27703a7dd15ced183fb223c32f075
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlAML9IACgkQC77qH+pIQ6RHygEAxjktdAX+QA3GKqWK5y0HVg/t
-pGU1EG7uCYP3h3gYOH0A/jsOVq2l9I8YRhtoqGuceujnALwbiZlj46mwpYnY4RBW
-=YTjZ
+iF4EAREIAAYFAlAOFigACgkQC77qH+pIQ6Sp1wD9HEZBHfdXzO9HtQa0/JbrOG6F
+P+4CI2UhLuiT/zURrW4BAIsGeVtwrdJhf9qQm0ERI4dVEpRY0+tPwRfFVqr2Kxyv
+=qkUE
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-22.0.1215.0.ebuild b/www-client/chromium/chromium-22.0.1215.0.ebuild
new file mode 100644
index 000000000000..9db0283bbe93
--- /dev/null
+++ b/www-client/chromium/chromium-22.0.1215.0.ebuild
@@ -0,0 +1,442 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-22.0.1215.0.ebuild,v 1.1 2012/07/24 03:27:28 floppym Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2:2.6"
+
+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 toolchain-funcs versionator virtualx
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/"
+SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bindist cups gnome gnome-keyring kerberos pulseaudio selinux"
+
+RDEPEND="app-arch/bzip2
+	cups? (
+		dev-libs/libgcrypt
+		>=net-print/cups-1.3.11
+	)
+	>=dev-lang/v8-3.11.10.6
+	dev-libs/dbus-glib
+	dev-libs/elfutils
+	dev-libs/expat
+	>=dev-libs/icu-49.1.1-r1
+	>=dev-libs/libevent-1.4.13
+	dev-libs/libxml2[icu]
+	dev-libs/libxslt
+	>=dev-libs/nss-3.12.3
+	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/libjpeg-turbo-1.2.0-r1
+	media-libs/libpng
+	media-libs/speex
+	pulseaudio? ( media-sound/pulseaudio )
+	sys-fs/udev
+	sys-libs/zlib
+	virtual/libusb:1
+	x11-libs/gtk+:2
+	x11-libs/libXinerama
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	kerberos? ( virtual/krb5 )
+	selinux? ( sys-libs/libselinux )"
+DEPEND="${RDEPEND}
+	>=dev-lang/nacl-toolchain-newlib-0_p9093
+	dev-lang/perl
+	dev-lang/yasm
+	dev-python/ply
+	dev-python/simplejson
+	>=dev-util/gperf-3.0.3
+	>=sys-devel/bison-2.4.3
+	<sys-devel/bison-2.6
+	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 tools, bug #340795.
+	tc-export AR CC CXX RANLIB
+
+	# Make sure the build system will use the right python, bug #344367.
+	python_set_active_version 2
+	python_pkg_setup
+
+	if ! use selinux; then
+		chromium_suid_sandbox_check_kernel_config
+	fi
+
+	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() {
+	ln -s /usr/$(get_libdir)/nacl-toolchain-newlib \
+		native_client/toolchain/linux_x86_newlib || die
+
+	# zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 383371.
+	sed -i '1i#define OF(x) x' \
+		third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.h || die
+
+	# Fix build without NaCl glibc toolchain.
+	epatch "${FILESDIR}/${PN}-ppapi-r0.patch"
+
+	epatch "${FILESDIR}/${PN}-libyuv-system-libjpeg-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/*' \
+		\! -path 'third_party/cacheinvalidation/*' \
+		\! -path 'third_party/cld/*' \
+		\! -path 'third_party/ffmpeg/*' \
+		\! -path 'third_party/flac/flac.h' \
+		\! -path 'third_party/gpsd/*' \
+		\! -path 'third_party/harfbuzz/*' \
+		\! -path 'third_party/hunspell/*' \
+		\! -path 'third_party/hyphen/*' \
+		\! -path 'third_party/iccjpeg/*' \
+		\! -path 'third_party/jsoncpp/*' \
+		\! -path 'third_party/khronos/*' \
+		\! -path 'third_party/launchpad_translations/*' \
+		\! -path 'third_party/leveldatabase/*' \
+		\! -path 'third_party/libjingle/*' \
+		\! -path 'third_party/libphonenumber/*' \
+		\! -path 'third_party/libsrtp/*' \
+		\! -path 'third_party/libusb/libusb.h' \
+		\! -path 'third_party/libva/*' \
+		\! -path 'third_party/libvpx/*' \
+		\! -path 'third_party/libwebp/*' \
+		\! -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/npapi/*' \
+		\! -path 'third_party/openmax/*' \
+		\! -path 'third_party/ots/*' \
+		\! -path 'third_party/protobuf/*' \
+		\! -path 'third_party/qcms/*' \
+		\! -path 'third_party/scons-2.0.1/*' \
+		\! -path 'third_party/sfntly/*' \
+		\! -path 'third_party/skia/*' \
+		\! -path 'third_party/smhasher/*' \
+		\! -path 'third_party/speex/speex.h' \
+		\! -path 'third_party/sqlite/*' \
+		\! -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/webgl_conformance/*' \
+		\! -path 'third_party/webrtc/*' \
+		\! -path 'third_party/zlib/contrib/minizip/*' \
+		-delete || die
+
+	local v8_bundled="$(chromium_bundled_v8_version)"
+	local v8_installed="$(chromium_installed_v8_version)"
+	einfo "V8 version: bundled - ${v8_bundled}; installed - ${v8_installed}"
+
+	# Remove bundled v8.
+	find v8 -type f \! -iname '*.gyp*' -delete || die
+
+	# The implementation files include v8 headers with full path,
+	# like #include "v8/include/v8.h". Make sure the system headers
+	# will be used.
+	# TODO: find a solution that can be upstreamed.
+	rmdir v8/include || die
+	ln -s /usr/include v8/include || die
+
+	# Make sure the build system will use the right python, bug #344367.
+	# Only convert directories that need it, to save time.
+	python_convert_shebangs -q -r 2 build tools
+}
+
+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 tcmalloc, it causes problems with e.g. NVIDIA
+	# drivers, bug #413637.
+	myconf+=" -Dlinux_use_tcmalloc=0"
+
+	# Disable glibc Native Client toolchain, we don't need it (bug #417019).
+	myconf+=" -Ddisable_glibc=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_ffmpeg
+	# 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_vpx
+	# TODO: use_system_webp (https://chromiumcodereview.appspot.com/10496016
+	#       needs to become part of webp release)
+	myconf+="
+		-Duse_system_bzip2=1
+		-Duse_system_flac=1
+		-Duse_system_icu=1
+		-Duse_system_libevent=1
+		-Duse_system_libjpeg=1
+		-Duse_system_libpng=1
+		-Duse_system_libusb=1
+		-Duse_system_libxml=1
+		-Duse_system_speex=1
+		-Duse_system_v8=1
+		-Duse_system_xdg_utils=1
+		-Duse_system_yasm=1
+		-Duse_system_zlib=1"
+
+	# Optional dependencies.
+	# TODO: linux_link_kerberos, bug #381289.
+	myconf+="
+		$(gyp_use cups)
+		$(gyp_use gnome use_gconf)
+		$(gyp_use gnome-keyring use_gnome_keyring)
+		$(gyp_use gnome-keyring linux_link_gnome_keyring)
+		$(gyp_use kerberos)
+		$(gyp_use pulseaudio)
+		$(gyp_use selinux selinux)"
+
+	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"
+
+	if ! use bindist; then
+		# Enable H.624 support in bundled ffmpeg.
+		myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=Chrome"
+	fi
+
+	local myarch="$(tc-arch)"
+	if [[ $myarch = amd64 ]] ; then
+		myconf+=" -Dtarget_arch=x64"
+	elif [[ $myarch = x86 ]] ; then
+		myconf+=" -Dtarget_arch=ia32"
+	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
+
+	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="$(tc-getCC)" CFLAGS.host="${CFLAGS}" \
+		CXX.host="$(tc-getCXX)" CXXFLAGS.host="${CXXFLAGS}" \
+		LINK.host="$(tc-getCXX)" LDFLAGS.host="${LDFLAGS}" \
+		AR.host="$(tc-getAR)" || 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
+		einfo "${cmd}" "$@"
+		LC_ALL="${mylocale}" VIRTUALX_COMMAND="${cmd}" virtualmake "$@"
+	}
+
+	# ICUStringConversionsTest: bug #350347.
+	# MessagePumpLibeventTest: bug #398501.
+	runtest out/Release/base_unittests \
+		'--gtest_filter=-ICUStringConversionsTest.*:MessagePumpLibeventTest.*'
+
+	runtest out/Release/cacheinvalidation_unittests
+	runtest out/Release/crypto_unittests
+	runtest out/Release/googleurl_unittests
+	runtest out/Release/gpu_unittests
+	runtest out/Release/media_unittests
+
+	# NetUtilTest: bug #361885.
+	# DnsConfigServiceTest.GetSystemConfig: bug #394883.
+	# CertDatabaseNSSTest.ImportServerCert_SelfSigned: bug #399269.
+	runtest out/Release/net_unittests \
+		'--gtest_filter=-NetUtilTest.IDNToUnicode*:NetUtilTest.FormatUrl*:DnsConfigServiceTest.GetSystemConfig:CertDatabaseNSSTest.ImportServerCert_SelfSigned:URLFetcher*'
+
+	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
+
+	doexe out/Release/nacl_helper{,_bootstrap} || die
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/nacl_irt_*.nexe || die
+	doins out/Release/libppGoogleNaClPluginChrome.so || die
+
+	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
+
+	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-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index c06ae3d9c5be..3a5ea7b3084d 100644
--- a/www-client/chromium/chromium-9999-r1.ebuild
+++ b/www-client/chromium/chromium-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.124 2012/07/17 03:49:57 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.125 2012/07/24 03:27:28 floppym Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -180,6 +180,7 @@ src_prepare() {
 		\! -path 'third_party/gpsd/*' \
 		\! -path 'third_party/harfbuzz/*' \
 		\! -path 'third_party/hunspell/*' \
+		\! -path 'third_party/hyphen/*' \
 		\! -path 'third_party/iccjpeg/*' \
 		\! -path 'third_party/jsoncpp/*' \
 		\! -path 'third_party/khronos/*' \
diff --git a/www-client/chromium/files/chromium-libyuv-system-libjpeg-r0.patch b/www-client/chromium/files/chromium-libyuv-system-libjpeg-r0.patch
new file mode 100644
index 000000000000..14832d59fcd9
--- /dev/null
+++ b/www-client/chromium/files/chromium-libyuv-system-libjpeg-r0.patch
@@ -0,0 +1,31 @@
+https://webrtc-codereview.appspot.com/701006/
+--- a/third_party/libyuv/libyuv.gyp
++++ b/third_party/libyuv/libyuv.gyp
+@@ -7,12 +7,25 @@
+ # be found in the AUTHORS file in the root of the source tree.
+ 
+ {
++  'variables': {
++    'use_system_libjpeg%': 0,
++  },
+   'targets': [
+     {
+       'target_name': 'libyuv',
+       'type': 'static_library',
+-      'dependencies': [
+-         '<(DEPTH)/third_party/libjpeg_turbo/libjpeg.gyp:libjpeg',
++      'conditions': [
++        ['use_system_libjpeg==0', {
++          'dependencies': [
++             '<(DEPTH)/third_party/libjpeg_turbo/libjpeg.gyp:libjpeg',
++          ],
++        }, {
++          'link_settings': {
++            'libraries': [
++              '-ljpeg',
++            ],
++          },
++        }],
+       ],
+       'defines': [
+         'HAVE_JPEG',