diff options
| -rw-r--r-- | dev-db/mongodb/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-db/mongodb/metadata.xml | 5 | ||||
| -rw-r--r-- | dev-db/mongodb/mongodb-1.6.0.ebuild | 28 |
3 files changed, 33 insertions, 9 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/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" } |