Add support for V8 JavaScript engine, bug #340028 by Johan Bergstroem <bugs@bergstroem.nu>.

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

4 files changed, 36 insertions, 12 deletions

diff --git a/dev-db/mongodb/ChangeLog b/dev-db/mongodb/ChangeLog
index 37f33cb7e403..eb80e8f4ad9d 100644
--- a/dev-db/mongodb/ChangeLog
+++ b/dev-db/mongodb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/mongodb
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.9 2010/08/16 15:37:22 lu_zero Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.10 2011/02/02 18:14:42 phajdan.jr Exp $
+
+  02 Feb 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> mongodb-1.6.0.ebuild,
+  metadata.xml:
+  Add support for V8 JavaScript engine, bug #340028 by Johan Bergstroem
+  <bugs@bergstroem.nu>.
 
 *mongodb-1.6.0 (16 Aug 2010)
 
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 7b85080e8b98..738fa6cdb1e1 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -26,6 +26,6 @@ EBUILD mongodb-1.4.4.ebuild 1467 RMD160 97f11435df1fb11e0c72c9751177886b42de62cb
 EBUILD mongodb-1.5.1.ebuild 1467 RMD160 486e352d90cac0424793c4e0f73469a225d63c4b SHA1 e05c6775457662ca4829f7e036212099b30bc3b5 SHA256 1b80f3931d744ef8cc3cda094e487ede7ae865387732f692aadfecba8763ba56
 EBUILD mongodb-1.5.2.ebuild 1534 RMD160 1d9458f1eeb3610189b2baa17751809837adeb5a SHA1 f21ea4810963568ba6fcf18f98f1479b353da1ec SHA256 d7220885cd2276ef9892d54f794d8222dc0d5d7b4910d4b6ad9302914c6f465c
 EBUILD mongodb-1.5.5.ebuild 1543 RMD160 d93ce1e615ebfbb7e6d379455c0fdb5bffb1f6da SHA1 0e1baeb98289b957e61d59e531671f5e76a43a5c SHA256 979c013af12c9d9e0ac63f3ed9fbeafe956badb4a8a8fc19001b7a82c1be5e56
-EBUILD mongodb-1.6.0.ebuild 1592 RMD160 8abef7ea7eb1ae501262bbb1284e096aeeaa02da SHA1 e25aa1dee05d0f15c2328dc41a4d32dec56c3e7a SHA256 a440ceb1572fde1d714a6db5c183b04f8ebe69b6391c098412d66483543af017
-MISC ChangeLog 2607 RMD160 58531e43b17a9305e86961216f1ebed63028e746 SHA1 8dee1f7f41e3b9fd8d7e9ce8924a12bdda094a37 SHA256 feaf08a9a3beb7bb6b049b139a9dabf9e2e4b517840dadb1d83fa73ddcbbf201
-MISC metadata.xml 635 RMD160 bb97e8619fb57142f8db034825c42e8823ee6fe8 SHA1 25225f273ee43265bd0f197d312124aa5ccd367d SHA256 a2325296197e68e77ef96c3754baaebc24b40d2d7f90093cdd0e625e503447f4
+EBUILD mongodb-1.6.0.ebuild 1909 RMD160 e1020c2f8bffadc4c63355dda668821474825de0 SHA1 84489830fccaea5fc22b529f38a74c2fefb4f018 SHA256 90c0233bd69d3be8211167f391acc7ab399fd27fd16cf77ca6d7f86125ffbf58
+MISC ChangeLog 2801 RMD160 0fe8223aba5adfa74a299cddffb09d46c6046b94 SHA1 79101f588dfd107ef18b78a87f2bed372fae7ccd SHA256 63c9d219129dcb740d36a266fafe67cd9e1ee08954929e2104ce383ae8c5b4f4
+MISC metadata.xml 790 RMD160 c4ba7d34942d595cf264a28291b2b7fe3a819cea SHA1 80a49962a8fbc3464725fdf8113b26b07b98ee85 SHA256 e778d15762ab67f8b45f97c82d3e7845139585fa6429cd96d20293c841c3a3c2
diff --git a/dev-db/mongodb/metadata.xml b/dev-db/mongodb/metadata.xml
index 027169528fb6..799925d6010c 100644
--- a/dev-db/mongodb/metadata.xml
+++ b/dev-db/mongodb/metadata.xml
@@ -14,5 +14,10 @@
 	scalable) and traditional RDBMS systems (which provide structured schemas
 	and powerful queries).
 	</longdescription>
+	<use>
+		<flag name="v8">Use V8 JavaScript engine
+			(<pkg>dev-lang/v8</pkg>) instead of SpiderMonkey
+			(<pkg>dev-lang/spidermonkey</pkg>)</flag>
+	</use>
 </pkgmetadata>
 
diff --git a/dev-db/mongodb/mongodb-1.6.0.ebuild b/dev-db/mongodb/mongodb-1.6.0.ebuild
index c638f2759b99..9d5ebf491cbc 100644
--- a/dev-db/mongodb/mongodb-1.6.0.ebuild
+++ b/dev-db/mongodb/mongodb-1.6.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-1.6.0.ebuild,v 1.1 2010/08/16 15:37:22 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-1.6.0.ebuild,v 1.2 2011/02/02 18:14:42 phajdan.jr Exp $
 
 EAPI="2"
 
@@ -16,9 +16,10 @@ SRC_URI="http://downloads.mongodb.org/src/${MY_P}.tar.gz"
 LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="v8"
 
-RDEPEND="dev-lang/spidermonkey[unicode]
+RDEPEND="!v8? ( dev-lang/spidermonkey[unicode] )
+	v8? ( dev-lang/v8 )
 	dev-libs/boost
 	dev-libs/libpcre"
 
@@ -33,19 +34,32 @@ S="${WORKDIR}/${MY_P}"
 pkg_setup() {
 	enewgroup mongodb
 	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
+
+	scons_opts="${MAKEOPTS}"
+	if use v8; then
+		scons_opts+=" --usev8"
+	else
+		scons_opts+=" --usesm"
+	fi
 }
 
 src_prepare() {
 	epatch "${FILESDIR}/${P}-fix-scons.patch"
 #}	epatch "${FILESDIR}"/"${PN}"-"${MY_PATCHVER}"-modify-*.patch
+
+	if use v8; then
+		# Suppress known test failure with v8:
+		# http://jira.mongodb.org/browse/SERVER-1147
+		sed -e '/add< NumberLong >/d' -i dbtests/jstests.cpp || die
+	fi
 }
 
 src_compile() {
-	scons ${MAKEOPTS} all || die "Compile failed"
+	scons ${scons_opts} all || die "Compile failed"
 }
 
 src_install() {
-	scons ${MAKEOPTS} --full --nostrip install --prefix="${D}"/usr || die "Install failed"
+	scons ${scons_opts} --full --nostrip install --prefix="${D}"/usr || die "Install failed"
 
 	for x in /var/{lib,log,run}/${PN}; do
 		dodir "${x}" || die "Install failed"
@@ -60,5 +74,5 @@ src_install() {
 }
 
 src_test() {
-	scons ${MAKEOPTS} smoke --smokedbprefix='testdir' test || die "Tests failed"
+	scons ${scons_opts} smoke --smokedbprefix='testdir' test || die "Tests failed"
 }