Update the sqlite dependency to also require icu and threadsafe flags to be on (it's closer to the upstream-bundled sqlite configuration). Also build v8 snapshot by default.

(Portage version: 2.1.8.3/cvs/Linux i686)

3 files changed, 25 insertions, 11 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 6983e19247f5..e6c065e727b7 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.192 2010/10/01 08:34:59 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.193 2010/10/04 10:55:37 phajdan.jr Exp $
+
+  04 Oct 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  chromium-7.0.536.2.ebuild, chromium-9999.ebuild:
+  Update the sqlite dependency to also require icu and threadsafe flags to
+  be on (it's closer to the upstream-bundled sqlite configuration). Also
+  build v8 snapshot by default.
 
 *chromium-7.0.536.2 (01 Oct 2010)
 
diff --git a/www-client/chromium/chromium-7.0.536.2.ebuild b/www-client/chromium/chromium-7.0.536.2.ebuild
index 269a18d281ff..84890087e53a 100644
--- a/www-client/chromium/chromium-7.0.536.2.ebuild
+++ b/www-client/chromium/chromium-7.0.536.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-7.0.536.2.ebuild,v 1.1 2010/10/01 08:34:59 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-7.0.536.2.ebuild,v 1.2 2010/10/04 10:55:37 phajdan.jr Exp $
 
 EAPI="2"
 
@@ -16,7 +16,9 @@ KEYWORDS="~amd64 ~arm ~x86"
 IUSE="cups gnome gnome-keyring system-sqlite"
 
 RDEPEND="app-arch/bzip2
-	system-sqlite? ( >=dev-db/sqlite-3.6.23.1[fts3,secure-delete] )
+	system-sqlite? (
+		>=dev-db/sqlite-3.6.23.1[fts3,icu,secure-delete,threadsafe]
+	)
 	>=dev-libs/icu-4.4.1
 	>=dev-libs/libevent-1.4.13
 	dev-libs/libxml2
@@ -139,9 +141,11 @@ src_configure() {
 		-Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox
 		-Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
 
-	# Disable the V8 snapshot. It breaks the build on hardened (bug #301880),
-	# and the performance gain isn't worth it.
-	myconf+=" -Dv8_use_snapshot=0"
+	if host-is-pax; then
+		# Prevent the build from failing (bug #301880). The performance
+		# difference is very small.
+		myconf+=" -Dv8_use_snapshot=0"
+	fi
 
 	# Use target arch detection logic from bug #296917.
 	local myarch="$ABI"
diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
index 5da0c86f5569..30c48f738eef 100644
--- a/www-client/chromium/chromium-9999.ebuild
+++ b/www-client/chromium/chromium-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.87 2010/10/01 08:34:59 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.88 2010/10/04 10:55:37 phajdan.jr Exp $
 
 EAPI="2"
 
@@ -18,7 +18,9 @@ KEYWORDS=""
 IUSE="cups gnome gnome-keyring system-sqlite"
 
 RDEPEND="app-arch/bzip2
-	system-sqlite? ( >=dev-db/sqlite-3.6.23.1[fts3,secure-delete] )
+	system-sqlite? (
+		>=dev-db/sqlite-3.6.23.1[fts3,icu,secure-delete,threadsafe]
+	)
 	>=dev-libs/icu-4.4.1
 	>=dev-libs/libevent-1.4.13
 	dev-libs/libxml2
@@ -184,9 +186,11 @@ src_configure() {
 		-Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox
 		-Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
 
-	# Disable the V8 snapshot. It breaks the build on hardened (bug #301880),
-	# and the performance gain isn't worth it.
-	myconf+=" -Dv8_use_snapshot=0"
+	if host-is-pax; then
+		# Prevent the build from failing (bug #301880). The performance
+		# difference is very small.
+		myconf+=" -Dv8_use_snapshot=0"
+	fi
 
 	# Use target arch detection logic from bug #296917.
 	local myarch="$ABI"