Add experimental support for building with system-provided v8.

Package-Manager: portage-2.1.8.3/cvs/Linux i686

6 files changed, 138 insertions, 11 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index fb6595ad36a1..e56a5baa8912 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,10 @@
 # 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.209 2010/10/27 14:20:22 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.210 2010/10/29 08:52:07 phajdan.jr Exp $
+
+  29 Oct 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> +files/v8.gyp,
+  chromium-8.0.552.18.ebuild, chromium-9999.ebuild, metadata.xml:
+  Add experimental support for building with system-provided v8.
 
   27 Oct 2010; Bernard Cafarelli <voyageur@gentoo.org> chromium-9999.ebuild:
   Drop icu patch, merged upstream, thanks Keith Rusler
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 61a111de7de6..9797ec280d09 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -8,6 +8,7 @@ AUX chromium-system-icu-r1.patch 735 RMD160 d3fabb98c3de79afd87f4dad2fd842eac31b
 AUX chromium-system-sqlite-r0.patch 1802 RMD160 7e796e63a2415b98b7192f466481ea00d86d5ddf SHA1 13bb913c620b813f5a5436864a002374b2da9b7b SHA256 c34e65648c1593d3c693db643d342c192056d2bf5c19b45129ac29ea2862ccf0
 AUX chromium-system-ssl-r0.patch 460 RMD160 50a5a212ed859d9987d2c59bc1d2a6c2e56a7bad SHA1 b1336a7a42b784515ea45bcfe4480580f4345b97 SHA256 374897ac710e37e8ff63de78a751d4078aeb438845541ce294291ab58687984b
 AUX chromium.xml 390 RMD160 6b2f901da76555a7112f71a6f9dae6e2e3307324 SHA1 81148a0b094bc697ff2c9d33efe976b1bffb72a3 SHA256 a81c6257346eaa4f6389fc9ea8834fd2dd3b006cf4e9e999028aca812d76fe9a
+AUX v8.gyp 2602 RMD160 2949c9e2d8e2297182130e5984fb5f114c260a81 SHA1 7d32a04a7a921f30b0c3ed33a5593f1059832c96 SHA256 bc5342501d71754f23bd87914bb11841a7487330ba2f0462611dd1b0f99a2a43
 DIST chromium-6.0.472.62.tar.bz2 123969547 RMD160 874411802d0aa4d7ed83967f2c6873682b764ba6 SHA1 960bdac068b9265fbc9cff41a773f9c0740d09bb SHA256 518400874f0b801a8a7954d3f90b2060c620979bab219237dc1fc56d8dcafeb6
 DIST chromium-6.0.472.63.tar.bz2 123990097 RMD160 7931846fd581f76ba2039f82b64156a100614d44 SHA1 82045b1685706edc7be9182b99f2bcedb4b06da9 SHA256 029bb4f4a706fcb83e80c20b960415cd1fb01e5c634d72f0271e79c60bdec228
 DIST chromium-7.0.517.36.tar.bz2 132903248 RMD160 df508769cdd50a061531f8d7387c03e7ad85ef04 SHA1 9fad31d9204e5530faad17a649c97e9ee56d2cbe SHA256 93e8d2982dc14eba6f1c6e5c851679ebbd562769443ce228eaa29f2e84d02248
@@ -22,7 +23,7 @@ EBUILD chromium-7.0.517.41-r1.ebuild 6614 RMD160 2f5c691328c33965cdbfc257c8be5a9
 EBUILD chromium-7.0.517.41.ebuild 6605 RMD160 3751c1f28930c71e442c7656ddede271e3230236 SHA1 a965c1c3d75831093b666b02b1d22d3847a73d4a SHA256 57c191137db6de2ab5ed0bd629524a060b71c936d37228bca41d8702ca11753b
 EBUILD chromium-7.0.544.0-r2.ebuild 7600 RMD160 4e30b02693752b828e51ac1783c45b3fd4a366b1 SHA1 e119fc2bc5c11e94ffd272fab5ba034c06940b45 SHA256 f888cf80d72f1e08a48400a157d94ada91444b2427dd9a19f298c764899b5aec
 EBUILD chromium-8.0.552.11.ebuild 7528 RMD160 7dbb495dd3113cf213a2cd37c750396b4e006997 SHA1 ec4c1ec8af81e1b19fcc578d857b917ae42a710c SHA256 a9d4d352f4606c31329f48da5c701b0f9104c83c6dd50a5d579267417fba4d2d
