1 |
phajdan.jr 11/02/02 18:14:42 |
2 |
|
3 |
Modified: mongodb-1.6.0.ebuild metadata.xml ChangeLog |
4 |
Log: |
5 |
Add support for V8 JavaScript engine, bug #340028 by Johan Bergstroem <bugs@××××××××××.nu>. |
6 |
|
7 |
(Portage version: 2.1.9.25/cvs/Linux i686) |
8 |
|
9 |
Revision Changes Path |
10 |
1.2 dev-db/mongodb/mongodb-1.6.0.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mongodb/mongodb-1.6.0.ebuild?rev=1.2&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mongodb/mongodb-1.6.0.ebuild?rev=1.2&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mongodb/mongodb-1.6.0.ebuild?r1=1.1&r2=1.2 |
15 |
|
16 |
Index: mongodb-1.6.0.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-1.6.0.ebuild,v |
19 |
retrieving revision 1.1 |
20 |
retrieving revision 1.2 |
21 |
diff -u -r1.1 -r1.2 |
22 |
--- mongodb-1.6.0.ebuild 16 Aug 2010 15:37:22 -0000 1.1 |
23 |
+++ mongodb-1.6.0.ebuild 2 Feb 2011 18:14:42 -0000 1.2 |
24 |
@@ -1,6 +1,6 @@ |
25 |
-# Copyright 1999-2010 Gentoo Foundation |
26 |
+# Copyright 1999-2011 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
-# $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 $ |
29 |
+# $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 $ |
30 |
|
31 |
EAPI="2" |
32 |
|
33 |
@@ -16,9 +16,10 @@ |
34 |
LICENSE="AGPL-3" |
35 |
SLOT="0" |
36 |
KEYWORDS="~amd64 ~x86" |
37 |
-IUSE="" |
38 |
+IUSE="v8" |
39 |
|
40 |
-RDEPEND="dev-lang/spidermonkey[unicode] |
41 |
+RDEPEND="!v8? ( dev-lang/spidermonkey[unicode] ) |
42 |
+ v8? ( dev-lang/v8 ) |
43 |
dev-libs/boost |
44 |
dev-libs/libpcre" |
45 |
|
46 |
@@ -33,19 +34,32 @@ |
47 |
pkg_setup() { |
48 |
enewgroup mongodb |
49 |
enewuser mongodb -1 -1 /var/lib/${PN} mongodb |
50 |
+ |
51 |
+ scons_opts="${MAKEOPTS}" |
52 |
+ if use v8; then |
53 |
+ scons_opts+=" --usev8" |
54 |
+ else |
55 |
+ scons_opts+=" --usesm" |
56 |
+ fi |
57 |
} |
58 |
|
59 |
src_prepare() { |
60 |
epatch "${FILESDIR}/${P}-fix-scons.patch" |
61 |
#} epatch "${FILESDIR}"/"${PN}"-"${MY_PATCHVER}"-modify-*.patch |
62 |
+ |
63 |
+ if use v8; then |
64 |
+ # Suppress known test failure with v8: |
65 |
+ # http://jira.mongodb.org/browse/SERVER-1147 |
66 |
+ sed -e '/add< NumberLong >/d' -i dbtests/jstests.cpp || die |
67 |
+ fi |
68 |
} |
69 |
|
70 |
src_compile() { |
71 |
- scons ${MAKEOPTS} all || die "Compile failed" |
72 |
+ scons ${scons_opts} all || die "Compile failed" |
73 |
} |
74 |
|
75 |
src_install() { |
76 |
- scons ${MAKEOPTS} --full --nostrip install --prefix="${D}"/usr || die "Install failed" |
77 |
+ scons ${scons_opts} --full --nostrip install --prefix="${D}"/usr || die "Install failed" |
78 |
|
79 |
for x in /var/{lib,log,run}/${PN}; do |
80 |
dodir "${x}" || die "Install failed" |
81 |
@@ -60,5 +74,5 @@ |
82 |
} |
83 |
|
84 |
src_test() { |
85 |
- scons ${MAKEOPTS} smoke --smokedbprefix='testdir' test || die "Tests failed" |
86 |
+ scons ${scons_opts} smoke --smokedbprefix='testdir' test || die "Tests failed" |
87 |
} |
88 |
|
89 |
|
90 |
|
91 |
1.3 dev-db/mongodb/metadata.xml |
92 |
|
93 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mongodb/metadata.xml?rev=1.3&view=markup |
94 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mongodb/metadata.xml?rev=1.3&content-type=text/plain |
95 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mongodb/metadata.xml?r1=1.2&r2=1.3 |
96 |
|
97 |
Index: metadata.xml |
98 |
=================================================================== |
99 |
RCS file: /var/cvsroot/gentoo-x86/dev-db/mongodb/metadata.xml,v |
100 |
retrieving revision 1.2 |
101 |
retrieving revision 1.3 |
102 |
diff -u -r1.2 -r1.3 |
103 |
--- metadata.xml 22 Mar 2010 01:14:04 -0000 1.2 |
104 |
+++ metadata.xml 2 Feb 2011 18:14:42 -0000 1.3 |
105 |
@@ -14,5 +14,10 @@ |
106 |
scalable) and traditional RDBMS systems (which provide structured schemas |
107 |
and powerful queries). |
108 |
</longdescription> |
109 |
+ <use> |
110 |
+ <flag name="v8">Use V8 JavaScript engine |
111 |
+ (<pkg>dev-lang/v8</pkg>) instead of SpiderMonkey |
112 |
+ (<pkg>dev-lang/spidermonkey</pkg>)</flag> |
113 |
+ </use> |
114 |
</pkgmetadata> |
115 |
|
116 |
|
117 |
|
118 |
|
119 |
1.10 dev-db/mongodb/ChangeLog |
120 |
|
121 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mongodb/ChangeLog?rev=1.10&view=markup |
122 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mongodb/ChangeLog?rev=1.10&content-type=text/plain |
123 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mongodb/ChangeLog?r1=1.9&r2=1.10 |
124 |
|
125 |
Index: ChangeLog |
126 |
=================================================================== |
127 |
RCS file: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v |
128 |
retrieving revision 1.9 |
129 |
retrieving revision 1.10 |
130 |
diff -u -r1.9 -r1.10 |
131 |
--- ChangeLog 16 Aug 2010 15:37:22 -0000 1.9 |
132 |
+++ ChangeLog 2 Feb 2011 18:14:42 -0000 1.10 |
133 |
@@ -1,6 +1,11 @@ |
134 |
# ChangeLog for dev-db/mongodb |
135 |
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
136 |
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.9 2010/08/16 15:37:22 lu_zero Exp $ |
137 |
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
138 |
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.10 2011/02/02 18:14:42 phajdan.jr Exp $ |
139 |
+ |
140 |
+ 02 Feb 2011; Pawel Hajdan jr <phajdan.jr@g.o> mongodb-1.6.0.ebuild, |
141 |
+ metadata.xml: |
142 |
+ Add support for V8 JavaScript engine, bug #340028 by Johan Bergstroem |
143 |
+ <bugs@××××××××××.nu>. |
144 |
|
145 |
*mongodb-1.6.0 (16 Aug 2010) |