Dev channel bump. Remove old.

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

4 files changed, 30 insertions, 601 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 5c5d55cf6bc3..4d102fd4ad91 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1113 2014/07/31 04:20:28 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1114 2014/08/06 16:09:06 phajdan.jr Exp $
+
+*chromium-38.0.2114.2 (06 Aug 2014)
+
+  06 Aug 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  -chromium-37.0.2062.35.ebuild, -chromium-38.0.2101.0.ebuild,
+  +chromium-38.0.2114.2.ebuild:
+  Dev channel bump. Remove old.
 
 *chromium-37.0.2062.58 (31 Jul 2014)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 0d23470f936a..846513603983 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -41,24 +41,32 @@ AUX chromium.default 148 SHA256 bdac1d32025d53158f96c8ad5bd71a58abdcf02f3a8759a4
 AUX dot-gclient 174 SHA256 0ae6d69323d1d286de7ef1fa62c330536ada7280bda7564fefb5d071384ed324 SHA512 ea858464ee8732536633259ed3d11990822e8b8493c07b83218856a127320ba21b9cfc184f7e7a899739bc5f938fbca25224e559fb7db8558cb86fccc743a685 WHIRLPOOL 72a5a9af7955e653151090b555c6a67a261ff807871fdda16d7c3fabf4b52449ac9caae466ba51a17d2efed74a68adc32687599ea4287cc033e75f787d874b55
 DIST chromium-36.0.1985.125-testdata.tar.xz 111516748 SHA256 566530e718daee0ce0e6d28710b54ff4dcdf42cc6bab62421203790c0d31459d SHA512 659ef9503ce3570cbee30a4b74934c94109352a5055a4c14f7151d74ccfc346b8328547aa1710849a5c4b09250130237363c6e6404b3f1b20b7b5470007ad398 WHIRLPOOL 54aca91ab8d78a9cc2bfa7b4167299fe732b8316af0198a7295debd6b4089992b1d4023d7da2f48deee9567acbeeae9f3d6530758ed9b1d476af5a1395afa70f
 DIST chromium-36.0.1985.125.tar.xz 205462088 SHA256 1782d0a5397e94313dee9e456de38bdfccf575c4e565f064a6ed7f9c509d5023 SHA512 a2c0f9b9fc91526ee053f0eca1aa2c6267b316717b8cb30bd5c50cad8891c28e1bf804838b2af035df46771d29d6815610066437d32afc504fbe39d2c48f303c WHIRLPOOL 3ee0ba43b0a3f93b4b7bededbe8443f1f9673a1c0712b7db09411ac96fe05327c835475ccb7298800b40c32dcac56573c0cf035f092ae52cf353b075c81fb16b
-DIST chromium-37.0.2062.35-lite.tar.xz 214296572 SHA256 0cd76f90031b51266ef9b6301fca5447fee341c6fd31ca8760157fc40cd9eaaa SHA512 d9da7460f829d1cc18e0bbfb683226c3a1d8260fa5a0613d5a0ec6db05e04eab8f3c1d0d6c0ccda5f32a619a8a99992fdfbb536d84f841b0aff7e4236bfd9431 WHIRLPOOL d1feb60b8bb9fcb5764b661fabd9d64f4932e21afc40a2f0ae912300246ca04e141f366a06ea72290d333c2cf9e66f69859e312915055ae3ca63b54ce3f438c1
 DIST chromium-37.0.2062.44-lite.tar.xz 214300252 SHA256 c8cb12ef7c61991a6044c2fe13950bec7e3d56301fa043869b3845406f1e3aad SHA512 4a8b1f3755674b846a812c1e7410f295619df4604164c350b0d76bfc0aac452fbcf779ba690da966c103d373689cda6db1eaa795c15f2ec9a9a993cad3c901d8 WHIRLPOOL f9b2989a615dfc2896825cda2b50e62a32e51ac2adfc551d7c0ac59576c2b472ff8a1c67cfb473289c181d714999b54a1e91aae11c277ab720b42a539c9cfe64
 DIST chromium-37.0.2062.58-lite.tar.xz 214313476 SHA256 af893a66b83dc9b236e400f178817e49feeacfd99ff48397c890a687dfe32410 SHA512 de5fbf53f3a441b3db9322cf27d60f87b6f232151fb72715a727e26c126f85bfd4e654b777e19992e467cee4b336384b63fcaf9db866031cc68447a14a455295 WHIRLPOOL ba9c2b030f835442414fd70fd10f6957fdfcc7123d6bffe3713d815c4cc23798a9f310abc21d5909b6be7ccbe8c9ebec9e24f8efc5271211006ef265bc5c91c2