-EBUILD chromium-8.0.552.18.ebuild 7528 RMD160 ce5f3687e5decd3a8a24658619874c3062fa5e45 SHA1 9b747f147d97145d1465c9fcb510e4ec39ee44bc SHA256 34bda0e225fa9deb3efe6b6e4c202c0ad4732ff5a0e26669bf0c5929ecaad5c3
-EBUILD chromium-9999.ebuild 9116 RMD160 152fa0e59b63553099dd6d622e83a14eafe62503 SHA1 7674105128fd7feca5db38b59818a1d60e68a4bf SHA256 76f2d56d734482f7a961d589cbea6d96387dd72e07e251b905edbe17cd61d17a
-MISC ChangeLog 45906 RMD160 f45db5ffbd5751b9f9ca74a9a494f34a35680bbc SHA1 9e4e46c53ed7a8480d02e3282c715524bac547e4 SHA256 29b8fc551d03ae008adc5a00916c7bb989efece6933d48c8d61998a71d03230f
-MISC metadata.xml 516 RMD160 55abec043e516fad54cc6c9f5aff0d1ac6aba738 SHA1 9cb50bcd2f1e7f0dc6e257fcab3b24f0f0f90f0c SHA256 b2f497aa9d3ab3deb4cbd25eedc3037df449349a3506f1af7e3de9730c522b8b
+EBUILD chromium-8.0.552.18.ebuild 8029 RMD160 fd44958d833a17130385005b72a635b3d1f9dd09 SHA1 2d3d829cbcac1430e76b33707bbdd62db7cfe333 SHA256 ae528726ea3fe054fe9f1b26b922bc7f19a6ef68a7bfe3563cbb8a7eb6a13288
+EBUILD chromium-9999.ebuild 9617 RMD160 4d7f068fdd14c9f5bf2cdb9aa5dc0a82b4011cbc SHA1 d9bbe330cc27c4d242dbfcd77842a28627c09801 SHA256 2c4a8ed5530f2f663db9336ad3ce5a1bb82ec2aa4fb83376034ed40199e25508
+MISC ChangeLog 46110 RMD160 f44bff2102a448ba79ab87db0843e3ff747970aa SHA1 fd9fa395f4809c8403da6dd76e45779637d02cd8 SHA256 8035b11a15689681c7fce130252cc22b7ba97fef89f206c71fb19223de4e3879
+MISC metadata.xml 607 RMD160 98f163b667c92c149e6ad82352ff5a1ea076361f SHA1 0d7d96013e31288c37a0e245cf2b538af1a46eaf SHA256 1d94b496c34342ce43cf7b1c6887d90930c0531e903e512d2d132e79e1d0d27d
diff --git a/www-client/chromium/chromium-8.0.552.18.ebuild b/www-client/chromium/chromium-8.0.552.18.ebuild
index c36030f10cc4..b235432196ee 100644
--- a/www-client/chromium/chromium-8.0.552.18.ebuild
+++ b/www-client/chromium/chromium-8.0.552.18.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-8.0.552.18.ebuild,v 1.1 2010/10/27 08:41:21 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-8.0.552.18.ebuild,v 1.2 2010/10/29 08:52:07 phajdan.jr Exp $
 
 EAPI="2"
 
@@ -13,12 +13,13 @@ 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"
+IUSE="cups +gecko-mediaplayer gnome gnome-keyring system-sqlite 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.4.9.6 )
 	>=dev-libs/icu-4.4.1
 	>=dev-libs/libevent-1.4.13
 	dev-libs/libxml2
