Gentoo Archives: gentoo-dev

From: Ultrabug <ultrabug@g.o>
To: gentoo-dev@l.g.o, Benedikt Boehm <hollow@g.o>
Subject: [gentoo-dev] Re: [gentoo-commits] proj/betagarden:master commit in: dev-db/mongodb/files/, dev-db/mongodb/
Date: Mon, 11 Apr 2011 16:37:10
Message-Id: 4DA32DF5.7040305@gentoo.org
1 On 08/04/2011 19:34, Benedikt Boehm wrote:
2 > commit: d9be143486caa83951aae4d6c72c58fea90ed451
3 > Author: Benedikt Böhm <bb <AT> xnull <DOT> de>
4 > AuthorDate: Fri Apr 8 17:27:47 2011 +0000
5 > Commit: Benedikt Boehm <hollow <AT> gentoo <DOT> org>
6 > CommitDate: Fri Apr 8 17:33:26 2011 +0000
7 > URL: http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=d9be1434
8 >
9 > dev-db/mongodb: version bump to 1.8.1
10 >
11 > - #329167 - dev-db/mongodb missing dependency on net-libs/libpcap
12 > - #334081 - dev-db/mongodb does not respect LDFLAGS
13 > - #337593 - dev-db/mongodb should depend on libpcre being compiled with
14 > the cxx useflag
15 > - #337973 - dev-db/mongodb-1.8.0 version bump
16 > - #338039 - dev-db/mongodb starts as root
17 > - #340032 - dev-db/mongodb: add server logging
18 > - #356731 - dev-db/mongodb should create /var/run/mongodb
19 >
20 > ---
21 > dev-db/mongodb/files/mongodb-1.6.3-fix-scons.patch | 25 --------
22 > dev-db/mongodb/files/mongodb-1.8.1-fix-scons.patch | 37 +++++++++++
23 > dev-db/mongodb/files/mongodb.confd | 16 ++---
24 > dev-db/mongodb/files/mongodb.initd | 15 +++--
25 > dev-db/mongodb/mongodb-1.6.3.ebuild | 65 --------------------
26 > dev-db/mongodb/mongodb-1.7.5.ebuild | 65 --------------------
27 > dev-db/mongodb/mongodb-1.8.0_rc1.ebuild | 65 --------------------
28 > .../{mongodb-1.8.0.ebuild => mongodb-1.8.1.ebuild} | 38 ++++++++----
29 > 8 files changed, 76 insertions(+), 250 deletions(-)
30 >
31 > diff --git a/dev-db/mongodb/files/mongodb-1.6.3-fix-scons.patch b/dev-db/mongodb/files/mongodb-1.6.3-fix-scons.patch
32 > deleted file mode 100644
33 > index 1c26ce6..0000000
34 > --- a/dev-db/mongodb/files/mongodb-1.6.3-fix-scons.patch
35 > +++ /dev/null
36 > @@ -1,25 +0,0 @@
37 > -diff --git a/SConstruct b/SConstruct
38 > -index b759094..5d667f4 100644
39 > ---- a/SConstruct
40 > -+++ b/SConstruct
41 > -@@ -745,9 +745,9 @@ else:
42 > -
43 > - if nix:
44 > - env.Append( CPPFLAGS="-fPIC -fno-strict-aliasing -ggdb -pthread -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" )
45 > -- if linux:
46 > -- env.Append( CPPFLAGS=" -Werror " )
47 > -+ env.Append( CXXFLAGS=os.environ['CXXFLAGS'])
48 > - env.Append( CXXFLAGS=" -Wnon-virtual-dtor " )
49 > -+ env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
50 > - env.Append( LINKFLAGS=" -fPIC -pthread -rdynamic" )
51 > - env.Append( LIBS=[] )
52 > -
53 > -@@ -757,8 +757,6 @@ if nix:
54 > - if debugBuild:
55 > - env.Append( CPPFLAGS=" -O0 -fstack-protector " );
56 > - env['ENV']['GLIBCXX_FORCE_NEW'] = 1; # play nice with valgrind
57 > -- else:
58 > -- env.Append( CPPFLAGS=" -O3" )
59 > -
60 > - if debugLogging:
61 > - env.Append( CPPFLAGS=" -D_DEBUG" );
62 >
63 > diff --git a/dev-db/mongodb/files/mongodb-1.8.1-fix-scons.patch b/dev-db/mongodb/files/mongodb-1.8.1-fix-scons.patch
64 > new file mode 100644
65 > index 0000000..25a6a6f
66 > --- /dev/null
67 > +++ b/dev-db/mongodb/files/mongodb-1.8.1-fix-scons.patch
68 > @@ -0,0 +1,37 @@
69 > +From 4ce35e34e646b6ccf151449bd2b47cef543152e5 Mon Sep 17 00:00:00 2001
70 > +From: =?UTF-8?q?Benedikt=20B=C3=B6hm?= <bb@×××××.de>
71 > +Date: Fri, 8 Apr 2011 16:33:37 +0200
72 > +Subject: [PATCH] fix scons
73 > +
74 > +---
75 > + SConstruct | 5 ++---
76 > + 1 files changed, 2 insertions(+), 3 deletions(-)
77 > +
78 > +diff --git a/SConstruct b/SConstruct
79 > +index 41383b1..35c7ea6 100644
80 > +--- a/SConstruct
81 > ++++ b/SConstruct
82 > +@@ -671,9 +671,10 @@ if nix:
83 > + env.Append( CPPFLAGS="-fPIC -fno-strict-aliasing -ggdb -pthread -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" )
84 > + # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
85 > + if linux:
86 > +- env.Append( CPPFLAGS=" -Werror " )
87 > + env.Append( CPPFLAGS=" -fno-builtin-memcmp " ) # glibc's memcmp is faster than gcc's
88 > ++ env.Append( CXXFLAGS=os.environ['CXXFLAGS'] )
89 > + env.Append( CXXFLAGS=" -Wnon-virtual-dtor " )
90 > ++ env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
91 > + env.Append( LINKFLAGS=" -fPIC -pthread -rdynamic" )
92 > + env.Append( LIBS=[] )
93 > +
94 > +@@ -687,8 +688,6 @@ if nix:
95 > + if debugBuild:
96 > + env.Append( CPPFLAGS=" -O0 -fstack-protector " );
97 > + env['ENV']['GLIBCXX_FORCE_NEW'] = 1; # play nice with valgrind
98 > +- else:
99 > +- env.Append( CPPFLAGS=" -O3" )
100 > + #env.Append( CPPFLAGS=" -fprofile-generate" )
101 > + #env.Append( LINKFLAGS=" -fprofile-generate" )
102 > + # then:
103 > +--
104 > +1.7.3.4
105 > +
106 >
107 > diff --git a/dev-db/mongodb/files/mongodb.confd b/dev-db/mongodb/files/mongodb.confd
108 > index 41585ff..2e087ac 100644
109 > --- a/dev-db/mongodb/files/mongodb.confd
110 > +++ b/dev-db/mongodb/files/mongodb.confd
111 > @@ -1,11 +1,5 @@
112 > -# Mongodb essentials
113 > -#MONGODB_EXEC="/usr/bin/mongod"
114 > -#MONGODB_DATA="/var/lib/mongodb"
115 > -#MONGODB_USER="mongodb"
116 > -#MONGODB_PID_FILE="/var/run/mongodb/mongodb.pid"
117 > -
118 > -#MONGODB_IP="127.0.0.1"
119 > -#MONGODB_PORT="27017"
120 > -
121 > -# Set extra options here, such as disabling the admin web server
122 > -#MONGODB_OPTIONS=""
123 > +MONGODB_USER="mongodb"
124 > +MONGODB_EXEC="/usr/bin/mongod"
125 > +MONGODB_IP="127.0.0.1"
126 > +MONGODB_PORT="27012"
127 > +MONGODB_OPTIONS="--rest --dbpath /var/lib/mongodb"
128 >
129 > diff --git a/dev-db/mongodb/files/mongodb.initd b/dev-db/mongodb/files/mongodb.initd
130 > index e2614dc..2684359 100644
131 > --- a/dev-db/mongodb/files/mongodb.initd
132 > +++ b/dev-db/mongodb/files/mongodb.initd
133 > @@ -8,23 +8,24 @@ depend() {
134 > }
135 >
136 > start() {
137 > + mkdir -p /var/run/mongodb
138 > + chown ${MONGODB_USER}: /var/run/mongodb
139 > +
140 > ebegin "Starting ${SVCNAME}"
141 > start-stop-daemon --background --start --make-pidfile \
142 > + --pidfile /var/run/mongodb/${SVCNAME}.pid \
143 > --user ${MONGODB_USER:-mongodb} \
144 > - --pidfile "${MONGODB_PID_FILE:-/var/run/mongodb/mongodb.pid}" \
145 > --exec ${MONGODB_EXEC:-/usr/bin/mongod} \
146 > -- \
147 > - --dbpath "${MONGODB_DATA:-/var/lib/mongodb}" \
148 > - --port ${MONGODB_PORT:-27017} \
149 > --bind_ip ${MONGODB_IP:-127.0.0.1} \
150 > - --logappend --logpath ${MONGODB_LOGPATH:-/var/log/mongodb/server.log} \
151 > - ${MONGODB_OPTIONS} \
152 > - run
153 > + --port ${MONGODB_PORT:-27017} \
154 > + --logappend --logpath /var/log/mongodb/${SVCNAME}.log \
155 > + ${MONGODB_OPTIONS}
156 > eend $?
157 > }
158 >
159 > stop() {
160 > ebegin "Stopping ${SVCNAME}"
161 > - start-stop-daemon --stop --pidfile "${MONGODB_PID_FILE:-/var/run/mongodb/mongodb.pid}"
162 > + start-stop-daemon --stop --pidfile /var/run/mongodb/${SVCNAME}.pid
163 > eend $?
164 > }
165 >
166 > diff --git a/dev-db/mongodb/mongodb-1.6.3.ebuild b/dev-db/mongodb/mongodb-1.6.3.ebuild
167 > deleted file mode 100644
168 > index 8640850..0000000
169 > --- a/dev-db/mongodb/mongodb-1.6.3.ebuild
170 > +++ /dev/null
171 > @@ -1,65 +0,0 @@
172 > -# Copyright 1999-2010 Gentoo Foundation
173 > -# Distributed under the terms of the GNU General Public License v2
174 > -# $Header: $
175 > -
176 > -EAPI="2"
177 > -
178 > -SCONS_MIN_VERSION="1.2.0-r1"
179 > -MY_P="${PN}-src-r${PV}"
180 > -
181 > -inherit eutils scons-utils versionator
182 > -
183 > -DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
184 > -HOMEPAGE="http://www.mongodb.org"
185 > -SRC_URI="http://downloads.mongodb.org/src/${MY_P}.tar.gz"
186 > -
187 > -LICENSE="AGPL-3 Apache-2.0"
188 > -SLOT="0"
189 > -KEYWORDS="~amd64 ~x86"
190 > -IUSE=""
191 > -
192 > -RDEPEND="
193 > - dev-lang/spidermonkey[unicode]
194 > - dev-libs/boost
195 > - dev-libs/libpcre
196 > - net-libs/libpcap
197 > -"
198 > -
199 > -DEPEND="${RDEPEND}
200 > - sys-libs/readline
201 > - sys-libs/ncurses
202 > -"
203 > -
204 > -S="${WORKDIR}/${MY_P}"
205 > -
206 > -pkg_setup() {
207 > - enewgroup mongodb
208 > - enewuser mongodb -1 -1 /var/lib/${PN} mongodb
209 > -}
210 > -
211 > -src_prepare() {
212 > - epatch "${FILESDIR}/${P}-fix-scons.patch"
213 > -}
214 > -
215 > -src_compile() {
216 > - escons all || die "Compile failed"
217 > -}
218 > -
219 > -src_install() {
220 > - escons --full --nostrip install --prefix="${D}"/usr || die "Install failed"
221 > -
222 > - for x in /var/{lib,log,run}/${PN}; do
223 > - dodir "${x}" || die "Install failed"
224 > - fowners mongodb:mongodb "${x}"
225 > - done
226 > -
227 > - doman debian/mongo*.1 || die "Install failed"
228 > - dodoc README docs/building.md
229 > -
230 > - newinitd "${FILESDIR}/${PN}.initd" ${PN} || die "Install failed"
231 > - newconfd "${FILESDIR}/${PN}.confd" ${PN} || die "Install failed"
232 > -}
233 > -
234 > -src_test() {
235 > - escons smoke --smokedbprefix='testdir' test || die "Tests failed"
236 > -}
237 >
238 > diff --git a/dev-db/mongodb/mongodb-1.7.5.ebuild b/dev-db/mongodb/mongodb-1.7.5.ebuild
239 > deleted file mode 100644
240 > index c25a8a4..0000000
241 > --- a/dev-db/mongodb/mongodb-1.7.5.ebuild
242 > +++ /dev/null
243 > @@ -1,65 +0,0 @@
244 > -# Copyright 1999-2010 Gentoo Foundation
245 > -# Distributed under the terms of the GNU General Public License v2
246 > -# $Header: $
247 > -
248 > -EAPI="2"
249 > -
250 > -SCONS_MIN_VERSION="1.2.0-r1"
251 > -MY_P="${PN}-src-r${PV}"
252 > -
253 > -inherit eutils scons-utils versionator
254 > -
255 > -DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
256 > -HOMEPAGE="http://www.mongodb.org"
257 > -SRC_URI="http://downloads.mongodb.org/src/${MY_P}.tar.gz"
258 > -
259 > -LICENSE="AGPL-3 Apache-2.0"
260 > -SLOT="0"
261 > -KEYWORDS="~amd64 ~x86"
262 > -IUSE=""
263 > -
264 > -RDEPEND="
265 > - dev-lang/spidermonkey[unicode]
266 > - dev-libs/boost
267 > - dev-libs/libpcre
268 > - net-libs/libpcap
269 > -"
270 > -
271 > -DEPEND="${RDEPEND}
272 > - sys-libs/readline
273 > - sys-libs/ncurses
274 > -"
275 > -
276 > -S="${WORKDIR}/${MY_P}"
277 > -
278 > -pkg_setup() {
279 > - enewgroup mongodb
280 > - enewuser mongodb -1 -1 /var/lib/${PN} mongodb
281 > -}
282 > -
283 > -#src_prepare() {
284 > -# epatch "${FILESDIR}/${PN}-1.6.3-fix-scons.patch"
285 > -#}
286 > -
287 > -src_compile() {
288 > - escons all || die "Compile failed"
289 > -}
290 > -
291 > -src_install() {
292 > - escons --full --nostrip install --prefix="${D}"/usr || die "Install failed"
293 > -
294 > - for x in /var/{lib,log,run}/${PN}; do
295 > - dodir "${x}" || die "Install failed"
296 > - fowners mongodb:mongodb "${x}"
297 > - done
298 > -
299 > - doman debian/mongo*.1 || die "Install failed"
300 > - dodoc README docs/building.md
301 > -
302 > - newinitd "${FILESDIR}/${PN}.initd" ${PN} || die "Install failed"
303 > - newconfd "${FILESDIR}/${PN}.confd" ${PN} || die "Install failed"
304 > -}
305 > -
306 > -src_test() {
307 > - escons smoke --smokedbprefix='testdir' test || die "Tests failed"
308 > -}
309 >
310 > diff --git a/dev-db/mongodb/mongodb-1.8.0_rc1.ebuild b/dev-db/mongodb/mongodb-1.8.0_rc1.ebuild
311 > deleted file mode 100644
312 > index 25f1299..0000000
313 > --- a/dev-db/mongodb/mongodb-1.8.0_rc1.ebuild
314 > +++ /dev/null
315 > @@ -1,65 +0,0 @@
316 > -# Copyright 1999-2010 Gentoo Foundation
317 > -# Distributed under the terms of the GNU General Public License v2
318 > -# $Header: $
319 > -
320 > -EAPI="2"
321 > -
322 > -SCONS_MIN_VERSION="1.2.0-r1"
323 > -MY_P="${PN}-src-r${PV/_rc/-rc}"
324 > -
325 > -inherit eutils scons-utils versionator
326 > -
327 > -DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
328 > -HOMEPAGE="http://www.mongodb.org"
329 > -SRC_URI="http://downloads.mongodb.org/src/${MY_P}.tar.gz"
330 > -
331 > -LICENSE="AGPL-3 Apache-2.0"
332 > -SLOT="0"
333 > -KEYWORDS="~amd64 ~x86"
334 > -IUSE=""
335 > -
336 > -RDEPEND="
337 > - dev-lang/spidermonkey[unicode]
338 > - dev-libs/boost
339 > - dev-libs/libpcre
340 > - net-libs/libpcap
341 > -"
342 > -
343 > -DEPEND="${RDEPEND}
344 > - sys-libs/readline
345 > - sys-libs/ncurses
346 > -"
347 > -
348 > -S="${WORKDIR}/${MY_P}"
349 > -
350 > -pkg_setup() {
351 > - enewgroup mongodb
352 > - enewuser mongodb -1 -1 /var/lib/${PN} mongodb
353 > -}
354 > -
355 > -#src_prepare() {
356 > -# epatch "${FILESDIR}/${PN}-1.6.3-fix-scons.patch"
357 > -#}
358 > -
359 > -src_compile() {
360 > - escons all || die "Compile failed"
361 > -}
362 > -
363 > -src_install() {
364 > - escons --full --nostrip install --prefix="${D}"/usr || die "Install failed"
365 > -
366 > - for x in /var/{lib,log,run}/${PN}; do
367 > - dodir "${x}" || die "Install failed"
368 > - fowners mongodb:mongodb "${x}"
369 > - done
370 > -
371 > - doman debian/mongo*.1 || die "Install failed"
372 > - dodoc README docs/building.md
373 > -
374 > - newinitd "${FILESDIR}/${PN}.initd" ${PN} || die "Install failed"
375 > - newconfd "${FILESDIR}/${PN}.confd" ${PN} || die "Install failed"
376 > -}
377 > -
378 > -src_test() {
379 > - escons smoke --smokedbprefix='testdir' test || die "Tests failed"
380 > -}
381 >
382 > diff --git a/dev-db/mongodb/mongodb-1.8.0.ebuild b/dev-db/mongodb/mongodb-1.8.1.ebuild
383 > similarity index 58%
384 > rename from dev-db/mongodb/mongodb-1.8.0.ebuild
385 > rename to dev-db/mongodb/mongodb-1.8.1.ebuild
386 > index 3849f20..74b7af6 100644
387 > --- a/dev-db/mongodb/mongodb-1.8.0.ebuild
388 > +++ b/dev-db/mongodb/mongodb-1.8.1.ebuild
389 > @@ -16,36 +16,50 @@ SRC_URI="http://downloads.mongodb.org/src/${MY_P}.tar.gz"
390 > LICENSE="AGPL-3 Apache-2.0"
391 > SLOT="0"
392 > KEYWORDS="~amd64 ~x86"
393 > -IUSE=""
394 > +IUSE="v8"
395 >
396 > -RDEPEND="
397 > - dev-lang/spidermonkey[unicode]
398 > +RDEPEND="!v8? ( >=dev-lang/spidermonkey-1.9.2.15 )
399 > + v8? ( dev-lang/v8 )
400 > dev-libs/boost
401 > - dev-libs/libpcre
402 > - net-libs/libpcap
403 > -"
404 > + dev-libs/libpcre[cxx]
405 > + net-libs/libpcap"
406 >
407 > DEPEND="${RDEPEND}
408 > sys-libs/readline
409 > - sys-libs/ncurses
410 > -"
411 > + sys-libs/ncurses"
412 >
413 > S="${WORKDIR}/${MY_P}"
414 >
415 > pkg_setup() {
416 > enewgroup mongodb
417 > enewuser mongodb -1 -1 /var/lib/${PN} mongodb
418 > +
419 > + if use v8; then
420 > + scons_opts="--usev8"
421 > + else
422 > + scons_opts="--usesm"
423 > + fi
424 > +}
425 > +
426 > +src_prepare() {
427 > + epatch "${FILESDIR}/${PN}-1.8.1-fix-scons.patch"
428 > +
429 > + if use v8; then
430 > + # Suppress known test failure with v8:
431 > + # http://jira.mongodb.org/browse/SERVER-1147
432 > + sed -e '/add< NumberLong >/d' -i dbtests/jstests.cpp || die
433 > + fi
434 > }
435 >
436 > src_compile() {
437 > - escons all || die "Compile failed"
438 > + escons ${scons_opts} all || die "Compile failed"
439 > }
440 >
441 > src_install() {
442 > - escons --full --nostrip install --prefix="${D}"/usr || die "Install failed"
443 > + scons ${scons_opts} --full --nostrip install --prefix="${D}"/usr || die "Install failed"
444 >
445 > for x in /var/{lib,log,run}/${PN}; do
446 > - dodir "${x}" || die "Install failed"
447 > + dodir "${x}"
448 > fowners mongodb:mongodb "${x}"
449 > done
450 >
451 > @@ -57,5 +71,5 @@ src_install() {
452 > }
453 >
454 > src_test() {
455 > - escons smoke --smokedbprefix='testdir' test || die "Tests failed"
456 > + scons ${scons_opts} smoke --smokedbprefix='testdir' test || die "Tests failed"
457 > }
458 >
459 Hi mate, thanks for working on mongodb fix/bump !
460
461 Just so you know, I'm working with @jbergstroem on this aswell, maybe
462 you could have a look at my overlay (ultrabug) and give your feedback
463 please ?
464
465 Regards
466
467 --
468 Ultrabug
469 Gentoo / cluster

Attachments

File name MIME type
signature.asc application/pgp-signature