Dev channel bump. Fix bug #481812 by floppym. Back to bundled v8 (frequent API/ABI breaks, recent gentoo-dev discussions). Remove old.

(Portage version: 2.2.1/cvs/Linux i686, signed Manifest commit with key 30427902)

6 files changed, 71 insertions, 43 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 99f9db99770c..a6ea1a8b9991 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.950 2013/09/25 18:54:10 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.951 2013/09/28 03:54:54 phajdan.jr Exp $
+
+*chromium-31.0.1650.0 (28 Sep 2013)
+
+  28 Sep 2013; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +files/chromium-chromedriver-r0.patch, +files/chromium-system-icu-r0.patch,
+  +files/chromium-system-jinja-r0.patch, -chromium-31.0.1622.0.ebuild,
+  +chromium-31.0.1650.0.ebuild, chromium-9999-r1.ebuild:
+  Dev channel bump. Fix bug #481812 by floppym. Back to bundled v8 (frequent
+  API/ABI breaks, recent gentoo-dev discussions). Remove old.
 
 *chromium-30.0.1599.47 (25 Sep 2013)
 
diff --git a/www-client/chromium/chromium-31.0.1622.0.ebuild b/www-client/chromium/chromium-31.0.1650.0.ebuild
index 8463913e2f6d..af428a71adf6 100644
--- a/www-client/chromium/chromium-31.0.1622.0.ebuild
+++ b/www-client/chromium/chromium-31.0.1650.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-31.0.1622.0.ebuild,v 1.1 2013/09/10 16:02:16 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-31.0.1650.0.ebuild,v 1.1 2013/09/28 03:54:54 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -37,8 +37,6 @@ RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
 		dev-libs/libgcrypt:=
 		>=net-print/cups-1.3.11:=
 	)
-	>=dev-lang/v8-3.19.17:=
-	=dev-lang/v8-3.21*
 	>=dev-libs/elfutils-0.149
 	dev-libs/expat:=
 	>=dev-libs/icu-49.1.1-r1:=