@@ -54,7 +55,7 @@ RDEPEND+="
 remove_bundled_lib() {
 	einfo "Removing bundled library $1 ..."
 	local out
-	out="$(find $1 -mindepth 1 \! -iname '*.gyp' -print -delete)" \
+	out="$(find $1 -type f \! -iname '*.gyp' -print -delete)" \
 		|| die "failed to remove bundled library $1"
 	if [[ -z $out ]]; then
 		die "no files matched when removing bundled library $1"
@@ -100,6 +101,21 @@ src_prepare() {
 		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.
+		cp "${FILESDIR}"/v8.gyp v8/tools/gyp || die
+
+		remove_bundled_lib "v8"
+
+		# The implementation files include v8 headers with full path,
+		# like #include "v8/include/v8.h". Make sure the system headers
+		# will be used.
+		# TODO: find a solution that can be upstreamed.
+		rmdir v8/include || die
+		ln -s /usr/include v8/include || die
+	fi
 }
 
 src_configure() {
diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
index 83ad9b1ff97e..bee3bfa10e4e 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.97 2010/10/27 14:20:22 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.98 2010/10/29 08:52:07 phajdan.jr Exp $
 
 EAPI="2"
 
@@ -15,12 +15,13 @@ EGCLIENT_REPO_URI="http://src.chromium.org/svn/trunk/src/"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
-IUSE="cups +gecko-mediaplayer gnome gnome-keyring system-sqlite"
+IUSE="cups +gecko-mediaplayer gnome gnome-keyring system-sqlite 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.4.9.6 )
 	>=dev-libs/icu-4.4.1
 	>=dev-libs/libevent-1.4.13
 	dev-libs/libxml2
@@ -99,7 +100,7 @@ src_unpack() {
 remove_bundled_lib() {
 	einfo "Removing bundled library $1 ..."
 	local out
-	out="$(find $1 -mindepth 1 \! -iname '*.gyp' -print -delete)" \
+	out="$(find $1 -type f \! -iname '*.gyp' -print -delete)" \
 		|| ewarn "failed to remove bundled library $1"
 	if [[ -z $out ]]; then
 		ewarn "no files matched when removing bundled library $1"
@@ -141,6 +142,21 @@ src_prepare() {
 		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.
+		cp "${FILESDIR}"/v8.gyp v8/tools/gyp || die
+
+		remove_bundled_lib "v8"
+
+		# The implementation files include v8 headers with full path,
+		# like #include "v8/include/v8.h". Make sure the system headers
+		# will be used.
+		# TODO: find a solution that can be upstreamed.
+		rmdir v8/include || die
+		ln -s /usr/include v8/include || die
+	fi
 }
 
 src_configure() {
diff --git a/www-client/chromium/files/v8.gyp b/www-client/chromium/files/v8.gyp
new file mode 100644
index 000000000000..d37920732883
--- /dev/null
+++ b/www-client/chromium/files/v8.gyp
@@ -0,0 +1,88 @@
+# Copyright 2009-2010 the V8 project authors. All rights reserved.
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+#       notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+#       copyright notice, this list of conditions and the following
+#       disclaimer in the documentation and/or other materials provided
+#       with the distribution.
+#     * Neither the name of Google Inc. nor the names of its
+#       contributors may be used to endorse or promote products derived
+#       from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+{
+  'variables': {
+    'msvs_use_common_release': 0,
+    'gcc_version%': 'unknown',
+    'v8_target_arch%': '<(target_arch)',
+    'v8_use_snapshot%': 'true',
+  },
+  'targets': [
+    {
+      'target_name': 'v8',
+      'type': 'settings',
+      'link_settings': {
+        'libraries': [
+          '-lv8',
+        ],
+      },
+    },
+    {
+      'target_name': 'v8_snapshot',
+      'type': 'none',
+      'dependencies': [
+        'v8'
+      ],
+    },
+    {
+      'target_name': 'v8_nosnapshot',
+      'type': 'none',
+      'dependencies': [
+        'v8'
+      ],
+    },
+    {
+      'target_name': 'v8_base',
+      'type': 'none',
+      'dependencies': [
+        'v8'
+      ],
+    },
+    {
+      'target_name': 'js2c',
+      'type': 'none',
+      'dependencies': [
+        'v8'
+      ],
+    },
+    {
+      'target_name': 'mksnapshot',
+      'type': 'none',
+      'dependencies': [
+        'v8'
+      ],
+    },
+    {
+      'target_name': 'v8_shell',
+      'type': 'none',
+      'dependencies': [
+        'v8'
+      ],
+    },
+  ],
+}
diff --git a/www-client/chromium/metadata.xml b/www-client/chromium/metadata.xml
index b9e26d125530..8eb6f464cfbd 100644
--- a/www-client/chromium/metadata.xml
+++ b/www-client/chromium/metadata.xml
@@ -8,5 +8,7 @@
 			<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>
 </pkgmetadata>