Dev channel bump. Remove old.

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

3 files changed, 37 insertions, 15 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 0c32f2eee03f..cd15972c7c7b 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,12 @@
 # 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.1096 2014/06/14 17:46:31 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1097 2014/06/18 14:42:55 phajdan.jr Exp $
+
+*chromium-37.0.2054.3 (18 Jun 2014)
+
+  18 Jun 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +chromium-37.0.2054.3.ebuild, -chromium-37.0.2024.2.ebuild:
+  Dev channel bump. Remove old.
 
 *chromium-36.0.1985.67 (14 Jun 2014)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 7e448a15f603..f5d303da635d 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -39,20 +39,30 @@ DIST chromium-36.0.1985.49-testdata.tar.xz 111518564 SHA256 4585924236b6090f5f8d
 DIST chromium-36.0.1985.49.tar.xz 205473668 SHA256 f7e122ac79254a2344909b986a25879782029b72a702d1839326e010d94b1856 SHA512 fbb2c3d6089ff2cc869a657c6021067c1eccdbcf20c9288ae93255af70384f6dcb06e3b1cce7ce36f927841f55766cd55e0f186dc6175df2cb10ca8bd5fd0230 WHIRLPOOL 45189493c57e0bf8bece7f2cb9504c32cbf44b70c6c8dc399e4137e778ad1f7bde77afd5e58e942b9ddb59b38f0faf0d1a189f7fbbd0a941b179d8a2ada6db8c
 DIST chromium-36.0.1985.67-testdata.tar.xz 111512620 SHA256 978504437ddb72b551442b8e85fda08040a6428dde1ba4e57a3e0f2e24dbb3e6 SHA512 41ec569b38a1836497f326f46559ce663d29ffa8fa816afb26af1abaa8551eda87bd8741fd4a4211e1d91f66a160d5169d706bb508bb752d5c8fc2f2acf92127 WHIRLPOOL 7c79b57d8fcc451c927764d405e2207c0aeb2fa3d341feede4550034e4ca82e747e6a6481f5a11de9035b88284a868b56cbeba63e82205bad17b176d633ca4a5
 DIST chromium-36.0.1985.67.tar.xz 205488864 SHA256 178eea1a764fd761591a84902f4dcf03c95fc6c09ab3b8c41b297f936410f785 SHA512 2e5d717c9670bc076234911826b9c06ac6fdc20cf8f4a53821c5a368b9fdf458007193a331e49cfa6156e0e420a6ad2530cdbb95b1f93875aa3846367dd8b196 WHIRLPOOL ee1f84b47d58cc5f2eab14c3e268e4965db80b9987884b17772180d368a772b4958e6e6037002b2d4d8083634c1651a9bf4f1af4d5d0b9f064d188c0353822e8
-DIST chromium-37.0.2024.2-lite.tar.xz 213204116 SHA256 00c7882138b28821b0a6afab526e196e75b0de5f8036465c92a5b48a237aa3f0 SHA512 8af7384c3cea95e16f92264e6adeb5a646336cc93211759fdb9621e3ff9aaa0e1296c4ac1cd73627e367493008bf3ec72a510cb6796c80a4b721de9bf945ed43 WHIRLPOOL 43a2005d444602f1da76f559e9a3efd372a46d3b9446e34311b658174eb3ba621b1838f09e3d9b2211bde5cbb9e67d01909d7a8b31187aa9c94461270c283e0b
 DIST chromium-37.0.2041.4-lite.tar.xz 213286632 SHA256 9d2a41fa67e1a8f9f51af9a6446d7ab9377f0bbb3300b47e2666b1bf432b4bbe SHA512 7800f496d071b0c159d8cee8fc28170d2e8e7f5cd4037ddfa968c6cd7ca5608c5a61c7388afb6599d62d0d2f6d55cd7c684e8c178b8335a3cb3fb67a6650df6a WHIRLPOOL 1597658c62c6f1f7b120f21dc4e27f766d202d2c7bfb1253427d2e28428b16fc56cadecf56447dc29af2a71b1791a0ff6fbf39f501b4a7158bafd0a0ac0d191e