-DIST chromium-38.0.2101.0-lite.tar.xz 219453756 SHA256 09ca3662caa376d62f66597f80e514656cb68c378894848e7f4034395cf28e7d SHA512 8ee05cf986ded8779e146826478d6e52504391b5603d104230dd703cfe2e3327667d7bf8b193b3b034048765e7c3ca6375189e929dc5c330e5d8ee974803121c WHIRLPOOL 2ff39e511da5cecb9af964e376ac536fe2dbaf11b7a4abbea4d3615316cf8bc13b800bfd37e18ff98d3c1f6dffedd29f0d98d01c6b40970283793d762474e04d
 DIST chromium-38.0.2107.2-lite.tar.xz 228350836 SHA256 7f31275be73c6933f785803b89b6f627ac6ec184d28f395aac724d736debd43e SHA512 2c17853f510d8c489993d2e07ad6e007398d429183938fda5c40293785d13bcf4db376c6077542735889aef9aba5051944e146ec94970358ec9496ad690d9bee WHIRLPOOL b9f98b030a175addfa1028444ae0f682443a89836146242671c1670069f711edbf615a095caf119696195fce6525546633fc48b651d3c40f8a97a00a225bec77
+DIST chromium-38.0.2114.2-lite.tar.xz 228583844 SHA256 288067699a5043f2f0ff5a279b7926b22d5556cd33964e8d36c93048e734aa14 SHA512 2beb586e70bcc14cdbad042dc5ee1b16c685a75d331da2f068c7e2347040dc140c956913209f04ed6c384c2e080dd72c81e5968abc2f7fcd5d718e7524c23e0a WHIRLPOOL b03b7222585a3d64feed112cd9a859d95d99c5283c099f4d0ce5f254ed4fe75c1dca68313b3d646a3db30c0ddf859e2680416440541d530ca1a963a71c89721d
 EBUILD chromium-36.0.1985.125.ebuild 20024 SHA256 d059a8f1c1d4c8a8838d272a2a10bb60eea0a05056e4a073df100529d5714183 SHA512 593b0ca1ed6c1fbdc15b9b0c426f54df337e7031d75bf468b3a3997840309c53c0c59178ad02e0d69de3c9f4a2db19319fafd745141a94f3c8f99ab1feed3722 WHIRLPOOL 52166987d30626c9dbf68ed78c5ca35cbe8d423e2d2f80a5d5bada34f8f0793a6ddd0330be5d4a84235162358e33db045e3b1edfdc5b0de6373dac40bab8189f
-EBUILD chromium-37.0.2062.35.ebuild 17558 SHA256 ea6ce35d7c8ea3ec71461fedd4ccc2fe7cd00ccbf1bb0932feb357abe0a80ec8 SHA512 0570c00cff65ae488dd14df7f7dc2f3ea5b70d5b91f31641033c647b681e97e4f27f7a2115f07dd66d0ebd2e5308ebdf6df4d4d2a15d3e6c3d5ab9288308a747 WHIRLPOOL a4aa59daf38afb3c24ce90843a93ef8d4ddc4f37b520ed55aa739321c8bad9c076651265ebad2bdbab8fc00e4c5e1f0fb456f03f8b3787ac36b17d8a38485e46
 EBUILD chromium-37.0.2062.44.ebuild 17705 SHA256 5d83270836f9969df534f07ca3ee43035bdef7affefe0d2c3f2f6349a6ad435e SHA512 7804f06d32b1ee85db14c13d83fa64c2eebffa33e7cf8af9c76cc4e0c1fa02a6f1febb5525f327532b7e04a68fd12c86ae9efb8924dc81924dad57bbe17501ff WHIRLPOOL 19a76afc1cb2dbff9a28c01f72adfd464dccafe8b14a50b5a70859d36e3a1baf7d7b4607de527dd46b89cee85505426d4c46f66fd2535a837183a99fcca20e1d
 EBUILD chromium-37.0.2062.58.ebuild 17702 SHA256 53ae7801b55bf637c69512e1191d73486326b2cf0dfb4aff249cbb5cf033591d SHA512 e9e9985fe9fddf4ebc6f5c312fee4d7915dd52d16060faaf5199e0b156d017410290f4d1bd41e39f1a2e1be490865d3a38804389c62f8a507adf021dab063dcc WHIRLPOOL 9147dfcd2c8a97c7b9fdb2c23eae4a7369eda5189d557a8c99dc7c85a3da4dcb230e139d1b88d30252ce6eb9a6651d70f0cd8fc56f207d0974ddd2d954ea66fb
