Dev channel bump. Remove old.

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

3 files changed, 24 insertions, 6 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index cd15972c7c7b..9d5f0021616a 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.1097 2014/06/18 14:42:55 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1098 2014/06/25 03:35:36 phajdan.jr Exp $
+
+*chromium-37.0.2062.0 (25 Jun 2014)
+
+  25 Jun 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +chromium-37.0.2062.0.ebuild, +files/chromium-ffmpeg-r2.patch,
+  -chromium-37.0.2041.4.ebuild:
+  Dev channel bump. Remove old.
 
 *chromium-37.0.2054.3 (18 Jun 2014)
 
diff --git a/www-client/chromium/chromium-37.0.2041.4.ebuild b/www-client/chromium/chromium-37.0.2062.0.ebuild
index 58cb629ad8f0..10b1697cd728 100644
--- a/www-client/chromium/chromium-37.0.2041.4.ebuild
+++ b/www-client/chromium/chromium-37.0.2062.0.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.2041.4.ebuild,v 1.1 2014/06/12 06:36:11 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-37.0.2062.0.ebuild,v 1.1 2014/06/25 03:35:36 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -156,7 +156,7 @@ src_prepare() {
 	# fi
 
 	epatch "${FILESDIR}/${PN}-angle-r0.patch"
-	epatch "${FILESDIR}/${PN}-ffmpeg-r1.patch"
+	epatch "${FILESDIR}/${PN}-ffmpeg-r2.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"
 
@@ -437,6 +435,8 @@ src_configure() {
 	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
diff --git a/www-client/chromium/files/chromium-ffmpeg-r2.patch b/www-client/chromium/files/chromium-ffmpeg-r2.patch
new file mode 100644
index 000000000000..32344c8a60ef
--- /dev/null
+++ b/www-client/chromium/files/chromium-ffmpeg-r2.patch
@@ -0,0 +1,11 @@
+--- third_party/ffmpeg/chromium/scripts/generate_gyp.py.orig	2014-06-13 13:13:35.762996021 +0000
++++ third_party/ffmpeg/chromium/scripts/generate_gyp.py	2014-06-13 13:13:38.693099249 +0000
+@@ -131,7 +131,7 @@
+ """
+ 
+ # Controls GYP conditional stanza generation.
+-SUPPORTED_ARCHITECTURES = ['ia32', 'arm', 'arm-neon']
++SUPPORTED_ARCHITECTURES = ['ia32', 'arm', 'arm-neon', 'x64']
+ SUPPORTED_TARGETS = ['Chromium', 'Chrome', 'ChromiumOS', 'ChromeOS']
+ # Mac doesn't have any platform specific files, so just use linux and win.
+ SUPPORTED_PLATFORMS = ['linux', 'win']