+DIST chromium-37.0.2054.3-lite.tar.xz 213917164 SHA256 1bc3c40daedcc714aa06d9b16d44d5e198fb881a82019ce6587cd9b98390909a SHA512 bfd9cdfc24852af7449719326f6e1e6757660aaeb6595027fa034de0bf6f2fede206d677abb089f9fab6ad190b7e2d9c02a8a76b56801f36d16883326f102b2d WHIRLPOOL 3596130b151790e9a185de3e1e329cabcc5dba6d7dd3f80524b9fecfa15430034dfa973e56b155aa4f48e85bcbf71d0e747661022a953d6b6837da3082f7ce30
 EBUILD chromium-35.0.1916.153.ebuild 19972 SHA256 9b4bfd8831f9f2fc48db37e91b1228769643a65a9234116af1edd0b21efa6f34 SHA512 258fed0441668099cd56bb9aea863f6b8d2dde1e053ae1902881cf82985227a8c185dcd7ceca2b55724f3cd8ba94c4e7ab6f89f68e68eeedbc24dbd17335fc45 WHIRLPOOL 9a4cf15193bb7775cf519dd832946f1409c0521720a16ccb56ff87c02cc32bfc0e09adb2ada0a26f3d795435c3447f5f71263b833fda3014cbcd99c13c77a6b4
 EBUILD chromium-36.0.1985.49.ebuild 20035 SHA256 4674237348092501f5d105e37f831f86813b0731afa292408dfd71f2c832e88f SHA512 8d96224b565ad4f884e292cb05839140a2c5c7a7380f6a42c2ee1e2be8f0e14a3fc0a06324223ad11e8aa849fa191cc4aebe3a22c3de5bc2a9b995fbeccad9e8 WHIRLPOOL 32a4529823285f1dbee2227847fc91548817d5053bce45377ce99ac81a285dabaebd5bd83218c0a3c24981704bb5aba0a9f735d1b0f92d95c8407d72c1ab124e
 EBUILD chromium-36.0.1985.67.ebuild 20035 SHA256 c80c59e45af375992f66f3ee78879ab655f4ae21df0ff3e87168d08155f99e0f SHA512 e75c48277b8b3e2de911ff4f38a9ecb4a5dbebb487e00738ce35eec6f273e349921fad7bb5203069854f672d04e635cf09a348e8acf6acec18e2b86f0eaafa5e WHIRLPOOL 1b7f6059563a290af9086eb1f7fb3d8dc8950ff8e1e112028379d6c6bc363e0ead3c293f636c577a2201ed7451e75271109d9fbf0ba0b863ffb24fa94eb2731f
-EBUILD chromium-37.0.2024.2.ebuild 17060 SHA256 5fe03cc7004516e38cebd3eb52de17ecb338ecca7f6e9aa18b94f39ebd15e12c SHA512 9cd5ec23a1717d950944af1cb9f6aeebbcb36cff5affc8eb1c668ffd2691694906a7d40040f3323735b24213d8704e999c9892bb9054c016b72210327818c63d WHIRLPOOL 90bdd5a1f7d370148a3fc246bafa90321bd73c27177b833e026873374329de162c2ab3949bf49aff346d07d04654d5186eda2a5ea298265eb0480d06eb1a2039
 EBUILD chromium-37.0.2041.4.ebuild 17238 SHA256 2a3bb3e3b80a1e10f1cca0e70b31776478379021ff9a1acc8bb678bb65a5eebf SHA512 b766df857f91c93020f2a0495dafe864b413eaa38781a1b925bb50b843c6f543be87ec9d745e4b63a68d9ba35beb9c3be7c69f6082375ff6e5b340e1c9bcfd7c WHIRLPOOL 8b38db7993240b1270134394ecb00c790a9564a7dfcaea2ed41956f641fc167d9f37d0524d2e771f168f89aa70c95b8feccfa6122a7ea95f9c46564ae3d9eb8b
