Dev channel bump. Remove old.

(Portage version: 2.2.7/cvs/Linux i686, signed Manifest commit with key 0x4F1A2555EA71991D!)

3 files changed, 39 insertions, 4 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 1a6c2daa708d..00b7a34a1ad5 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.1024 2014/02/20 00:44:44 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1025 2014/02/20 05:56:17 phajdan.jr Exp $
+
+*chromium-34.0.1847.3 (18 Feb 2014)
+
+  18 Feb 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +chromium-34.0.1847.3.ebuild, +files/chromium-system-jinja-r4.patch,
+  -chromium-34.0.1825.4.ebuild:
+  Dev channel bump. Remove old.
 
 *chromium-33.0.1750.115 (20 Feb 2014)
 
diff --git a/www-client/chromium/chromium-34.0.1825.4.ebuild b/www-client/chromium/chromium-34.0.1847.3.ebuild
index ede1b422e22e..61c0054d1bb7 100644
--- a/www-client/chromium/chromium-34.0.1825.4.ebuild
+++ b/www-client/chromium/chromium-34.0.1847.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-34.0.1825.4.ebuild,v 1.1 2014/02/08 04:15:02 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-34.0.1847.3.ebuild,v 1.1 2014/02/20 05:56:17 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -164,7 +164,7 @@ src_prepare() {
 	#	touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
 	# fi
 
-	epatch "${FILESDIR}/${PN}-system-jinja-r3.patch"
+	epatch "${FILESDIR}/${PN}-system-jinja-r4.patch"
 	epatch "${FILESDIR}/${PN}-gn-r1.patch"
 	epatch "${FILESDIR}/${PN}-depot-tools-r0.patch"
 
@@ -204,6 +204,7 @@ src_prepare() {
 		'third_party/libphonenumber' \
 		'third_party/libsrtp' \
 		'third_party/libusb' \
+		'third_party/libwebm' \
 		'third_party/libxml/chromium' \
 		'third_party/libXNVCtrl' \
 		'third_party/libyuv' \
@@ -505,7 +506,7 @@ chromium_test() {
 		local cmd=$1
 		shift
 		local IFS=:
-		set -- "${cmd}" "--gtest_filter=-$*"
+		set -- "${cmd}" --test-launcher-bot-mode "--gtest_filter=-$*"
 		einfo "$@"
 		"$@"
 		local st=$?
@@ -583,6 +584,8 @@ src_install() {
 	# 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
diff --git a/www-client/chromium/files/chromium-system-jinja-r4.patch b/www-client/chromium/files/chromium-system-jinja-r4.patch
new file mode 100644
index 000000000000..e301016124e6
--- /dev/null
+++ b/www-client/chromium/files/chromium-system-jinja-r4.patch
@@ -0,0 +1,25 @@
+--- third_party/WebKit/Source/bindings/generated_bindings.gyp.orig	2014-02-20 03:49:21.821527295 +0000
++++ third_party/WebKit/Source/bindings/generated_bindings.gyp	2014-02-20 03:49:34.401607238 +0000
+@@ -110,9 +110,6 @@
+       'scripts/unstable/idl_compiler.py',
+       '<(DEPTH)/third_party/ply/lex.py',
+       '<(DEPTH)/third_party/ply/yacc.py',
+-      # jinja2/__init__.py contains version string, so sufficient for package
+-      '<(DEPTH)/third_party/jinja2/__init__.py',
+-      '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
+       '<(DEPTH)/tools/idl_parser/idl_lexer.py',
+       '<(DEPTH)/tools/idl_parser/idl_node.py',
+       '<(DEPTH)/tools/idl_parser/idl_parser.py',
+--- third_party/WebKit/Source/build/scripts/scripts.gypi.orig	2014-02-20 03:49:59.351765796 +0000
++++ third_party/WebKit/Source/build/scripts/scripts.gypi	2014-02-20 03:50:08.111821470 +0000
+@@ -1,10 +1,6 @@
+ {
+     'variables': {
+         'scripts_for_in_files': [
+-            # jinja2/__init__.py contains version string, so sufficient as
+-            # dependency for whole jinja2 package
+-            '<(DEPTH)/third_party/jinja2/__init__.py',
+-            '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
+             'hasher.py',
+             'in_file.py',
+             'in_generator.py',