-EBUILD chromium-38.0.2101.0.ebuild 17590 SHA256 c971e85c449f33c2ced56cf56d13ac738e363b9b6f669a9412fbb50423c01291 SHA512 7bf7ed41bccb640d4a874ae1354a46b63695cf96c77babaec3be70340cec0df7e1d3e135d5ec04eb0bc295c1d30446cb0cb2b417c5742377921f98212abded70 WHIRLPOOL 715325cf82e4fc221c38b07b21e41530109196655533b544c85b7b55940b0d2649c6b7f7c6697335462caadd828db22526944352c07f4f0ed30fd03c644a5886
 EBUILD chromium-38.0.2107.2.ebuild 17681 SHA256 ad7cf12a0e68bd69c51ef583c93998e625ca2e36b81b940789b48ee0998463a6 SHA512 60a04be1d9a1525ee304c1ec62aa61a67583a8f19989419ae37b162db2fe8ecb974d2d81d7e2d7eebcbd941dfc5694416976605f7b4725b80a6269f679d31380 WHIRLPOOL 60440790fff41972844638a1c1bfb721f36c18342359c8eeb603f3a4abc4bfbbcaaf039c58e32672864e0836c17108f2ba9e105c235a99644c4404f540f2a943
-MISC ChangeLog 111940 SHA256 481ea91dc5c72af07b7a05e6a12a30a150a6ebee1c1dd781e056b8aa80bc9819 SHA512 2e9f0b86734e9877bc67596339e81ea7cb00caa60bd30c34db62177230e153e696f6e966b11e56525995dda0ae41985c87fac482c030199dd60c11a1963cf3ea WHIRLPOOL 6a5a5390b4310ffdcd1a9b4a547d8312cedb69da93fd2a4f0dcf79cfa0c05398d5f0016c682a3c922d1291835c3f221be6a920ba2a210bc33badba9f32e90055
+EBUILD chromium-38.0.2114.2.ebuild 17636 SHA256 5258fc2dbc0329e8affefef99c0e2ec83abbdfbe10d4b65a983629163c51bafc SHA512 3d257b1814d17158a5557982bb61f3b615a872676ca56ec292a1f14211dce7ea46109bedc5d67cbb0e33203ca34bd871a552015c0a7f140723d80b57017e81a9 WHIRLPOOL cfce2f7a8152f5580144dc8f5c3ba73b7518642ceab3c4cf7030d7b27abd298f19fe049da2e89f8728d008403382df1e510548ea4d01b6c2982b180de1556d40
+MISC ChangeLog 112163 SHA256 de3961af6e90f47aa591091b290fabeb74a83530946c436ded72e90563bc4f5f SHA512 83998cf0ca9c179c28d81967eb02c15a892a3f6b9700050268b9511d530ad9eae75b89b2a2fe3de95241ece86ec6b9c9ff46de9ffbf359b99894c0e78b0ac057 WHIRLPOOL f4848c137a08fb975bdc691a9e26ac243f66caf2ca37072afd42ab50ed9401567de08f9b698e8bb4659e40b42cd88e59ecc0ee3f607aaaf61cb984923b921e89
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
 MISC metadata.xml 518 SHA256 821944f32fcf203b2573c164aeaa52fbc69e5f651d366cdda66901633461f5ef SHA512 01d29c4ce93a8a624fc8926e7e72e8bf124b91ae6fdbf6e7179e9d6ddd6db33d73acde62541777118da1c9d197c83d6c615c247d785e76a8ab560f915abd08d5 WHIRLPOOL f9b21a0d032d1f78b6aeb78f759b9f126b1b1cc118a5edd3a08eefcb2d7b51ff406abb95323fe05b4c04468aca68dddd3d39ce7edfb9b352abc1bc3890d7e1ab
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlPZxA4ACgkQC77qH+pIQ6SerQD+M7SIMsmDs6Q17kC2iiTROx9J
-zpEe8KYhJmB75DTjMuoA/0AzTkLAQRo5EQfW+57xWYHeT8Zri13sASkS5nR0/GTx
-=tjPi
+iQIcBAEBCAAGBQJT4lMtAAoJEE8aJVXqcZkdY1UP/0MSM0QtSc+Fp4rhKQ1sKfGG
+LPpm5kdrMWw8MOyDDIUwT1FmriNngLwP9mlOxISJiz4kvr4XWiEub4DigJES0wlO
+C7DvKsv7ZM64jcFgKphO0D+GGmJ0i/5jqfq6V+Gf5U0WDRXvGgQsdEvLm5yVokTp
+OESgVBbinQ+F+2DDM5wlulUBx0RVqvnt+Tm9yAb8t4COdTFdtLeUoGX3JOIKxABg
+yshs2GvvhXEHEsTaM3ZEQUeLmtFjq1EaWCDUDqnAKsc0OenBJi/B5Hm8pLTqcB7o
+Y6oxgyOjoY5Zj668sEZNrlxL6Vwa4ncVF3A60YYU0GlGm9YTiHbOyXbq/cbHooB7
+szcW4KYJoiJkaBk3WgdDxshQSw3OYG+63vVSGf/BCql8jqIQWtuMazwV9NO4ryJS
+jtFm7/8VLMMzG//L69aRTrgyDFSB4rlrPHuyLjFL+H2P4tZHJRNFQUzer7OGNBjJ
+ESazvgqjxkYSCeI0oNqvE95u2CZm7E2FNafSV25rISSPw63cFgDl+90/MOQaCcfl
+0QwPoq+QlHUktvNyHX7OrAh8geIJ/tF7DxdXNDdVKoHs9nTLVpyn6ZaPCbtJ+rrA
++vlOvQI8QC33KZJwBqEj0dWJkSlAwOruZ7TIOuSaHL/A0fH6pkFvb/LxwpyJTe6m
+SAnP0F1Ld07xcush+wZz
+=ycHF
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-37.0.2062.35.ebuild b/www-client/chromium/chromium-37.0.2062.35.ebuild
deleted file mode 100644
index cb104dc71477..000000000000
--- a/www-client/chromium/chromium-37.0.2062.35.ebuild
+++ /dev/null
@@ -1,587 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-37.0.2062.35.ebuild,v 1.1 2014/07/24 03:59:24 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 readme.gentoo toolchain-funcs versionator virtualx
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}-lite.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="bindist cups gnome gnome-keyring kerberos neon pic pulseaudio selinux +tcmalloc"
-
-# Native Client binaries are compiled with different set of flags, bug #452066.
-QA_FLAGS_IGNORED=".*\.nexe"
-
-# Native Client binaries may be stripped by the build system, which uses the
-# right tools for it, bug #469144 .
-QA_PRESTRIPPED=".*\.nexe"
-
-RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
-	app-arch/bzip2:=
-	app-arch/snappy:=
-	cups? (
-		dev-libs/libgcrypt:0=
-		>=net-print/cups-1.3.11:=
-	)
-	>=dev-libs/elfutils-0.149
-	dev-libs/expat:=
-	dev-libs/glib:=
-	dev-libs/icu:=
-	>=dev-libs/jsoncpp-0.5.0-r1:=
-	>=dev-libs/libevent-1.4.13:=
-	dev-libs/libxml2:=[icu]
-	dev-libs/libxslt:=
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.14.3:=
-	dev-libs/re2:=
-	gnome? ( >=gnome-base/gconf-2.24.0:= )
-	gnome-keyring? ( gnome-base/libgnome-keyring:= )
-	>=media-libs/alsa-lib-1.0.19:=
-	media-libs/flac:=
-	media-libs/fontconfig:=
-	media-libs/freetype:=
-	media-libs/harfbuzz:=[icu(+)]
-	media-libs/libexif:=
-	>=media-libs/libjpeg-turbo-1.2.0-r1:=
-	media-libs/libpng:0=
-	>=media-libs/libwebp-0.4.0:=
-	media-libs/speex:=
-	pulseaudio? ( media-sound/pulseaudio:= )
-	sys-apps/dbus:=
-	sys-apps/pciutils:=
-	>=sys-libs/libcap-2.22:=
-	sys-libs/zlib:=[minizip]
-	virtual/udev
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:=
-	x11-libs/gtk+:2=
-	x11-libs/libdrm
-	x11-libs/libX11:=
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXext:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXinerama:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXScrnSaver:=
-	x11-libs/libXtst:=
-	x11-libs/pango:=
-	kerberos? ( virtual/krb5 )
-	selinux? ( sec-policy/selinux-chromium )"
-DEPEND="${RDEPEND}
-	!arm? (
-		dev-lang/yasm
-	)
-	dev-lang/perl
-	dev-perl/JSON
-	>=dev-util/gperf-3.0.3
-	dev-util/ninja
-	sys-apps/hwids[usb(+)]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig"
-# For nvidia-drivers blocker, see bug #413637 .
-RDEPEND+="
-	!=www-client/chromium-9999
-	!<www-plugins/chrome-binary-plugins-37
-	x11-misc/xdg-utils
-	virtual/ttf-fonts
-	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )"
-
-# Python dependencies. The DEPEND part needs to be kept in sync
-# with python_check_deps.
-DEPEND+=" $(python_gen_any_dep '
-	dev-python/simplejson[${PYTHON_USEDEP}]
-')"
-python_check_deps() {
-	has_version "dev-python/simplejson[${PYTHON_USEDEP}]"
-}
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/bitstream-cyberbit
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-Depending on your desktop environment, you may need
-to install additional packages to get icons on the Downloads page.
-
-For KDE, the required package is kde-base/oxygen-icons.
-
-For other desktop environments, try one of the following:
-- x11-themes/gnome-icon-theme
-- x11-themes/tango-icon-theme
-"
-
-pkg_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}-angle-r0.patch"
-	epatch "${FILESDIR}/${PN}-ffmpeg-r2.patch"
-
-	epatch_user
-
-	# Remove most bundled libraries. Some are still needed.
-	build/linux/unbundle/remove_bundled_libraries.py \
-		'base/third_party/dmg_fp' \
-		'base/third_party/dynamic_annotations' \
-		'base/third_party/icu' \
-		'base/third_party/nspr' \
-		'base/third_party/superfasthash' \
-		'base/third_party/symbolize' \
-		'base/third_party/valgrind' \
-		'base/third_party/xdg_mime' \
-		'base/third_party/xdg_user_dirs' \
-		'breakpad/src/third_party/curl' \
-		'chrome/third_party/mozilla_security_manager' \
-		'courgette/third_party' \
-		'crypto/third_party/nss' \
-		'net/third_party/mozilla_security_manager' \
-		'net/third_party/nss' \
-		'third_party/WebKit' \
-		'third_party/angle' \
-		'third_party/brotli' \
-		'third_party/cacheinvalidation' \
-		'third_party/cld' \
-		'third_party/cros_system_api' \
-		'third_party/dom_distiller_js' \
-		'third_party/ffmpeg' \
-		'third_party/fips181' \
-		'third_party/flot' \
-		'third_party/hunspell' \
-		'third_party/iccjpeg' \
-		'third_party/icu/icu.isolate' \
-		'third_party/jinja2' \
-		'third_party/jstemplate' \
-		'third_party/khronos' \
-		'third_party/leveldatabase' \
-		'third_party/libaddressinput' \
-		'third_party/libjingle' \
-		'third_party/libphonenumber' \
-		'third_party/libsrtp' \
-		'third_party/libusb' \
-		'third_party/libvpx' \
-		'third_party/libwebm' \
-		'third_party/libxml/chromium' \
-		'third_party/libXNVCtrl' \
-		'third_party/libyuv' \
-		'third_party/lss' \
-		'third_party/lzma_sdk' \
-		'third_party/markupsafe' \
-		'third_party/mesa' \
-		'third_party/modp_b64' \
-		'third_party/mt19937ar' \
-		'third_party/npapi' \
-		'third_party/opus' \
-		'third_party/ots' \
-		'third_party/pdfium' \
-		'third_party/polymer' \
-		'third_party/ply' \
-		'third_party/protobuf' \
-		'third_party/pywebsocket' \
-		'third_party/qcms' \
-		'third_party/readability' \
-		'third_party/sfntly' \
-		'third_party/skia' \
-		'third_party/smhasher' \
-		'third_party/sqlite' \
-		'third_party/tcmalloc' \
-		'third_party/tlslite' \
-		'third_party/trace-viewer' \
-		'third_party/undoview' \
-		'third_party/usrsctp' \
-		'third_party/webdriver' \
-		'third_party/webrtc' \
-		'third_party/widevine' \
-		'third_party/x86inc' \
-		'third_party/zlib/google' \
-		'url/third_party/mozilla' \
-		'v8/src/third_party/valgrind' \
-		--do-remove || die
-}
-
-src_configure() {
-	local myconf=""
-
-	# Never tell the build system to "enable" SSE2, it has a few unexpected
-	# additions, bug #336871.
-	myconf+=" -Ddisable_sse2=1"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf+=" -Ddisable_nacl=1"
-
-	# Disable glibc Native Client toolchain, we don't need it (bug #417019).
-	# myconf+=" -Ddisable_glibc=1"
-
-	# TODO: also build with pnacl
-	# myconf+=" -Ddisable_pnacl=1"
-
-	# It would be awkward for us to tar the toolchain and get it untarred again
-	# during the build.
-	# myconf+=" -Ddisable_newlib_untar=1"
-
-	# Make it possible to remove third_party/adobe.
-	echo > "${T}/flapper_version.h" || die
-	myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h"
-
-	# Use system-provided libraries.
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_libsrtp (bug #459932).
-	# TODO: use_system_libvpx (http://crbug.com/347823).
-	# TODO: use_system_libusb (http://crbug.com/266149).
-	# TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077).
-	# TODO: use_system_protobuf (bug #503084).
-	# TODO: use_system_ssl (http://crbug.com/58087).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-	myconf+="
-		-Duse_system_bzip2=1
-		-Duse_system_flac=1
-		-Duse_system_harfbuzz=1
-		-Duse_system_icu=1
-		-Duse_system_jsoncpp=1
-		-Duse_system_libevent=1
-		-Duse_system_libjpeg=1
-		-Duse_system_libpng=1
-		-Duse_system_libwebp=1
-		-Duse_system_libxml=1
-		-Duse_system_libxslt=1
-		-Duse_system_minizip=1
-		-Duse_system_nspr=1
-		-Duse_system_openssl=1
-		-Duse_system_re2=1
-		-Duse_system_snappy=1
-		-Duse_system_speex=1
-		-Duse_system_xdg_utils=1
-		-Duse_system_zlib=1"
-
-	# Needed for system icu - we don't need additional data files.
-	myconf+=" -Dicu_use_data_file_flag=0"
-
-	# TODO: patch gyp so that this arm conditional is not needed.
-	if ! use arm; then
-		myconf+="
-			-Duse_system_yasm=1"
-	fi
-
-	# Optional dependencies.
-	# TODO: linux_link_kerberos, bug #381289.
-	myconf+="
-		$(gyp_use cups)
-		$(gyp_use gnome use_gconf)
-		$(gyp_use gnome-keyring use_gnome_keyring)
-		$(gyp_use gnome-keyring linux_link_gnome_keyring)
-		$(gyp_use kerberos)
-		$(gyp_use pulseaudio)
-		$(gyp_use tcmalloc use_allocator tcmalloc none)"
-
-	# Use explicit library dependencies instead of dlopen.
-	# This makes breakages easier to detect by revdep-rebuild.
-	myconf+="
-		-Dlinux_link_gsettings=1
-		-Dlinux_link_libpci=1
-		-Dlinux_link_libspeechd=1
-		-Dlibspeechd_h_prefix=speech-dispatcher/"
-
-	# TODO: use the file at run time instead of effectively compiling it in.
-	myconf+="
-		-Dusb_ids_path=/usr/share/misc/usb.ids"
-
-	# Save space by removing DLOG and DCHECK messages (about 6% reduction).
-	myconf+="
-		-Dlogging_like_official_build=1"
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	myconf+="
-		-Dlinux_use_bundled_binutils=0
-		-Dlinux_use_bundled_gold=0
-		-Dlinux_use_gold_flags=0"
-
-	# Always support proprietary codecs.
-	myconf+=" -Dproprietary_codecs=1"
-
-	# Set python version and libdir so that python_arch.sh can find libpython.
-	# Bug 492864.
-	myconf+="
-		-Dpython_ver=${EPYTHON#python}
-		-Dsystem_libdir=$(get_libdir)"
-
-	if ! use bindist; then
-		# Enable H.264 support in bundled ffmpeg.
-		myconf+=" -Dffmpeg_branding=Chrome"
-	fi
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info.
-	myconf+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
-		-Dgoogle_default_client_id=329227923882.apps.googleusercontent.com
-		-Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu"
-
-	local myarch="$(tc-arch)"
-	if [[ $myarch = amd64 ]] ; then
-		target_arch=x64
-		ffmpeg_target_arch=x64
-	elif [[ $myarch = x86 ]] ; then
-		target_arch=ia32
-		ffmpeg_target_arch=ia32
-	elif [[ $myarch = arm ]] ; then
-		target_arch=arm
-		ffmpeg_target_arch=$(usex neon arm-neon arm)
-		# TODO: re-enable NaCl (NativeClient).
-		local CTARGET=${CTARGET:-${CHOST}}
-		if [[ $(tc-is-softfloat) == "no" ]]; then
-
-			myconf+=" -Darm_float_abi=hard"
-		fi
-		filter-flags "-mfpu=*"
-		use neon || myconf+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}"
-
-		if [[ ${CTARGET} == armv[78]* ]]; then
-			myconf+=" -Darmv7=1"
-		else
-			myconf+=" -Darmv7=0"
-		fi
-		myconf+=" -Dsysroot=
-			$(gyp_use neon arm_neon)
-			-Ddisable_nacl=1"
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	myconf+=" -Dtarget_arch=${target_arch}"
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf+=" -Dwerror="
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf+=" -Ddisable_fatal_linker_warnings=1"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Prevent linker from running out of address space, bug #471810 .
-		if use x86; then
-			filter-flags "-g*"
-		fi
-	fi
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX RANLIB
-
-	# Tools for building programs to be executed on the build system, bug #410883.
-	export AR_host=$(tc-getBUILD_AR)
-	export CC_host=$(tc-getBUILD_CC)
-	export CXX_host=$(tc-getBUILD_CXX)
-	export LD_host=${CXX_host}
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -m 755 "${TMPDIR}" || die
-
-	local build_ffmpeg_args=""
-	if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
-		build_ffmpeg_args+=" --disable-asm"
-	fi
-
-	# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
-	einfo "Configuring bundled ffmpeg..."
-	pushd third_party/ffmpeg > /dev/null || die
-	chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} -- ${build_ffmpeg_args} || die
-	chromium/scripts/copy_config.sh || die
-	chromium/scripts/generate_gyp.py || die
-	popd > /dev/null || die
-
-	third_party/libaddressinput/chromium/tools/update-strings.py || die
-
-	einfo "Configuring Chromium..."
-	build/linux/unbundle/replace_gyp_files.py ${myconf} || die
-	egyp_chromium ${myconf} || die
-}
-
-eninja() {
-	if [[ -z ${NINJAOPTS+set} ]]; then
-		local jobs=$(makeopts_jobs)
-		local loadavg=$(makeopts_loadavg)
-
-		if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
-			NINJAOPTS+=" -j ${jobs}"
-		fi
-		if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
-			NINJAOPTS+=" -l ${loadavg}"
-		fi
-	fi
-	set -- ninja -v ${NINJAOPTS} "$@"
-	echo "$@"
-	"$@"
-}
-
-src_compile() {
-	local ninja_targets="chrome chrome_sandbox chromedriver"
-
-	# Build mksnapshot and pax-mark it.
-	eninja -C out/Release mksnapshot || die
-	pax-mark m out/Release/mksnapshot
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C out/Release ${ninja_targets} || die
-
-	pax-mark m out/Release/chrome
-}
-
-src_install() {
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome || die
-
-	newexe out/Release/chrome_sandbox chrome-sandbox || die
-	fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
-
-	doexe out/Release/chromedriver || die
-
-	# if ! use arm; then
-	#	doexe out/Release/nacl_helper{,_bootstrap} || die
-	#	insinto "${CHROMIUM_HOME}"
-	#	doins out/Release/nacl_irt_*.nexe || die
-	#	doins out/Release/libppGoogleNaClPluginChrome.so || die
-	# fi
-
-	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
-	if [[ -n ${CHROMIUM_SUFFIX} ]]; then
-		sedargs+=(
-			-e "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g"
-			-e "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g"
-			-e "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:"
-		)
-	fi
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
-	doexe chromium-launcher.sh
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
-
-	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver${CHROMIUM_SUFFIX} || die
-
-	# Allow users to override command-line options, bug #357629.
-	dodir /etc/chromium || die
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default" || die
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/*.pak || die
-
-	doins -r out/Release/locales || die
-	doins -r out/Release/resources || die
-
-	newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
-	newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
-
-	doexe out/Release/libffmpegsumo.so || die
-	doexe out/Release/libpdf.so || die
-
-	# Install icons and desktop entry.
-	local branding size
-	for size in 16 22 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser${CHROMIUM_SUFFIX}.png
-	done
-
-	local mime_types="text/html;text/xml;application/xhtml+xml;"
-	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
-	mime_types+="x-scheme-handler/ftp;" # bug #412185
-	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
-	make_desktop_entry \
-		chromium-browser${CHROMIUM_SUFFIX} \
-		"Chromium${CHROMIUM_SUFFIX}" \
-		chromium-browser${CHROMIUM_SUFFIX} \
-		"Network;WebBrowser" \
-		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
-	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
-
-	# Install GNOME default application entry (bug #303100).
-	if use gnome; then
-		dodir /usr/share/gnome-control-center/default-apps || die
-		insinto /usr/share/gnome-control-center/default-apps
-		newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
-		if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
-			sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
-				"${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
-		fi
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-	readme.gentoo_print_elog
-}
diff --git a/www-client/chromium/chromium-38.0.2101.0.ebuild b/www-client/chromium/chromium-38.0.2114.2.ebuild
index fd852bec8b96..09ca4f496d06 100644
--- a/www-client/chromium/chromium-38.0.2101.0.ebuild
+++ b/www-client/chromium/chromium-38.0.2114.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-38.0.2101.0.ebuild,v 1.1 2014/07/23 17:39:17 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-38.0.2114.2.ebuild,v 1.1 2014/08/06 16:09:06 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -170,8 +170,6 @@ src_prepare() {
 	#	touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
 	# fi
 
-	epatch "${FILESDIR}/${PN}-libaddressinput-r0.patch"
-
 	epatch_user
 
 	# Remove most bundled libraries. Some are still needed.
@@ -360,10 +358,12 @@ src_configure() {
 		-Dpython_ver=${EPYTHON#python}
 		-Dsystem_libdir=$(get_libdir)"
 
+	ffmpeg_branding="Chromium"
 	if ! use bindist; then
 		# Enable H.264 support in bundled ffmpeg.
-		myconf+=" -Dffmpeg_branding=Chrome"
+		ffmpeg_branding="Chrome"
 	fi
+	myconf+=" -Dffmpeg_branding=${ffmpeg_branding}"
 
 	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
 	# Note: these are for Gentoo use ONLY. For your own distribution,
@@ -446,7 +446,8 @@ src_configure() {
 	# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
 	einfo "Configuring bundled ffmpeg..."
 	pushd third_party/ffmpeg > /dev/null || die
-	chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} -- ${build_ffmpeg_args} || die
+	chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+		--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
 	chromium/scripts/copy_config.sh || die
 	chromium/scripts/generate_gyp.py || die
 	popd > /dev/null || die