Version bump for dev channel release. Fixed bug #354343 by Julien Sanchez <julien.sanchez@gmail.com>. Dropped support for system-sqlite (http://crbug.com/70589). Removed old.

(Portage version: 2.1.9.25/cvs/Linux i686)

8 files changed, 47 insertions, 71 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 3ddec593a73d..539b41c162c8 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.284 2011/02/17 15:16:40 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.285 2011/02/18 10:46:51 phajdan.jr Exp $
+
+*chromium-11.0.672.2 (18 Feb 2011)
+
+  18 Feb 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  chromium-9.0.597.94.ebuild, chromium-9.0.597.98.ebuild,
+  -chromium-10.0.648.45.ebuild, chromium-10.0.648.82.ebuild,
+  +chromium-11.0.672.2.ebuild, chromium-9999.ebuild,
+  +files/experimental.gyp, metadata.xml:
+  Version bump for dev channel release. Fixed bug #354343 by Julien Sanchez
+  <julien.sanchez@gmail.com>. Dropped support for system-sqlite
+  (http://crbug.com/70589). Removed old.
 
 *chromium-10.0.648.82 (17 Feb 2011)
 
diff --git a/www-client/chromium/chromium-10.0.648.82.ebuild b/www-client/chromium/chromium-10.0.648.82.ebuild
index 56b2ab6d00d5..f44c39c14046 100644
--- a/www-client/chromium/chromium-10.0.648.82.ebuild
+++ b/www-client/chromium/chromium-10.0.648.82.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-10.0.648.82.ebuild,v 1.1 2011/02/17 15:16:40 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-10.0.648.82.ebuild,v 1.2 2011/02/18 10:46:51 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -16,12 +16,9 @@ SRC_URI="http://build.chromium.org/buildbot/official/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="cups +gecko-mediaplayer gnome gnome-keyring system-sqlite"
+IUSE="cups +gecko-mediaplayer gnome gnome-keyring"
 
 RDEPEND="app-arch/bzip2
-	system-sqlite? (
-		>=dev-db/sqlite-3.7.2[fts3,icu,secure-delete,threadsafe]
-	)
 	>=dev-lang/v8-${V8_DEPEND}
 	dev-libs/dbus-glib
 	>=dev-libs/icu-4.4.1
@@ -164,13 +161,6 @@ src_prepare() {
 	rmdir v8/include || die
 	ln -s /usr/include v8/include || die
 
-	if use system-sqlite; then
-		# Remove bundled sqlite, preserving the shim header.
-		find third_party/sqlite -type f \! -iname '*.gyp*' \
-			\! -path 'third_party/sqlite/sqlite3.h' \
-			-delete || die
-	fi
-
 	# Make sure the build system will use the right python, bug #344367.
 	# Only convert directories that need it, to save time.
 	python_convert_shebangs -q -r 2 build tools
@@ -200,10 +190,6 @@ src_configure() {
 		-Duse_system_xdg_utils=1
 		-Duse_system_zlib=1"
 
-	if use system-sqlite; then
-		myconf+=" -Duse_system_sqlite=1"
-	fi
-
 	# The dependency on cups is optional, see bug #324105.
 	if use cups; then
 		myconf+=" -Duse_cups=1"
diff --git a/www-client/chromium/chromium-10.0.648.45.ebuild b/www-client/chromium/chromium-11.0.672.2.ebuild
index b69e350e3638..736dfd9d5d5f 100644
--- a/www-client/chromium/chromium-10.0.648.45.ebuild
+++ b/www-client/chromium/chromium-11.0.672.2.ebuild
@@ -1,27 +1,24 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-10.0.648.45.ebuild,v 1.2 2011/02/13 11:43:52 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-11.0.672.2.ebuild,v 1.1 2011/02/18 10:46:51 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
-V8_DEPEND="3.0.12.12"
+V8_DEPEND="3.1.4"
 
 inherit eutils flag-o-matic multilib pax-utils portability python \
 	toolchain-funcs versionator virtualx
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="http://chromium.org/"
-SRC_URI="http://build.chromium.org/buildbot/official/${P}.tar.bz2"
+SRC_URI="http://build.chromium.org/official/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="cups +gecko-mediaplayer gnome gnome-keyring system-sqlite"
+IUSE="cups +gecko-mediaplayer gnome gnome-keyring"
 
 RDEPEND="app-arch/bzip2
-	system-sqlite? (
-		>=dev-db/sqlite-3.7.2[fts3,icu,secure-delete,threadsafe]
-	)
 	>=dev-lang/v8-${V8_DEPEND}
 	dev-libs/dbus-glib
 	>=dev-libs/icu-4.4.1
@@ -110,9 +107,6 @@ src_prepare() {
 	# Make sure we don't use bundled FLAC.
 	epatch "${FILESDIR}"/${PN}-system-flac-r0.patch
 
-	# Fix build, http://crbug.com/70606.
-	epatch "${FILESDIR}"/${PN}-webkit-version.patch
-
 	# Remove most bundled libraries. Some are still needed.
 	find third_party -type f \! -iname '*.gyp*' \
 		\! -path 'third_party/WebKit/*' \
@@ -126,6 +120,7 @@ src_prepare() {
 		\! -path 'third_party/harfbuzz/*' \
 		\! -path 'third_party/hunspell/*' \
 		\! -path 'third_party/iccjpeg/*' \
+		\! -path 'third_party/launchpad_translations/*' \
 		\! -path 'third_party/libjingle/*' \
 		\! -path 'third_party/libsrtp/*' \
 		\! -path 'third_party/libwebp/*' \
@@ -157,6 +152,12 @@ src_prepare() {
 	# Remove bundled v8.
 	find v8 -type f \! -iname '*.gyp*' -delete || die
 
+	# Disable experimental extensions incompatible with system-provided V8,
+	# bug #354343.
+	cp "${FILESDIR}/experimental.gyp" "v8/src/extensions/experimental" || die
+	sed -e 's/ENABLE_JAVASCRIPT_I18N_API=1/ENABLE_JAVASCRIPT_I18N_API=0/g' \
+		-i build/features_override.gypi || die
+
 	# The implementation files include v8 headers with full path,
 	# like #include "v8/include/v8.h". Make sure the system headers
 	# will be used.
@@ -164,13 +165,6 @@ src_prepare() {
 	rmdir v8/include || die
 	ln -s /usr/include v8/include || die
 
-	if use system-sqlite; then
-		# Remove bundled sqlite, preserving the shim header.
-		find third_party/sqlite -type f \! -iname '*.gyp*' \
-			\! -path 'third_party/sqlite/sqlite3.h' \
-			-delete || die
-	fi
-
 	# Make sure the build system will use the right python, bug #344367.
 	# Only convert directories that need it, to save time.
 	python_convert_shebangs -q -r 2 build tools
@@ -185,7 +179,8 @@ src_configure() {
 
 	# Use system-provided libraries.
 	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_ssl (need to consult upstream).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
 	myconf+="
 		-Duse_system_bzip2=1
 		-Duse_system_ffmpeg=1
@@ -200,10 +195,6 @@ src_configure() {
 		-Duse_system_xdg_utils=1
 		-Duse_system_zlib=1"
 
-	if use system-sqlite; then
-		myconf+=" -Duse_system_sqlite=1"
-	fi
-
 	# The dependency on cups is optional, see bug #324105.
 	if use cups; then
 		myconf+=" -Duse_cups=1"
diff --git a/www-client/chromium/chromium-9.0.597.94.ebuild b/www-client/chromium/chromium-9.0.597.94.ebuild
index 7a63ffca3f5d..13d9808e8d3d 100644
--- a/www-client/chromium/chromium-9.0.597.94.ebuild
+++ b/www-client/chromium/chromium-9.0.597.94.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9.0.597.94.ebuild,v 1.4 2011/02/13 11:43:52 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9.0.597.94.ebuild,v 1.5 2011/02/18 10:46:51 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -15,12 +15,9 @@ SRC_URI="http://build.chromium.org/buildbot/official/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm x86"
-IUSE="cups +gecko-mediaplayer gnome gnome-keyring system-sqlite system-v8"
+IUSE="cups +gecko-mediaplayer gnome gnome-keyring system-v8"
 
 RDEPEND="app-arch/bzip2
-	system-sqlite? (
-		>=dev-db/sqlite-3.6.23.1[fts3,icu,secure-delete,threadsafe]
-	)
 	system-v8? ( >=dev-lang/v8-2.5.9.15 )
 	dev-libs/dbus-glib
 	>=dev-libs/icu-4.4.1
@@ -139,11 +136,6 @@ src_prepare() {
 		einfo "Bundled V8 version: ${v8_bundled}"
 	fi
 
-	if use system-sqlite; then
-		remove_bundled_lib "third_party/sqlite/src"
-		remove_bundled_lib "third_party/sqlite/preprocessed"
-	fi
-
 	if use system-v8; then
 		# Provide our own gyp file that links with the system v8.
 		# TODO: move this upstream.
@@ -185,10 +177,6 @@ src_configure() {
 		-Duse_system_vpx=1
 		-Duse_system_zlib=1"
 
-	if use system-sqlite; then
-		myconf+=" -Duse_system_sqlite=1"
-	fi
-
 	# The dependency on cups is optional, see bug #324105.
 	if use cups; then
 		myconf+=" -Duse_cups=1"
diff --git a/www-client/chromium/chromium-9.0.597.98.ebuild b/www-client/chromium/chromium-9.0.597.98.ebuild
index d6f144fbc98e..cda31fadc197 100644
--- a/www-client/chromium/chromium-9.0.597.98.ebuild
+++ b/www-client/chromium/chromium-9.0.597.98.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9.0.597.98.ebuild,v 1.1 2011/02/14 09:42:41 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9.0.597.98.ebuild,v 1.2 2011/02/18 10:46:51 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -15,12 +15,9 @@ SRC_URI="http://build.chromium.org/official/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="cups +gecko-mediaplayer gnome gnome-keyring system-sqlite system-v8"
+IUSE="cups +gecko-mediaplayer gnome gnome-keyring system-v8"
 
 RDEPEND="app-arch/bzip2
-	system-sqlite? (
-		>=dev-db/sqlite-3.6.23.1[fts3,icu,secure-delete,threadsafe]
-	)
 	system-v8? ( >=dev-lang/v8-2.5.9.15 )
 	dev-libs/dbus-glib
 	>=dev-libs/icu-4.4.1
@@ -139,11 +136,6 @@ src_prepare() {
 		einfo "Bundled V8 version: ${v8_bundled}"
 	fi
 
-	if use system-sqlite; then
-		remove_bundled_lib "third_party/sqlite/src"
-		remove_bundled_lib "third_party/sqlite/preprocessed"
-	fi
-
 	if use system-v8; then
 		# Provide our own gyp file that links with the system v8.
 		# TODO: move this upstream.
@@ -185,10 +177,6 @@ src_configure() {
 		-Duse_system_vpx=1
 		-Duse_system_zlib=1"
 
-	if use system-sqlite; then
-		myconf+=" -Duse_system_sqlite=1"
-	fi
-
 	# The dependency on cups is optional, see bug #324105.
 	if use cups; then
 		myconf+=" -Duse_cups=1"
diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
index 7accecf02015..55447d3959d9 100644
--- a/www-client/chromium/chromium-9999.ebuild
+++ b/www-client/chromium/chromium-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.132 2011/02/13 11:43:52 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.133 2011/02/18 10:46:51 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -189,6 +189,12 @@ src_prepare() {
 	# Remove bundled v8.
 	find v8 -type f \! -iname '*.gyp*' -delete || die
 
+	# Disable experimental extensions incompatible with system-provided V8,
+	# bug #354343.
+	cp "${FILESDIR}/experimental.gyp" "v8/src/extensions/experimental" || die
+	sed -e 's/ENABLE_JAVASCRIPT_I18N_API=1/ENABLE_JAVASCRIPT_I18N_API=0/g' \
+		-i build/features_override.gypi || die
+
 	# The implementation files include v8 headers with full path,
 	# like #include "v8/include/v8.h". Make sure the system headers
 	# will be used.
@@ -210,7 +216,7 @@ src_configure() {
 
 	# Use system-provided libraries.
 	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_ssl (need to consult upstream).
+	# TODO: use_system_ssl (http://crbug.com/58087).
 	# TODO: use_system_sqlite (http://crbug.com/22208).
 	myconf+="
 		-Duse_system_bzip2=1
diff --git a/www-client/chromium/files/experimental.gyp b/www-client/chromium/files/experimental.gyp
new file mode 100644
index 000000000000..d3bedc29b7f4
--- /dev/null
+++ b/www-client/chromium/files/experimental.gyp
@@ -0,0 +1,8 @@
+{
+  'targets': [
+    {
+      'target_name': 'i18n_api',
+      'type': 'none',
+    },
+  ],
+}
diff --git a/www-client/chromium/metadata.xml b/www-client/chromium/metadata.xml
index 8eb6f464cfbd..778e787a2a6a 100644
--- a/www-client/chromium/metadata.xml
+++ b/www-client/chromium/metadata.xml
@@ -6,8 +6,6 @@
 	<use>
 		<flag name="gecko-mediaplayer">Allow the browser to load
 			<pkg>www-plugins/gecko-mediaplayer</pkg></flag>
-		<flag name="system-sqlite">Use the system-wide <pkg>dev-db/sqlite</pkg>
-			installation with secure-delete enabled</flag>
 		<flag name="system-v8">Use the system-wide <pkg>dev-lang/v8</pkg>
 			installation</flag>
 	</use>