From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Q8FZS-0004Ei-AK for garchives@archives.gentoo.org; Fri, 08 Apr 2011 17:34:10 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 44BC41C03B; Fri, 8 Apr 2011 17:34:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id CCDE51C03B for ; Fri, 8 Apr 2011 17:34:01 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A085E1BC0CD for ; Fri, 8 Apr 2011 17:34:00 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 09F4E80065 for ; Fri, 8 Apr 2011 17:34:00 +0000 (UTC) From: "Benedikt Boehm" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Benedikt Boehm" Message-ID: Subject: [gentoo-commits] proj/betagarden:master commit in: dev-db/mongodb/files/, dev-db/mongodb/ X-VCS-Repository: proj/betagarden X-VCS-Files: dev-db/mongodb/files/mongodb-1.6.3-fix-scons.patch dev-db/mongodb/files/mongodb-1.8.1-fix-scons.patch dev-db/mongodb/files/mongodb.confd dev-db/mongodb/files/mongodb.initd dev-db/mongodb/mongodb-1.6.3.ebuild dev-db/mongodb/mongodb-1.7.5.ebuild dev-db/mongodb/mongodb-1.8.0.ebuild dev-db/mongodb/mongodb-1.8.0_rc1.ebuild dev-db/mongodb/mongodb-1.8.1.ebuild X-VCS-Directories: dev-db/mongodb/files/ dev-db/mongodb/ X-VCS-Committer: hollow X-VCS-Committer-Name: Benedikt Boehm X-VCS-Revision: d9be143486caa83951aae4d6c72c58fea90ed451 Date: Fri, 8 Apr 2011 17:34:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 2ef0c8cc58f127220d69ad8730b89223 commit: d9be143486caa83951aae4d6c72c58fea90ed451 Author: Benedikt B=C3=B6hm xnull de> AuthorDate: Fri Apr 8 17:27:47 2011 +0000 Commit: Benedikt Boehm gentoo org> CommitDate: Fri Apr 8 17:33:26 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/betagarden.gi= t;a=3Dcommit;h=3Dd9be1434 dev-db/mongodb: version bump to 1.8.1 - #329167 - dev-db/mongodb missing dependency on net-libs/libpcap - #334081 - dev-db/mongodb does not respect LDFLAGS - #337593 - dev-db/mongodb should depend on libpcre being compiled with the cxx useflag - #337973 - dev-db/mongodb-1.8.0 version bump - #338039 - dev-db/mongodb starts as root - #340032 - dev-db/mongodb: add server logging - #356731 - dev-db/mongodb should create /var/run/mongodb --- dev-db/mongodb/files/mongodb-1.6.3-fix-scons.patch | 25 -------- dev-db/mongodb/files/mongodb-1.8.1-fix-scons.patch | 37 +++++++++++ dev-db/mongodb/files/mongodb.confd | 16 ++--- dev-db/mongodb/files/mongodb.initd | 15 +++-- dev-db/mongodb/mongodb-1.6.3.ebuild | 65 --------------= ------ dev-db/mongodb/mongodb-1.7.5.ebuild | 65 --------------= ------ dev-db/mongodb/mongodb-1.8.0_rc1.ebuild | 65 --------------= ------ .../{mongodb-1.8.0.ebuild =3D> mongodb-1.8.1.ebuild} | 38 ++++++++---- 8 files changed, 76 insertions(+), 250 deletions(-) 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 deleted file mode 100644 index 1c26ce6..0000000 --- a/dev-db/mongodb/files/mongodb-1.6.3-fix-scons.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/SConstruct b/SConstruct -index b759094..5d667f4 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -745,9 +745,9 @@ else: -=20 - if nix: - env.Append( CPPFLAGS=3D"-fPIC -fno-strict-aliasing -ggdb -pthread -= Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" ) -- if linux: -- env.Append( CPPFLAGS=3D" -Werror " ) -+ env.Append( CXXFLAGS=3Dos.environ['CXXFLAGS']) - env.Append( CXXFLAGS=3D" -Wnon-virtual-dtor " ) -+ env.Append( LINKFLAGS=3Dos.environ['LDFLAGS'] ) - env.Append( LINKFLAGS=3D" -fPIC -pthread -rdynamic" ) - env.Append( LIBS=3D[] ) -=20 -@@ -757,8 +757,6 @@ if nix: - if debugBuild: - env.Append( CPPFLAGS=3D" -O0 -fstack-protector " ); - env['ENV']['GLIBCXX_FORCE_NEW'] =3D 1; # play nice with valgrin= d -- else: -- env.Append( CPPFLAGS=3D" -O3" ) -=20 - if debugLogging: - env.Append( CPPFLAGS=3D" -D_DEBUG" ); 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 new file mode 100644 index 0000000..25a6a6f --- /dev/null +++ b/dev-db/mongodb/files/mongodb-1.8.1-fix-scons.patch @@ -0,0 +1,37 @@ +From 4ce35e34e646b6ccf151449bd2b47cef543152e5 Mon Sep 17 00:00:00 2001 +From: =3D?UTF-8?q?Benedikt=3D20B=3DC3=3DB6hm?=3D +Date: Fri, 8 Apr 2011 16:33:37 +0200 +Subject: [PATCH] fix scons + +--- + SConstruct | 5 ++--- + 1 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/SConstruct b/SConstruct +index 41383b1..35c7ea6 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -671,9 +671,10 @@ if nix: + env.Append( CPPFLAGS=3D"-fPIC -fno-strict-aliasing -ggdb -pthread -= Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" ) + # env.Append( " -Wconversion" ) TODO: this doesn't really work yet + if linux: +- env.Append( CPPFLAGS=3D" -Werror " ) + env.Append( CPPFLAGS=3D" -fno-builtin-memcmp " ) # glibc's memc= mp is faster than gcc's ++ env.Append( CXXFLAGS=3Dos.environ['CXXFLAGS'] ) + env.Append( CXXFLAGS=3D" -Wnon-virtual-dtor " ) ++ env.Append( LINKFLAGS=3Dos.environ['LDFLAGS'] ) + env.Append( LINKFLAGS=3D" -fPIC -pthread -rdynamic" ) + env.Append( LIBS=3D[] ) +=20 +@@ -687,8 +688,6 @@ if nix: + if debugBuild: + env.Append( CPPFLAGS=3D" -O0 -fstack-protector " ); + env['ENV']['GLIBCXX_FORCE_NEW'] =3D 1; # play nice with valgrin= d +- else: +- env.Append( CPPFLAGS=3D" -O3" ) + #env.Append( CPPFLAGS=3D" -fprofile-generate" ) + #env.Append( LINKFLAGS=3D" -fprofile-generate" ) + # then: +--=20 +1.7.3.4 + diff --git a/dev-db/mongodb/files/mongodb.confd b/dev-db/mongodb/files/mo= ngodb.confd index 41585ff..2e087ac 100644 --- a/dev-db/mongodb/files/mongodb.confd +++ b/dev-db/mongodb/files/mongodb.confd @@ -1,11 +1,5 @@ -# Mongodb essentials -#MONGODB_EXEC=3D"/usr/bin/mongod" -#MONGODB_DATA=3D"/var/lib/mongodb" -#MONGODB_USER=3D"mongodb" -#MONGODB_PID_FILE=3D"/var/run/mongodb/mongodb.pid" - -#MONGODB_IP=3D"127.0.0.1" -#MONGODB_PORT=3D"27017" - -# Set extra options here, such as disabling the admin web server -#MONGODB_OPTIONS=3D"" +MONGODB_USER=3D"mongodb" +MONGODB_EXEC=3D"/usr/bin/mongod" +MONGODB_IP=3D"127.0.0.1" +MONGODB_PORT=3D"27012" +MONGODB_OPTIONS=3D"--rest --dbpath /var/lib/mongodb" diff --git a/dev-db/mongodb/files/mongodb.initd b/dev-db/mongodb/files/mo= ngodb.initd index e2614dc..2684359 100644 --- a/dev-db/mongodb/files/mongodb.initd +++ b/dev-db/mongodb/files/mongodb.initd @@ -8,23 +8,24 @@ depend() { } =20 start() { + mkdir -p /var/run/mongodb + chown ${MONGODB_USER}: /var/run/mongodb + ebegin "Starting ${SVCNAME}" start-stop-daemon --background --start --make-pidfile \ + --pidfile /var/run/mongodb/${SVCNAME}.pid \ --user ${MONGODB_USER:-mongodb} \ - --pidfile "${MONGODB_PID_FILE:-/var/run/mongodb/mongodb.pid}" \ --exec ${MONGODB_EXEC:-/usr/bin/mongod} \ -- \ - --dbpath "${MONGODB_DATA:-/var/lib/mongodb}" \ - --port ${MONGODB_PORT:-27017} \ --bind_ip ${MONGODB_IP:-127.0.0.1} \ - --logappend --logpath ${MONGODB_LOGPATH:-/var/log/mongodb/server.log} = \ - ${MONGODB_OPTIONS} \ - run + --port ${MONGODB_PORT:-27017} \ + --logappend --logpath /var/log/mongodb/${SVCNAME}.log \ + ${MONGODB_OPTIONS} eend $? } =20 stop() { ebegin "Stopping ${SVCNAME}" - start-stop-daemon --stop --pidfile "${MONGODB_PID_FILE:-/var/run/mongod= b/mongodb.pid}" + start-stop-daemon --stop --pidfile /var/run/mongodb/${SVCNAME}.pid eend $? } diff --git a/dev-db/mongodb/mongodb-1.6.3.ebuild b/dev-db/mongodb/mongodb= -1.6.3.ebuild deleted file mode 100644 index 8640850..0000000 --- a/dev-db/mongodb/mongodb-1.6.3.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3D"2" - -SCONS_MIN_VERSION=3D"1.2.0-r1" -MY_P=3D"${PN}-src-r${PV}" - -inherit eutils scons-utils versionator - -DESCRIPTION=3D"A high-performance, open source, schema-free document-ori= ented database" -HOMEPAGE=3D"http://www.mongodb.org" -SRC_URI=3D"http://downloads.mongodb.org/src/${MY_P}.tar.gz" - -LICENSE=3D"AGPL-3 Apache-2.0" -SLOT=3D"0" -KEYWORDS=3D"~amd64 ~x86" -IUSE=3D"" - -RDEPEND=3D" - dev-lang/spidermonkey[unicode] - dev-libs/boost - dev-libs/libpcre - net-libs/libpcap -" - -DEPEND=3D"${RDEPEND} - sys-libs/readline - sys-libs/ncurses -" - -S=3D"${WORKDIR}/${MY_P}" - -pkg_setup() { - enewgroup mongodb - enewuser mongodb -1 -1 /var/lib/${PN} mongodb -} - -src_prepare() { - epatch "${FILESDIR}/${P}-fix-scons.patch" -} - -src_compile() { - escons all || die "Compile failed" -} - -src_install() { - escons --full --nostrip install --prefix=3D"${D}"/usr || die "Install f= ailed" - - for x in /var/{lib,log,run}/${PN}; do - dodir "${x}" || die "Install failed" - fowners mongodb:mongodb "${x}" - done - - doman debian/mongo*.1 || die "Install failed" - dodoc README docs/building.md - - newinitd "${FILESDIR}/${PN}.initd" ${PN} || die "Install failed" - newconfd "${FILESDIR}/${PN}.confd" ${PN} || die "Install failed" -} - -src_test() { - escons smoke --smokedbprefix=3D'testdir' test || die "Tests failed" -} diff --git a/dev-db/mongodb/mongodb-1.7.5.ebuild b/dev-db/mongodb/mongodb= -1.7.5.ebuild deleted file mode 100644 index c25a8a4..0000000 --- a/dev-db/mongodb/mongodb-1.7.5.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3D"2" - -SCONS_MIN_VERSION=3D"1.2.0-r1" -MY_P=3D"${PN}-src-r${PV}" - -inherit eutils scons-utils versionator - -DESCRIPTION=3D"A high-performance, open source, schema-free document-ori= ented database" -HOMEPAGE=3D"http://www.mongodb.org" -SRC_URI=3D"http://downloads.mongodb.org/src/${MY_P}.tar.gz" - -LICENSE=3D"AGPL-3 Apache-2.0" -SLOT=3D"0" -KEYWORDS=3D"~amd64 ~x86" -IUSE=3D"" - -RDEPEND=3D" - dev-lang/spidermonkey[unicode] - dev-libs/boost - dev-libs/libpcre - net-libs/libpcap -" - -DEPEND=3D"${RDEPEND} - sys-libs/readline - sys-libs/ncurses -" - -S=3D"${WORKDIR}/${MY_P}" - -pkg_setup() { - enewgroup mongodb - enewuser mongodb -1 -1 /var/lib/${PN} mongodb -} - -#src_prepare() { -# epatch "${FILESDIR}/${PN}-1.6.3-fix-scons.patch" -#} - -src_compile() { - escons all || die "Compile failed" -} - -src_install() { - escons --full --nostrip install --prefix=3D"${D}"/usr || die "Install f= ailed" - - for x in /var/{lib,log,run}/${PN}; do - dodir "${x}" || die "Install failed" - fowners mongodb:mongodb "${x}" - done - - doman debian/mongo*.1 || die "Install failed" - dodoc README docs/building.md - - newinitd "${FILESDIR}/${PN}.initd" ${PN} || die "Install failed" - newconfd "${FILESDIR}/${PN}.confd" ${PN} || die "Install failed" -} - -src_test() { - escons smoke --smokedbprefix=3D'testdir' test || die "Tests failed" -} diff --git a/dev-db/mongodb/mongodb-1.8.0_rc1.ebuild b/dev-db/mongodb/mon= godb-1.8.0_rc1.ebuild deleted file mode 100644 index 25f1299..0000000 --- a/dev-db/mongodb/mongodb-1.8.0_rc1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3D"2" - -SCONS_MIN_VERSION=3D"1.2.0-r1" -MY_P=3D"${PN}-src-r${PV/_rc/-rc}" - -inherit eutils scons-utils versionator - -DESCRIPTION=3D"A high-performance, open source, schema-free document-ori= ented database" -HOMEPAGE=3D"http://www.mongodb.org" -SRC_URI=3D"http://downloads.mongodb.org/src/${MY_P}.tar.gz" - -LICENSE=3D"AGPL-3 Apache-2.0" -SLOT=3D"0" -KEYWORDS=3D"~amd64 ~x86" -IUSE=3D"" - -RDEPEND=3D" - dev-lang/spidermonkey[unicode] - dev-libs/boost - dev-libs/libpcre - net-libs/libpcap -" - -DEPEND=3D"${RDEPEND} - sys-libs/readline - sys-libs/ncurses -" - -S=3D"${WORKDIR}/${MY_P}" - -pkg_setup() { - enewgroup mongodb - enewuser mongodb -1 -1 /var/lib/${PN} mongodb -} - -#src_prepare() { -# epatch "${FILESDIR}/${PN}-1.6.3-fix-scons.patch" -#} - -src_compile() { - escons all || die "Compile failed" -} - -src_install() { - escons --full --nostrip install --prefix=3D"${D}"/usr || die "Install f= ailed" - - for x in /var/{lib,log,run}/${PN}; do - dodir "${x}" || die "Install failed" - fowners mongodb:mongodb "${x}" - done - - doman debian/mongo*.1 || die "Install failed" - dodoc README docs/building.md - - newinitd "${FILESDIR}/${PN}.initd" ${PN} || die "Install failed" - newconfd "${FILESDIR}/${PN}.confd" ${PN} || die "Install failed" -} - -src_test() { - escons smoke --smokedbprefix=3D'testdir' test || die "Tests failed" -} diff --git a/dev-db/mongodb/mongodb-1.8.0.ebuild b/dev-db/mongodb/mongodb= -1.8.1.ebuild similarity index 58% rename from dev-db/mongodb/mongodb-1.8.0.ebuild rename to dev-db/mongodb/mongodb-1.8.1.ebuild index 3849f20..74b7af6 100644 --- a/dev-db/mongodb/mongodb-1.8.0.ebuild +++ b/dev-db/mongodb/mongodb-1.8.1.ebuild @@ -16,36 +16,50 @@ SRC_URI=3D"http://downloads.mongodb.org/src/${MY_P}.t= ar.gz" LICENSE=3D"AGPL-3 Apache-2.0" SLOT=3D"0" KEYWORDS=3D"~amd64 ~x86" -IUSE=3D"" +IUSE=3D"v8" =20 -RDEPEND=3D" - dev-lang/spidermonkey[unicode] +RDEPEND=3D"!v8? ( >=3Ddev-lang/spidermonkey-1.9.2.15 ) + v8? ( dev-lang/v8 ) dev-libs/boost - dev-libs/libpcre - net-libs/libpcap -" + dev-libs/libpcre[cxx] + net-libs/libpcap" =20 DEPEND=3D"${RDEPEND} sys-libs/readline - sys-libs/ncurses -" + sys-libs/ncurses" =20 S=3D"${WORKDIR}/${MY_P}" =20 pkg_setup() { enewgroup mongodb enewuser mongodb -1 -1 /var/lib/${PN} mongodb + + if use v8; then + scons_opts=3D"--usev8" + else + scons_opts=3D"--usesm" + fi +} + +src_prepare() { + epatch "${FILESDIR}/${PN}-1.8.1-fix-scons.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 } =20 src_compile() { - escons all || die "Compile failed" + escons ${scons_opts} all || die "Compile failed" } =20 src_install() { - escons --full --nostrip install --prefix=3D"${D}"/usr || die "Install f= ailed" + scons ${scons_opts} --full --nostrip install --prefix=3D"${D}"/usr || d= ie "Install failed" =20 for x in /var/{lib,log,run}/${PN}; do - dodir "${x}" || die "Install failed" + dodir "${x}" fowners mongodb:mongodb "${x}" done =20 @@ -57,5 +71,5 @@ src_install() { } =20 src_test() { - escons smoke --smokedbprefix=3D'testdir' test || die "Tests failed" + scons ${scons_opts} smoke --smokedbprefix=3D'testdir' test || die "Test= s failed" }