-MISC ChangeLog 108884 SHA256 827910263bf95d1399552696c86057688cbfacdd993174d33d9d5f6acbe833ed SHA512 f714d1988c0ffbc05dc500a75af31c9df163f176f949ac41f1a69797546c5b603965a659564b3741b7bd6a508db1f5999ba7c172cc10569f2774ff51416bc0be WHIRLPOOL 9ca6a87fb5fe91505af9a652b27ab005cf88500e8b666f9a5ad976e1d29d5ce5033e7a658fb78c85e9d0a504c8d1e2d4d0299d61420ba4982d5bdf4f22fe94a6
+EBUILD chromium-37.0.2054.3.ebuild 17256 SHA256 b831a2a47d4e03b10e36caa82ae10cb2e325ce0fe911614616fc1b8deccb34aa SHA512 932685e32dcb03d053863f52d9f1b1b31bb27bf339b326c1b71293a5e3ece1995da18b7e76a616dd4b862b3557f13099036b04352a25860506e1b8e91614ebc6 WHIRLPOOL d5948cf48f98e01b37d08ae1062aec4763192d62b6cad15cd09c6de2952d8d45fffc1615acd82e8352cb466971a29278f3763876b57064d084163ff49d7d7335
+MISC ChangeLog 109074 SHA256 e7f3ce054876911a5a5e17b99461b9e699bf338deb771e973e507f2761529190 SHA512 65f065e33ca8a63bd17fc428b912bd675fefb2ec68b929f74a6b5b3c0c2aaf05bc8b5a60eb4ac47409b31599efb0ccebbfadc32ba2c61da00b517c8d9e62d242 WHIRLPOOL 27d9a023acceb4c9a34e0a1d6abfaae1d7eb91bd0b80c09a0acfeb4ff7998ede719919e2b8470051cd79841d4f62cfbe574a6f83f70e187955ac3cda19fafa22
 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
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlOcinkACgkQC77qH+pIQ6QVCQD+IiHy1abyWLlEraEm9XVcIpek
-JlFAyrAwwdAsaXbrLA4BAJ+JAygv/7zIVmRTv592U8cJlHg4Gt/QjFUQMdpJDvnS
-=GyY6
+iQIcBAEBCAAGBQJToaV+AAoJEE8aJVXqcZkdn+0QAKmu0enwr4mzNyllygfCHN+2
+D289lwDCBF7B5eOjQu8o4chQwB/uL1gKccVqCgCsc8ru6Nm+3ZZS7uDxrrYkoPIv
+pxUf2ddLR6HTPSA27ffOUxndCttb5oixiL37/Rr1Q90LlNZk6pLU46OTYOEx6YKd
+3DVbioWCEpIHfQ+ut1Egzp6coppqX4VmoxReWhIuVZ8UQHeqW0Mq4meoMPP/TFDu
+KLMnnVJUkgsQYpzasafiwcasi1UfiH70NXJgWxaYeNK6D0YaT/rIYT+NQ/Qns7Uc
+LumToN9C6TkVhv/Cz6PvtstanxXVwu65tHVAuGzGqgBl+/lGkyonnZehRLfsfknl
+z4TjPpCmUyof94cc1gSiNQfZjT7YRak3kdjmCzcEhdWfLry3hGkZLnZP2F5aIMqN
+/rmxg+gtvJ6oNsURGOc0ABL9KDkNGPV7d8Fk68nrHvXuCl0fOZJhYMaC/UFSwSv7
+zAvH34ZWNyr0lfHx5y6+qjhVh7rkhsfnE9kyANfcsk+E2hYO9UVuaGBDKuT82HTp
+XK3PeZCbHGQU9k2sicrxasKkWRM8DRzLQQNzDrDi94bZiABcfZcuMdwZM8CBrCLz
+iL4er+Qq2WledBpg0qi2vUXJfn2tzpoq/EzlIlH7ABuE7pBAyKlwO4C8D0rLRcEm
+JZo/okpNeusZBGQLUf3u
+=VvfB
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-37.0.2024.2.ebuild b/www-client/chromium/chromium-37.0.2054.3.ebuild
index 7359619cd8a3..58c5c743d96b 100644
--- a/www-client/chromium/chromium-37.0.2024.2.ebuild
+++ b/www-client/chromium/chromium-37.0.2054.3.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-37.0.2024.2.ebuild,v 1.1 2014/06/04 07:16:59 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-37.0.2054.3.ebuild,v 1.1 2014/06/18 14:42:55 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -19,7 +19,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="bindist cups gnome gnome-keyring kerberos neon pulseaudio selinux +tcmalloc"
+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"
@@ -155,8 +155,8 @@ src_prepare() {
 	#	touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
 	# fi
 
-	epatch "${FILESDIR}/${PN}-system-harfbuzz-r0.patch"
 	epatch "${FILESDIR}/${PN}-angle-r0.patch"
+	epatch "${FILESDIR}/${PN}-ffmpeg-r1.patch"
 
 	epatch_user
 
@@ -185,6 +185,7 @@ src_prepare() {
 		'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' \
@@ -334,9 +335,6 @@ src_configure() {
 		-Dlinux_use_bundled_gold=0
 		-Dlinux_use_gold_flags=0"
 
-	# TODO: enable mojo after fixing compile failures.
-	myconf+=" -Duse_mojo=0"
-
 	# Always support proprietary codecs.
 	myconf+=" -Dproprietary_codecs=1"
 
@@ -424,13 +422,21 @@ src_configure() {
 	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 --config-only linux ${ffmpeg_target_arch} || 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