@@ -130,8 +128,10 @@ src_prepare() {
 	#	touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
 	# fi
 
+	epatch "${FILESDIR}/${PN}-chromedriver-r0.patch"
 	epatch "${FILESDIR}/${PN}-gpsd-r0.patch"
-	epatch "${FILESDIR}/${PN}-system-ply-r1.patch"
+	epatch "${FILESDIR}/${PN}-system-icu-r0.patch"
+	epatch "${FILESDIR}/${PN}-system-jinja-r0.patch"
 
 	epatch_user
 
@@ -174,7 +174,6 @@ src_prepare() {
 		'third_party/lzma_sdk' \
 		'third_party/mesa' \
 		'third_party/modp_b64' \
-		'third_party/mongoose' \
 		'third_party/mt19937ar' \
 		'third_party/npapi' \
 		'third_party/ots' \
@@ -195,10 +194,8 @@ src_prepare() {
 		'third_party/x86inc' \
 		'third_party/zlib/google' \
 		'url/third_party/mozilla' \
+		'v8/src/third_party/valgrind' \
 		--do-remove || die
-
-	# Remove bundled v8.
-	find v8 -type f \! -iname '*.gyp*' -delete || die
 }
 
 src_configure() {
@@ -256,7 +253,6 @@ src_configure() {
 		-Duse_system_re2=1
 		-Duse_system_snappy=1
 		-Duse_system_speex=1
-		-Duse_system_v8=1
 		-Duse_system_xdg_utils=1
 		-Duse_system_zlib=1"
 
@@ -450,14 +446,7 @@ chromium_test() {
 		(( exitstatus |= st ))
 	}
 
-	local excluded_base_unittests=(
-		"ICUStringConversionsTest.*" # bug #350347
-		"MessagePumpLibeventTest.*" # bug #398591
-		"TimeTest.JsTime" # bug #459614
-		"SecurityTest.NewOverflow" # bug #465724
-	)
-	runtest out/Release/base_unittests "${excluded_base_unittests[@]}"
-
+	runtest out/Release/base_unittests
 	runtest out/Release/cacheinvalidation_unittests
 
 	local excluded_content_unittests=(
@@ -474,24 +463,18 @@ chromium_test() {
 	local excluded_net_unittests=(
 		"NetUtilTest.IDNToUnicode*" # bug 361885
 		"NetUtilTest.FormatUrl*" # see above
-		"DnsConfigServiceTest.GetSystemConfig" # bug #394883
-		"CertDatabaseNSSTest.ImportServerCert_SelfSigned" # bug #399269
-		"CertDatabaseNSSTest.TrustIntermediateCa*" # http://crbug.com/224612
-		"URLFetcher*" # bug #425764
-		"HTTPSOCSPTest.*" # bug #426630
-		"HTTPSEVCRLSetTest.*" # see above
-		"HTTPSCRLSetTest.*" # see above
 		"SpdyFramerTests/SpdyFramerTest.CreatePushPromiseCompressed/2" # bug #478168
-		"*SpdyFramerTest.BasicCompression*" # bug #465444
+		"HostResolverImplTest.FlushCacheOnIPAddressChange" # bug #481812
+		"HostResolverImplTest.ResolveFromCache" # see above
+		"ProxyResolverV8TracingTest.*" # see above
+		"SSLClientSocketTest.ConnectMismatched" # see above
+		"UDPSocketTest.*" # see above
+		"*EndToEndTest*" # see above
 	)
 	runtest out/Release/net_unittests "${excluded_net_unittests[@]}"
 
 	runtest out/Release/printing_unittests
-
-	local excluded_sql_unittests=(
-		"SQLiteFeaturesTest.FTS2" # bug #461286
-	)
-	runtest out/Release/sql_unittests "${excluded_sql_unittests[@]}"
+	runtest out/Release/sql_unittests
 
 	return ${exitstatus}
 }
diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index b7f45df47b51..ecfb22258aab 100644
--- a/www-client/chromium/chromium-9999-r1.ebuild
+++ b/www-client/chromium/chromium-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.215 2013/09/20 04:13:19 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.216 2013/09/28 03:54:54 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -36,8 +36,6 @@ RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
 		dev-libs/libgcrypt:=
 		>=net-print/cups-1.3.11:=
 	)
-	>=dev-lang/v8-3.19.17:=
-	=dev-lang/v8-3.21*
 	>=dev-libs/elfutils-0.149
 	dev-libs/expat:=
 	>=dev-libs/icu-49.1.1-r1:=
@@ -238,7 +236,6 @@ src_prepare() {
 		'third_party/lzma_sdk' \
 		'third_party/mesa' \
 		'third_party/modp_b64' \
-		'third_party/mongoose' \
 		'third_party/mt19937ar' \
 		'third_party/npapi' \
 		'third_party/ots' \
@@ -260,14 +257,8 @@ src_prepare() {
 		'third_party/x86inc' \
 		'third_party/zlib/google' \
 		'url/third_party/mozilla' \
+		'v8/src/third_party/valgrind' \
 		--do-remove || 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
 }
 
 src_configure() {
@@ -325,7 +316,6 @@ src_configure() {
 		-Duse_system_re2=1
 		-Duse_system_snappy=1
 		-Duse_system_speex=1
-		-Duse_system_v8=1
 		-Duse_system_xdg_utils=1
 		-Duse_system_zlib=1"
 
@@ -540,6 +530,12 @@ chromium_test() {
 		"NetUtilTest.IDNToUnicode*" # bug 361885
 		"NetUtilTest.FormatUrl*" # see above
 		"SpdyFramerTests/SpdyFramerTest.CreatePushPromiseCompressed/2" # bug #478168
+		"HostResolverImplTest.FlushCacheOnIPAddressChange" # bug #481812
+		"HostResolverImplTest.ResolveFromCache" # see above
+		"ProxyResolverV8TracingTest.*" # see above
+		"SSLClientSocketTest.ConnectMismatched" # see above
+		"UDPSocketTest.*" # see above
+		"*EndToEndTest*" # see above
 	)
 	runtest out/Release/net_unittests "${excluded_net_unittests[@]}"
 
diff --git a/www-client/chromium/files/chromium-chromedriver-r0.patch b/www-client/chromium/files/chromium-chromedriver-r0.patch
new file mode 100644
index 000000000000..d43941ad610b
--- /dev/null
+++ b/www-client/chromium/files/chromium-chromedriver-r0.patch
@@ -0,0 +1,13 @@
+--- chrome/test/chromedriver/embed_version_in_cpp.py.orig	2013-09-27 18:44:27.221221038 +0000
++++ chrome/test/chromedriver/embed_version_in_cpp.py	2013-09-27 18:44:59.861416643 +0000
+@@ -25,9 +25,8 @@
+   options, args = parser.parse_args()
+ 
+   version = open(options.version_file, 'r').read().strip()
+-  revision = lastchange.FetchVersionInfo(None).revision.strip()
+   global_string_map = {
+-      'kChromeDriverVersion': version + '.' + revision
++      'kChromeDriverVersion': version
+   }
+   cpp_source.WriteSource('version',
+                          'chrome/test/chromedriver',
diff --git a/www-client/chromium/files/chromium-system-icu-r0.patch b/www-client/chromium/files/chromium-system-icu-r0.patch
new file mode 100644
index 000000000000..27a7b7d76810
--- /dev/null
+++ b/www-client/chromium/files/chromium-system-icu-r0.patch
@@ -0,0 +1,14 @@
+--- build/linux/unbundle/icu.gyp.orig	2013-05-08 16:16:58.989728264 +0000
++++ build/linux/unbundle/icu.gyp	2013-05-08 16:18:07.910115715 +0000
+@@ -7,6 +7,11 @@
+     {
+       'target_name': 'system_icu',
+       'type': 'none',
++      'direct_dependent_settings': {
++        'defines': [
++          'U_USING_ICU_NAMESPACE=0',
++        ],
++      },
+       'link_settings': {
+         'ldflags': [
+           '<!@(icu-config --ldflags)',
diff --git a/www-client/chromium/files/chromium-system-jinja-r0.patch b/www-client/chromium/files/chromium-system-jinja-r0.patch
new file mode 100644
index 000000000000..b099cf37a69f
--- /dev/null
+++ b/www-client/chromium/files/chromium-system-jinja-r0.patch
@@ -0,0 +1,13 @@
+--- third_party/WebKit/Source/core/core.gypi.orig	2013-09-27 18:25:24.634284363 +0000
++++ third_party/WebKit/Source/core/core.gypi	2013-09-27 18:25:48.614432099 +0000
+@@ -3863,10 +3863,6 @@
+             'tests/TreeTestHelpers.h',
+         ],
+         '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
+             'scripts/in_file.py',
+             'scripts/in_generator.py',
+             'scripts/license.py',